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

index 7063cadd4eefbdef39f8ae9c435823fa149197ab..19ee792bb65d9378d7f24a2adc7b02ef5fbe279a 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
+/* Generated by re2c 0.13.5 on Tue Dec 15 15:29:48 2009 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -494,13 +494,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);
                                }
                        }
                }
index 39fe3282da759cb861e6d63f792fb07f6e81892f..caa33dd3ee9e161452f180a19da4b136a1ef730d 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
+/* Generated by re2c 0.13.5 on Tue Dec 15 15:29:48 2009 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {