NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit73dc003

committed

Add missing error check in regexp parser.

parseqatom() failed to check for an error return (NULL result) from itsrecursive call to parsebranch(), and in consequence could crash with anull-pointer dereference after an error return. This bug has been theresince day one, but wasn't noticed before, probably because most error casesin parsebranch() didn't actually lead to returning NULL. Add the missingerror check, and also tweak parsebranch() to exit in a less indirectfashion after a call to parseqatom() fails.Report by Tomasz Karlik, fix by me.

1 parent08f9728 commit73dc003Copy full SHA for 73dc003

File tree

1 file changed

-0

lines changed

src/backend/regex
- regcomp.c

1 file changed

-0

lines changed

`‎src/backend/regex/regcomp.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,7 @@ parsebranch(struct vars * v,`
`712`	`712`
`713`	`713`	`/* NB, recursion in parseqatom() may swallow rest of branch */`
`714`	`714`	`parseqatom(v,stopper,type,lp,right,t);`
	`715`	`+NOERRN();`
`715`	`716`	`}`
`716`	`717`
`717`	`718`	`if (!seencontent)`
`@@ -1169,6 +1170,7 @@ parseqatom(struct vars * v,`
`1169`	`1170`	`EMPTYARC(s2,rp);`
`1170`	`1171`	`t->right=subre(v,'=',0,s2,rp);`
`1171`	`1172`	`}`
	`1173`	`+NOERR();`
`1172`	`1174`	`assert(SEE('\|')\|\|SEE(stopper)\|\|SEE(EOS));`
`1173`	`1175`	`t->flags \|=COMBINE(t->flags,t->right->flags);`
`1174`	`1176`	`top->flags \|=COMBINE(top->flags,t->flags);`

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!

Commit73dc003

File tree

1 file changed

1 file changed

`‎src/backend/regex/regcomp.c`

0 commit comments