svn: /php/php-src/trunk/Zend/ zend_language_scanner.c zend_language_scanner_defs.h

dmitry Tue, 15 Dec 2009 12:30:14 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292160 Log: Fixed ASCII-comatimle encoding detection Changed paths: U php/php-src/trunk/Zend/zend_language_scanner.c U php/php-src/trunk/Zend/zend_language_scanner_defs.h Modified: php/php-src/trunk/Zend/zend_language_scanner.c =================================================================== --- php/php-src/trunk/Zend/zend_language_scanner.c 2009-12-15 12:29:26 UTC (rev 292159) +++ php/php-src/trunk/Zend/zend_language_scanner.c 2009-12-15 12:30:14 UTC (rev 292160) @@ -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 @@ 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); } } } Modified: php/php-src/trunk/Zend/zend_language_scanner_defs.h =================================================================== --- php/php-src/trunk/Zend/zend_language_scanner_defs.h 2009-12-15 12:29:26 UTC (rev 292159) +++ php/php-src/trunk/Zend/zend_language_scanner_defs.h 2009-12-15 12:30:14 UTC (rev 292160) @@ -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 {