]> granicus.if.org Git - php/commitdiff
Fixed ASCII-comatimle encoding detection
authorDmitry Stogov <dmitry@php.net>
Tue, 15 Dec 2009 12:29:26 +0000 (12:29 +0000)
committerDmitry Stogov <dmitry@php.net>
Tue, 15 Dec 2009 12:29:26 +0000 (12:29 +0000)
Zend/zend_language_scanner.l

index 0a8d4ae95da72dd17c25dd1480d4b41e793ea947..df329c037eda044369945e052e8149939fa5e5be 100644 (file)
@@ -492,13 +492,13 @@ static int is_encoding_flex_compatible(const char *enc TSRMLS_DC)
                                char output[sizeof(expected)];
 
                                if (ucnv_fromUChars(conv,
-                                                   output, sizeof(output),
-                                                   ascii, sizeof(expected),
-                                                   &status) != sizeof(expected) ||
+                                                   output, sizeof(output)-1,
+                                                   ascii, sizeof(expected)-1,
+                                                   &status) != sizeof(expected)-1 ||
                                    U_FAILURE(status)) {
                                        ret = 0;
                                } else {
-                                       ret = (memcmp(expected, output, sizeof(expected)) == 0);
+                                       ret = (memcmp(expected, output, sizeof(expected)-1) == 0);
                                }
                        }
                }