]> granicus.if.org Git - php/commitdiff
Fixed null value check in php_mb_mbchar_bytes_ex() as it should be
authorMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 25 Oct 2002 09:36:36 +0000 (09:36 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 25 Oct 2002 09:36:36 +0000 (09:36 +0000)
ext/mbstring/mbstring.c

index 4d2bf3b2ec70903eb8097a894a1a2184a8b467b6..d48c937a933697d846b4a6015a693c8ce5eecf2c 100644 (file)
@@ -3451,7 +3451,7 @@ PHPAPI size_t php_mb_mbchar_bytes_ex(const char *s, const mbfl_encoding *enc)
        if (enc != NULL) {
                if(enc->flag & MBFL_ENCTYPE_MBCS) {
                        if(enc->mblen_table != NULL) {
-                               if (*s != '\0') return enc->mblen_table[*(unsigned char *)s];
+                               if (s != NULL) return enc->mblen_table[*(unsigned char *)s];
                        }
                } else if (enc->flag & (MBFL_ENCTYPE_WCS2BE | MBFL_ENCTYPE_WCS2LE)) {
                        return 2;