archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bin2hex() to work on binary data and return strings of correct type.

Browse source
This commit is contained in:
Andrei Zmievski 2005-08-17 17:39:04 +00:00
parent ed370daef5
commit 202bb697fd
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/standard/string.c
View file

@ -185,22 +185,28 @@ PHP_MSHUTDOWN_FUNCTION(localeconv)
Converts the binary representation of data to hex */
PHP_FUNCTION(bin2hex)
{
zval **data;
unsigned char *data;
int data_len;
char *result;
size_t newlen;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &data) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "y", &data, &data_len) == FAILURE) {
return;
}
convert_to_string_ex(data);
result = php_bin2hex(Z_STRVAL_PP(data), Z_STRLEN_PP(data), &newlen);
result = php_bin2hex(data, data_len, &newlen);
if (!result) {
RETURN_FALSE;
}
RETURN_STRINGL(result, newlen, 0);
if (UG(unicode)) {
UChar *u_temp = zend_ascii_to_unicode(result, newlen+1 ZEND_FILE_LINE_CC);
efree(result);
RETVAL_UNICODEL(u_temp, newlen, 0);
} else {
RETURN_STRINGL(result, newlen, 0);
}
}
/* }}} */