diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-04-01 11:49:30 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-04-01 11:49:30 +0000 |
| commit | 6eaa47854e9bb6465349247ff3c419c7e0f807ff (patch) | |
| tree | 2e3b926e04153e3a50b3f963a30b814a5cf0dbee | |
| parent | 60214a03388f612b7a5a9b0f1816f2dd1808277d (diff) | |
| download | php-git-6eaa47854e9bb6465349247ff3c419c7e0f807ff.tar.gz | |
Fixed crash in mb_convert_encoding() that occurs when a void array is
passed as the third parameter
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 7c0c3de2d6..ff1192737a 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1969,7 +1969,7 @@ PHP_FUNCTION(mb_convert_encoding) zend_hash_move_forward(target_hash); i--; } - if ( !strlen(_from_encodings)) { + if (_from_encodings != NULL && !strlen(_from_encodings)) { efree(_from_encodings); _from_encodings = NULL; } |