diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-01 00:41:46 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 01:24:26 +0300 |
| commit | 059e774db013a8fc31cf2dce0e4d051580bf9d30 (patch) | |
| tree | c0be97ed89ac6eefe8e5b07d144e7a01493ed237 | |
| parent | 0a8f28b43212cc2ddbc1f2df710e37b1bec0addd (diff) | |
| download | php-git-059e774db013a8fc31cf2dce0e4d051580bf9d30.tar.gz | |
Fixed bug #68740 (NULL Pointer Dereference)
(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)
| -rw-r--r-- | ext/ereg/regex/regcomp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c index f4bfc1c167..c2223d7dbe 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); |