Backport 20156 fix (stack corruption)

Fixes: debbugs:20156
* src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+ 3 in alloca (tiny change)

diff --git a/src/ChangeLog b/src/ChangeLog
index 90908fcf759bb0e4fe8a855425d39c04c9b61ac7..060486b4ab36499cb7db0087b2c2bea588b1897c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-22  John F Carr <jfc@mit.edu>
+
+       * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+       + 3 in alloca (Bug#20156) (tiny change)
+
 2015-03-12  Glenn Morris  <rgm@gnu.org>
 
        * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is

diff --git a/src/fontset.c b/src/fontset.c
index d9aa99d05f50d49ff1cd8634f97de02cdcc4532b..5772cc830c83383bea48fbfe565c1ce5fd65e3b9 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1097,9 +1097,9 @@ fontset_pattern_regexp (Lisp_Object pattern)
         we convert "*" to "[^-]*" which is much faster in regular
         expression matching.  */
       if (ndashes < 14)
-       p1 = regex = alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 1);
+       p1 = regex = alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 3);
       else
-       p1 = regex = alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 1);
+       p1 = regex = alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 3);
 
       *p1++ = '^';
       for (p0 = SDATA (pattern); *p0; p0++)