From 94f414ca1d50e02a55a2f2fb0f435892a7fcb480 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 15 Dec 2009 12:30:14 +0000 Subject: [PATCH] Fixed ASCII-comatimle encoding detection --- Zend/zend_language_scanner.c | 10 +++++----- Zend/zend_language_scanner_defs.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 7063cadd4e..19ee792bb6 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -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); } } } diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 39fe3282da..caa33dd3ee 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -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 { -- 2.50.1