com php-src: Fixed bug #68740 (NULL Pointer Dereference): ext/ereg/regex/regcomp.c
| From: | Lior Kaplan | Date: | Tue, 31 Mar 2015 22:24:26 +0000 |
| Subject: | com php-src: Fixed bug #68740 (NULL Pointer Dereference): ext/ereg/regex/regcomp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85982@lists.php.net to get a copy of this message | ||
Commit: 059e774db013a8fc31cf2dce0e4d051580bf9d30
Author: Xinchen Hui <laruence@php.net> Wed, 1 Apr 2015 00:41:46 +0300
Committer: Lior Kaplan <kaplanlior@gmail.com> Wed, 1 Apr 2015 01:24:26 +0300
Parents: 0a8f28b43212cc2ddbc1f2df710e37b1bec0addd
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=059e774db013a8fc31cf2dce0e4d051580bf9d30
Log:
Fixed bug #68740 (NULL Pointer Dereference)
(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)
Bugs:
https://bugs.php.net/68740
Changed paths:
M ext/ereg/regex/regcomp.c
Diff:
diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c
index f4bfc1c..c2223d7 100644
--- a/ext/ereg/regex/regcomp.c
+++ b/ext/ereg/regex/regcomp.c
@@ -1284,6 +1284,10 @@ int c;
register int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
register unsigned uc = (unsigned char)c;
+ if (!g->setbits) {
+ return(0);
+ }
+
for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
if (col[uc] != 0)
return(1);