[Emacs-diffs] master 3231550: Fixes: debbugs:20156

[Jan D.]

branch: master
commit 32315502e0335f7840cdaa68d3fa3aa385a6943d
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>

    Fixes: debbugs:20156
    
    * src/fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for
    regexsize.
---
 src/ChangeLog |    5 +++++
 src/fontset.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5aa248e..79feb61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-22  Jan Djärv  <address@hidden>
+
+       * fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for
+       regexsize (Bug#20156).
+
 2015-03-21  Eli Zaretskii  <address@hidden>
 
        * emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and
diff --git a/src/fontset.c b/src/fontset.c
index c0303fa..763d846 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1074,7 +1074,7 @@ fontset_pattern_regexp (Lisp_Object pattern)
         expression matching.  */
       ptrdiff_t regexsize = (SBYTES (pattern)
                             + (ndashes < 14 ? 2 : 5) * nstars
-                            + 2 * nescs + 1);
+                            + 2 * nescs + 3);
       USE_SAFE_ALLOCA;
       p1 = regex = SAFE_ALLOCA (regexsize);