diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-17 17:04:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-17 17:04:57 -0700 |
| commit | fb04dcf6dbb48aecd8d2dc986806cb58c8ae5282 (patch) | |
| tree | bb12ca0d511f6dafab2e8345640cd625e64771c7 | |
| parent | 8b14d3052ffcffa17d6e2be652f20e18f8f562ad (diff) | |
| download | php-git-fb04dcf6dbb48aecd8d2dc986806cb58c8ae5282.tar.gz | |
Fix bug #69248 - heap overflow vulnerability in regcomp.c
Merged from https://github.com/garyhouston/regex/commit/70bc2965604b6b8aaf260049e64c708dddf85334
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/ereg/regex/regcomp.c | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -8,6 +8,9 @@ PHP NEWS configuration options). (Anatol Belski) . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas) +- Ereg: + . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (Stas) + - SOAP: . Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()). (Dmitry) 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) { |