# HG changeset patch # User John W. Eaton # Date 1284996062 14400 # Node ID 2538d03489cc4e7554858f44891e9c165d29b74d # Parent 2ab8cc6dccedd2e3a3c7b3a4ea9e79ce2a884a2c avoid infinite loop in regexp searches with PCRE diff -r 2ab8cc6dcced -r 2538d03489cc src/ChangeLog --- a/src/ChangeLog Sun Sep 19 20:47:46 2010 -0400 +++ b/src/ChangeLog Mon Sep 20 11:21:02 2010 -0400 @@ -1,3 +1,9 @@ +2010-09-20 John W. Eaton + + * DLD-FUNCTIONS/regexp.cc (octregexp_list) [HAVE_PCRE]: + Break from search loop if idx is at or beyond end of buffer + (bug #31056). + 2010-09-19 Ben Abbott * graphics.h.in: Add displayname property to patch and surface objects. diff -r 2ab8cc6dcced -r 2538d03489cc src/DLD-FUNCTIONS/regexp.cc --- a/src/DLD-FUNCTIONS/regexp.cc Sun Sep 19 20:47:46 2010 -0400 +++ b/src/DLD-FUNCTIONS/regexp.cc Mon Sep 20 11:21:02 2010 -0400 @@ -486,7 +486,7 @@ idx = ovector[1]; sz++; - if (once) + if (once || idx >= buffer.length ()) break; }