diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-17 17:04:57 -0700 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-03-18 10:39:08 +0100 |
| commit | 94e7638d9a04ebb82433147ef65e70a85d988074 (patch) | |
| tree | 4a00b78462da2cdb8fdbbd6f4d5da68b557616fb | |
| parent | 2256ee4fa7b79bf4626cbe4e10d49fdab695e3ac (diff) | |
| download | php-git-94e7638d9a04ebb82433147ef65e70a85d988074.tar.gz | |
Fix bug #69248 - heap overflow vulnerability in regcomp.c
Merged from https://github.com/garyhouston/regex/commit/70bc2965604b6b8aaf260049e64c708dddf85334
| -rw-r--r-- | ext/ereg/regex/regcomp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c index 156eee9329..f4bfc1c167 100644 --- a/ext/ereg/regex/regcomp.c +++ b/ext/ereg/regex/regcomp.c @@ -117,7 +117,15 @@ int cflags; (NC-1)*sizeof(cat_t)); if (g == NULL) return(REG_ESPACE); - p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ + { + /* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */ + size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ + if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) { + free((char *) g); + return REG_INVARG; + } + p->ssize = new_ssize; + } p->strip = (sop *)malloc(p->ssize * sizeof(sop)); p->slen = 0; if (p->strip == NULL) { |