diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b71aaa0776..b4ba7c73d7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 15 16:18:52 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* c-exp.y (yylex): Fix a bug in template scanning.
+
 Tue Nov 15 14:25:47 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* i386-stub.c, m68k-stub.c, sparc-stub.c, sparcl-stub.c: Mask out
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index bb87545f7c..e8b0d7e06f 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1366,7 +1366,12 @@ yylex ()
 	|| (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '<');)
     {
        if (c == '<')
-	 while (tokstart[++namelen] != '>');
+	 {
+	   int i = namelen;
+	   while (tokstart[++i] && tokstart[i] != '>');
+	   if (tokstart[i] == '>')
+	     namelen = i;
+	  }
        c = tokstart[++namelen];
      }