Commit Diff

Commit:
27589754e47a2d2e682ee29daa2d21dff99e509d
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
libregexp: fix match choice bug This bug fix allows some pathological regular expressions to cause the regexp library to report a stack overflow (really a stack filling; safe) but it also fixes the behavior of some common regexps. It is too hard to satisfy both.
Actions:
Patch | Tree
commit - 79ff7e4b5e5c157aa1347152752eb7c2903ecaca
commit + 27589754e47a2d2e682ee29daa2d21dff99e509d
blob - c04182a1aee0a8c97ce770af7b71b8879038d84a
blob + a00fbcbc9b8cbee2ce787863edcce9c14ebea349
--- src/libregexp/regexec.c
+++ src/libregexp/regexec.c
@@ -132,7 +132,7 @@ regexec1(Reprog *progp,	/* program to run */
 					break;
 				case OR:
 					/* evaluate right choice later */
-					if(_renewthread(tl, inst->u1.right, ms, &tlp->se) == tle)
+					if(_renewthread(tlp, inst->u1.right, ms, &tlp->se) == tle)
 						return -1;
 					/* efficiency: advance and re-evaluate */
 					continue;
blob - ec7907da547207d235b7838534cbd7080b1a775f
blob + 16d95e674792b8c72846db2f483b078aa427f386
--- src/libregexp/rregexec.c
+++ src/libregexp/rregexec.c
@@ -125,7 +125,7 @@ rregexec1(Reprog *progp,	/* program to run */
 					break;
 				case OR:
 					/* evaluate right choice later */
-					if(_renewthread(tl, inst->u1.right, ms, &tlp->se) == tle)
+					if(_renewthread(tlp, inst->u1.right, ms, &tlp->se) == tle)
 						return -1;
 					/* efficiency: advance and re-evaluate */
 					continue;