diff options
| author | Paul Eggert | 2011-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-02 10:16:09 -0700 |
| commit | 037e65b496485cf3bd570a805bac787abac39cf3 (patch) | |
| tree | 343a49d60bc28ba9871c09442d7971d85a2901d7 /src/editfns.c | |
| parent | b3e945d3a47c5c64d84cb56594ff8c884acb1c37 (diff) | |
| parent | 57f53182c004f51e47818d70968a07579440eaff (diff) | |
| download | emacs-037e65b496485cf3bd570a805bac787abac39cf3.tar.gz emacs-037e65b496485cf3bd570a805bac787abac39cf3.zip | |
Merge: memory_full, gnutls improvements
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c index 8b48355fbfa..0e40fde9ca4 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3636,7 +3636,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3636 | { | 3636 | { |
| 3637 | EMACS_INT i; | 3637 | EMACS_INT i; |
| 3638 | if ((SIZE_MAX - formatlen) / sizeof (struct info) <= nargs) | 3638 | if ((SIZE_MAX - formatlen) / sizeof (struct info) <= nargs) |
| 3639 | memory_full (); | 3639 | memory_full (SIZE_MAX); |
| 3640 | SAFE_ALLOCA (info, struct info *, (nargs + 1) * sizeof *info + formatlen); | 3640 | SAFE_ALLOCA (info, struct info *, (nargs + 1) * sizeof *info + formatlen); |
| 3641 | discarded = (char *) &info[nargs + 1]; | 3641 | discarded = (char *) &info[nargs + 1]; |
| 3642 | for (i = 0; i < nargs + 1; i++) | 3642 | for (i = 0; i < nargs + 1; i++) |