We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 22af44e commit 077b465Copy full SHA for 077b465
pjlib-util/src/pjlib-util/scanner.c
@@ -444,16 +444,21 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,
444
445
PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner )
446
{
447
- int chr = *scanner->curptr;
+ register char *s = scanner->curptr;
448
+ int chr;
449
- if (!chr) {
450
+ if (s >= scanner->end || !*s) {
451
pj_scan_syntax_err(scanner);
452
return 0;
453
}
454
- ++scanner->curptr;
455
+ chr = *s;
456
- if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) {
457
+ ++s;
458
+ scanner->curptr = s;
459
+ if (PJ_SCAN_CHECK_EOF(s) && PJ_SCAN_IS_PROBABLY_SPACE(*s) &&
460
+ scanner->skip_ws)
461
+ {
462
pj_scan_skip_whitespace(scanner);
463
464
return chr;
0 commit comments