summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-09-11 14:04:15 +0200
committerNikita Popov <nikic@php.net>2014-09-11 14:52:59 +0200
commitf017843df37028aab161e42368aaa1caaa548322 (patch)
tree96bbb1f89429c1ee342505c5e40a391b399e4eaf /Zend/zend_language_scanner.c
parent82096dc15181fce8f3d748a4f86b35911a5d107e (diff)
downloadphp-git-f017843df37028aab161e42368aaa1caaa548322.tar.gz
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.
Diffstat (limited to 'Zend/zend_language_scanner.c')
-rw-r--r--Zend/zend_language_scanner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 5bb92e5706..e524e0b684 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);
}