NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit89b3c6c

committed

Fix one-byte buffer overrun in contrib/test_parser.

The original coding examined the next character before verifying thatthere *is* a next character. In the worst case with the input bufferright up against the end of memory, this would result in a segfault.Problem spotted by Paul Guyot; this commit extends his patch to fix anadditional case. In addition, make the code a tad more readable by notoverloading the usage of *tlen.

1 parent743ed08 commit89b3c6cCopy full SHA for 89b3c6c

File tree

1 file changed

+10

-9

lines changed

contrib/test_parser
- test_parser.c

1 file changed

+10

-9

lines changed

`‎contrib/test_parser/test_parser.c`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,31 +73,32 @@ testprs_getlexeme(PG_FUNCTION_ARGS)`
`73`	`73`	`ParserStatepst= (ParserState)PG_GETARG_POINTER(0);`
`74`	`74`	`chart= (char)PG_GETARG_POINTER(1);`
`75`	`75`	`inttlen= (int)PG_GETARG_POINTER(2);`
	`76`	`+intstartpos=pst->pos;`
`76`	`77`	`inttype;`
`77`	`78`
`78`		`-*tlen=pst->pos;`
`79`	`79`	`*t=pst->buffer+pst->pos;`
`80`	`80`
`81`		`-if ((pst->buffer)[pst->pos]==' ')`
	`81`	`+if (pst->pos<pst->len&&`
	`82`	`+(pst->buffer)[pst->pos]==' ')`
`82`	`83`	`{`
`83`	`84`	`/* blank type */`
`84`	`85`	`type=12;`
`85`		`-/* go to the next non-white-space character */`
`86`		`-while ((pst->buffer)[pst->pos]==' '&&`
`87`		`-pst->pos<pst->len)`
	`86`	`+/* go to the next non-space character */`
	`87`	`+while (pst->pos<pst->len&&`
	`88`	`+(pst->buffer)[pst->pos]==' ')`
`88`	`89`	`(pst->pos)++;`
`89`	`90`	`}`
`90`	`91`	`else`
`91`	`92`	`{`
`92`	`93`	`/* word type */`
`93`	`94`	`type=3;`
`94`		`-/* go to the nextwhite-space character */`
`95`		`-while ((pst->buffer)[pst->pos]!=' '&&`
`96`		`-pst->pos<pst->len)`
	`95`	`+/* go to the next space character */`
	`96`	`+while (pst->pos<pst->len&&`
	`97`	`+(pst->buffer)[pst->pos]!=' ')`
`97`	`98`	`(pst->pos)++;`
`98`	`99`	`}`
`99`	`100`
`100`		`-tlen=pst->pos-tlen;`
	`101`	`+*tlen=pst->pos-startpos;`
`101`	`102`
`102`	`103`	`/* we are finished if (tlen == 0) /`
`103`	`104`	`if (*tlen==0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit89b3c6c

File tree

1 file changed

1 file changed

`‎contrib/test_parser/test_parser.c`

0 commit comments