com php-src: Remove self-contradictory zend multibyte assertion: Zend/zend_language_scanner.c Zend/zend_language_sca nner.l
ext/mbstring/tests/zend_multibyte-02.phpt ext/mbstring/tests/zend_multibyte-06.phpt
| From: | Nikita Popov | Date: | Thu, 11 Sep 2014 12:52:59 +0000 |
| Subject: | com php-src: Remove self-contradictory zend multibyte assertion: Zend/zend_language_scanner.c Zend/zend_language_sca nner.l ext/mbstring/tests/zend_multibyte-02.phpt ext/mbstring/tests/zend_multibyte-06.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81505@lists.php.net to get a copy of this message | ||
Commit: f017843df37028aab161e42368aaa1caaa548322
Author: Nikita Popov <nikic@php.net> Thu, 11 Sep 2014 14:04:15 +0200
Parents: 82096dc15181fce8f3d748a4f86b35911a5d107e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f017843df37028aab161e42368aaa1caaa548322
Log:
Remove self-contradictory zend multibyte assertion
Code that explicitly exists to handle an incompatible internal
encoding should not assert that the internal encoding is compatible.
Changed paths:
M Zend/zend_language_scanner.c
M Zend/zend_language_scanner.l
M ext/mbstring/tests/zend_multibyte-02.phpt
M ext/mbstring/tests/zend_multibyte-06.phpt
Diff:
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 5bb92e5..e524e0b 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -128,7 +128,7 @@ BEGIN_EXTERN_C()
static size_t encoding_filter_script_to_internal(unsigned char **to, size_t *to_length, const
unsigned char *from, size_t from_length TSRMLS_DC)
{
const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding(TSRMLS_C);
- assert(internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding));
+ ZEND_ASSERT(internal_encoding);
return zend_multibyte_encoding_converter(to, to_length, from, from_length, internal_encoding,
LANG_SCNG(script_encoding) TSRMLS_CC);
}
@@ -146,7 +146,7 @@ LANG_SCNG(script_encoding), zend_multibyte_encoding_utf8 TSRMLS_CC);
static size_t encoding_filter_intermediate_to_internal(unsigned char **to, size_t *to_length, const
unsigned char *from, size_t from_length TSRMLS_DC)
{
const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding(TSRMLS_C);
- assert(internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding));
+ ZEND_ASSERT(internal_encoding);
return zend_multibyte_encoding_converter(to, to_length, from, from_length,
internal_encoding, zend_multibyte_encoding_utf8 TSRMLS_CC);
}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index dc91090..146e354 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -126,7 +126,7 @@ BEGIN_EXTERN_C()
static size_t encoding_filter_script_to_internal(unsigned char **to, size_t *to_length, const
unsigned char *from, size_t from_length TSRMLS_DC)
{
const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding(TSRMLS_C);
- assert(internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding));
+ ZEND_ASSERT(internal_encoding);
return zend_multibyte_encoding_converter(to, to_length, from, from_length, internal_encoding,
LANG_SCNG(script_encoding) TSRMLS_CC);
}
@@ -144,7 +144,7 @@ LANG_SCNG(script_encoding), zend_multibyte_encoding_utf8 TSRMLS_CC);
static size_t encoding_filter_intermediate_to_internal(unsigned char **to, size_t *to_length, const
unsigned char *from, size_t from_length TSRMLS_DC)
{
const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding(TSRMLS_C);
- assert(internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding));
+ ZEND_ASSERT(internal_encoding);
return zend_multibyte_encoding_converter(to, to_length, from, from_length,
internal_encoding, zend_multibyte_encoding_utf8 TSRMLS_CC);
}
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index 8a1a572..7db4448 100644
--- a/ext/mbstring/tests/zend_multibyte-02.phpt
+++ b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -1,6 +1,7 @@
--TEST--
zend multibyte (2)
--INI--
+error_reporting=E_ALL & ~E_DEPRECATED
zend.multibyte=On
zend.script_encoding=UTF-8
mbstring.internal_encoding=CP932
@@ -9,4 +10,4 @@ mbstring.internal_encoding=CP932
var_dump(bin2hex("テスト"));
?>
--EXPECTF--
-php: Zend/zend_language_scanner.l:%d: encoding_filter_script_to_internal: Assertion
`internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding)'
failed.
+string(12) "836583588367"
diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
index 1b8adb5..7eeac1d 100644
--- a/ext/mbstring/tests/zend_multibyte-06.phpt
+++ b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -10,4 +10,4 @@ declare(encoding="UTF-8");
var_dump(bin2hex("テスト"));
?>
--EXPECTF--
-php: Zend/zend_language_scanner.l:%d: encoding_filter_script_to_internal: Assertion
`internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding)'
failed.
+string(12) "836583588367"