diff options
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug25140.phpt | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 7e53e7e350..b0939cebc1 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2485,7 +2485,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t if (output_len) { *output_len = 0; } - if (!input) { + if ( !input || !length) { return NULL; } /* new encoding */ diff --git a/ext/mbstring/tests/bug25140.phpt b/ext/mbstring/tests/bug25140.phpt deleted file mode 100644 index 0b209120f5..0000000000 --- a/ext/mbstring/tests/bug25140.phpt +++ /dev/null @@ -1,10 +0,0 @@ ---TEST-- -Bug #25140 (mb_convert_encoding returns FALSE on an empty string) ---SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> ---FILE-- -<?php -var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) ); -?> ---EXPECT-- -string(0) "" |