php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: use memcmp() for binary safety.

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2008-09-12 23:35:01 +00:00
parent 41201c78b2
commit 6c8d64f6b4
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ext/mbstring/mbstring.c
View File

@@ -4666,14 +4666,12 @@ PHP_FUNCTION(mb_check_encoding)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create converter");
RETURN_FALSE;
}
mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode));
mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar));
mbfl_buffer_converter_illegal_mode(convd, MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE);
mbfl_buffer_converter_illegal_substchar(convd, 0);
/* initialize string */
mbfl_string_init(&string);
mbfl_string_init_set(&string, mbfl_no_language_neutral, no_encoding);
mbfl_string_init(&result);
string.no_encoding = no_encoding;
string.no_language = MBSTRG(language);
string.val = (unsigned char *)var;
string.len = var_len;
@@ -4681,17 +4679,12 @@ PHP_FUNCTION(mb_check_encoding)
illegalchars = mbfl_buffer_illegalchars(convd);
mbfl_buffer_converter_delete(convd);
RETVAL_FALSE;
if (ret != NULL) {
MBSTRG(illegalchars) += illegalchars;
if (illegalchars == 0 && strncmp((char *)string.val, (char *)ret->val, string.len) == 0) {
efree(ret->val);
RETURN_TRUE;
} else {
efree(ret->val);
RETURN_FALSE;
if (illegalchars == 0 && string.len == result.len && memcmp(string.val, result.val, string.len) == 0) {
RETVAL_TRUE;
}
} else {
RETURN_FALSE;
mbfl_string_clear(&result);
}
}
/* }}} */