From: Leonard Randall <leonard.a.randall@gmail.com>
Date: Thu, 27 Nov 2014 08:38:21 +0000 (+0100)
Subject: Backport regexp stack overflow fix from emacs-24.
X-Git-Tag: emacs-24.4.90~168
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b66511f7680a195c5f56f2275f21e1d571706fba;p=emacs.git

Backport regexp stack overflow fix from emacs-24.

* textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
for comment lines non-greedy and stopping at newlines to fix stack
overflows with large files. [Backport]

Signed-off-by: Tassilo Horn <tsdh@gnu.org>
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af75f8db368..d88ecfeb8a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-27  Leonard Randall  <leonard.a.randall@gmail.com>
+
+	* textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
+	for comment lines non-greedy and stopping at newlines to fix stack
+	overflows with large files. [Backport]
+
 2014-11-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
 	* progmodes/python.el (python-shell-completion-setup-code): Use
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 71bec89a51d..a5572118fff 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -357,7 +357,7 @@ of master file."
       (member "biblatex" TeX-active-styles)
     ;; poor-man's check...
     (save-excursion
-      (re-search-forward "^[^%]*\\\\usepackage.*{biblatex}" nil t))))
+      (re-search-forward "^[^%\n]*?\\\\usepackage.*{biblatex}" nil t))))
 
 (defun reftex-locate-bibliography-files (master-dir &optional files)
   "Scan buffer for bibliography macros and return file list."