]> granicus.if.org Git - php/commitdiff
fix condition
authorAnatol Belski <ab@php.net>
Mon, 15 Sep 2014 08:51:56 +0000 (10:51 +0200)
committerAnatol Belski <ab@php.net>
Mon, 15 Sep 2014 09:30:22 +0000 (11:30 +0200)
ext/iconv/iconv.c

index 1803266c3388d5ab3f137321fe90a8fff865db57..d27270ece98efd8c4da96240972f03cde01f3625 100644 (file)
@@ -2076,7 +2076,7 @@ PHP_FUNCTION(iconv_substr)
        err = _php_iconv_substr(&retval, str->val, str->len, offset, length, charset);
        _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
 
-       if (err == PHP_ICONV_ERR_SUCCESS && str->val != NULL && retval.s != NULL) {
+       if (err == PHP_ICONV_ERR_SUCCESS && str->val[0] != '\0' && retval.s != NULL) {
                RETURN_STR(retval.s);
        }
        smart_str_free(&retval);