diff options
| author | Scott MacVicar <scottmac@php.net> | 2009-01-29 23:01:40 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2009-01-29 23:01:40 +0000 |
| commit | e09a820b19c06b2da3302680f51e4af07435462f (patch) | |
| tree | f462bc35df0f08e1fb1f5c6ab4eb1ae7843b3f14 | |
| parent | 71b236d7a0eeacd25d57cc51b5e31bb225707786 (diff) | |
| download | php-git-e09a820b19c06b2da3302680f51e4af07435462f.tar.gz | |
MFB Fix bug #47245 - Double free in mb_detect_encoding()
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 42d1324992..5c3255b829 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3018,6 +3018,7 @@ PHP_FUNCTION(mb_detect_encoding) if (!php_mb_parse_encoding_array(encoding_list, &list, &size, 0 TSRMLS_CC)) { if (list) { efree(list); + list = NULL; size = 0; } } @@ -3027,6 +3028,7 @@ PHP_FUNCTION(mb_detect_encoding) if (!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) { if (list) { efree(list); + list = NULL; size = 0; } } |