diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 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 | |
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) */) { EMACS_INT i; if ((SIZE_MAX - formatlen) / sizeof (struct info) <= nargs) - memory_full (); + memory_full (SIZE_MAX); SAFE_ALLOCA (info, struct info *, (nargs + 1) * sizeof *info + formatlen); discarded = (char *) &info[nargs + 1]; for (i = 0; i < nargs + 1; i++) |