(readline): Change position on %n and \" in sscanf.

ea90c5d3 · Jan Djärv · 1f4edc37 · ea90c5d3 · ea90c5d3
Commit ea90c5d3 authored Aug 09, 2006 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lib-src/ChangeLog lib-src/ChangeLog +1 -0

lib-src/etags.c lib-src/etags.c +3 -2

No files found.
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
 2006-08-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

 	* etags.c (readline): expect sscanf returns >= 1.
+	(readline): Change position on %n and \" in sscanf.

 2006-08-07  Masatake YAMATO  <jet@gyve.org>


--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6259,9 +6259,10 @@ readline (lbp, stream)
 	  int start, lno;

 	  if (DEBUG) start = 0;	/* shut up the compiler */
-	  if (sscanf (lbp->buffer, "#line %d \"%n", &lno, &start) >= 1)
+	  if (sscanf (lbp->buffer, "#line %d %n\"", &lno, &start) >= 1
+	      && inp[start] == '"')
 	    {
-	      char *endp = lbp->buffer + start;
+	      char *endp = lbp->buffer + ++start;

 	      assert (start > 0);
 	      while ((endp = etags_strchr (endp, '"')) != NULL