More accurate fix for bug #25140

This commit is contained in:
Moriyoshi Koizumi 2003-08-19 14:48:33 +00:00
parent 8b14a91ecf
commit 9bb299eb42

View File

@ -1864,7 +1864,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t
if (output_len) {
*output_len = 0;
}
if ( !input || !length) {
if (!input) {
return NULL;
}
/* new encoding */
@ -2004,7 +2004,7 @@ PHP_FUNCTION(mb_convert_encoding)
if (ret != NULL) {
RETVAL_STRINGL(ret, size, 0); /* the string is already strdup()'ed */
} else {
RETVAL_STRINGL("", 0, 1);
RETVAL_FALSE;
}
if ( s_free) {
efree(s_free);