2 files changed, 8 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5a1b3ff7d5a..fd7097c0956 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Kevin Ryde  <user42@zip.com.au>
+
+        * etags.c (Scheme_functions): Don't loop past a null character
+        (Bug#5601).
+
 2010-01-29  Kester Habermann  <kester@linuxtag.org>  (tiny change)
 
         * etags.c (Fortran_functions): Handle recursive keyword
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 2715df8b5cc..17aad9a2252 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -5004,8 +5004,9 @@ Scheme_functions (inf)
       if (strneq (bp, "(def", 4) || strneq (bp, "(DEF", 4))
         {
           bp = skip_non_spaces (bp+4);
-          /* Skip over open parens and white space */
-          while (notinname (*bp))
+          /* Skip over open parens and white space.  Don't continue past
+             '\0'. */
+          while (*bp && notinname (*bp))
             bp++;
           get_tag (bp, NULL);
         }