summaryrefslogtreecommitdiff
path: root/src/xsmfns.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-28 22:09:32 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-28 22:09:32 -0700
commit1d526e2f33eb2615944717c9231bc1d27aef1117 (patch)
tree4d3e817ce6d90f5f236876c3b603ba7ffdc4fda1 /src/xsmfns.c
parent864d7ce76d118b7bc157176a03a0a8a1b02fd989 (diff)
downloademacs-1d526e2f33eb2615944717c9231bc1d27aef1117.tar.gz
* xsmfns.c (smc_save_yourself_CB): Check for size calc overflow.
Diffstat (limited to 'src/xsmfns.c')
-rw-r--r--src/xsmfns.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c
index cb56ae648d1..217087dbae7 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -223,6 +223,9 @@ smc_save_yourself_CB (SmcConn smcConn,
props[props_idx]->name = xstrdup (SmRestartCommand);
props[props_idx]->type = xstrdup (SmLISTofARRAY8);
/* /path/to/emacs, --smid=xxx --no-splash --chdir=dir ... */
+ if (min (INT_MAX, min (PTRDIFF_MAX, SIZE_MAX) / sizeof *vp) - 3
+ < initial_argc)
+ memory_full (SIZE_MAX);
i = 3 + initial_argc;
props[props_idx]->num_vals = i;
vp = (SmPropValue *) xmalloc (i * sizeof(*vp));