Changeset 2538 for pjproject/branches/1.0/pjlib-util/src/pjlib-util/scanner.c

Timestamp:

Mar 23, 2009 1:14:26 PM (15 years ago)

Author:

bennylp

Message:

Ticket #748: backported changes from ticket #747

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjlib-util/src/pjlib-util/scanner.c (modified) (2 diffs)

pjproject/branches/1.0/pjlib-util/src/pjlib-util/scanner.c

@@ -29 +29 @@
 #define PJ_SCAN_IS_NEWLINE(c)           ((c)=='\r' || (c)=='\n')
 #define PJ_SCAN_IS_PROBABLY_SPACE(c)    ((c) <= 32)
-#define PJ_SCAN_CHECK_EOF(s)            (*s)
+#define PJ_SCAN_CHECK_EOF(s)            (s != scanner->end)
 
 
@@ -376 +376 @@
     do {
         /* loop until end_quote is found. */
-        while (*s && *s != '\n' && *s != end_quote[qpair]) {
+        while (PJ_SCAN_CHECK_EOF(s) && *s != '\n' && *s != end_quote[qpair]) {
             ++s;
         }