Skip to content

Commit 077b465

Browse files
authored
Merge pull request from GHSA-7fw8-54cv-r7pm
1 parent 22af44e commit 077b465

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

Diff for: pjlib-util/src/pjlib-util/scanner.c

+9-4
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,21 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,
444444

445445
PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner )
446446
{
447-
int chr = *scanner->curptr;
447+
register char *s = scanner->curptr;
448+
int chr;
448449

449-
if (!chr) {
450+
if (s >= scanner->end || !*s) {
450451
pj_scan_syntax_err(scanner);
451452
return 0;
452453
}
453454

454-
++scanner->curptr;
455+
chr = *s;
455456

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+
{
457462
pj_scan_skip_whitespace(scanner);
458463
}
459464
return chr;

0 commit comments

Comments
 (0)