Make the multiline regex have an upper bound, instead of being unbounded,

as newer perls have a larger stack frame, which cause them to segfault
quicker with larger inputs.

diff --git a/ChangeLog b/ChangeLog
index 717709247d0c1f6e031dac9ae7dce80ad82fb888..533b0b9c9a75ec4c0f2d5cb27d01da14ab897020 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep  5 16:31:11 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Make the multiline regex have an upper bound,
+    instead of being unbounded, as newer perls have a larger stack frame,
+    which cause them to segfault quicker with larger inputs.
+
 Thu Sep  5 16:29:39 CDT 2002 Adam Heath <doogie@debian.org>
 
   * version-nr, debian/changelog: Set 1.10.8 version.

diff --git a/debian/changelog b/debian/changelog
index b8043ba9e181f35d669c568e498dddc6b73dcf63..0897fcaabce881f0c65126cf86ee539e07842bba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 dpkg (1.10.8) unstable; urgency=low
 
+  * Make the multiline regex have an upper bound, instead of being
+    unbounded, as newer perls have a larger stack frame, which cause them
+    to segfault quicker with larger inputs.  Closes: #159756.
+
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 
 dpkg (1.10.7) unstable; urgency=low

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index b497192b3bb12b49385fc160ed0bd80197115125..eecd2625977a82b7348f56eac9ed59a84289e9dd 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -146,7 +146,7 @@ if (!$remove) {
        }
 
         close(IF); &checkpipe;
-        if ($asread =~ m/(\*\s*[^:]+:\s*\(([^\)]+)\).*\. *.*\n){2,}/) {
+        if ($asread =~ m/(\*\s*[^:]+:\s*\(([^\)]+)\).*\. *.*\n){2}/) {
             $infoentry= $asread;
             $multiline= 1;
             $fileinentry = $2;