From ae3d7333608652cc35f1d50cac9ea90b55f12a08 Mon Sep 17 00:00:00 2001
From: Jan D <jan.h.d@swipnet.se>
Date: Sun, 22 Mar 2015 10:21:45 +0100
Subject: Backport 20156 fix (stack corruption)

Fixes: debbugs:20156

* src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+ 3 in alloca (tiny change)
---
 src/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/ChangeLog')

diff --git a/src/ChangeLog b/src/ChangeLog
index 90908fcf759..060486b4ab3 100644
--- 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
-- 
cgit v1.2.1