Skip to content

Fix bug #61660 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Fix bug #61660 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebac2da
fix for bug 61660 (hex2bin will now always return an even length stri…
Apr 8, 2012
6fd75d6
Bug fix test for bug #61660
Apr 8, 2012
5857270
ammended bugfix 61660
Apr 8, 2012
886e770
ammending bugid #61660 (removed initialized char c value)
Apr 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,19 @@ static char *php_bin2hex(const unsigned char *old, const size_t oldlen, size_t *
static char *php_hex2bin(const unsigned char *old, const size_t oldlen, size_t *newlen)
{
size_t target_length = oldlen >> 1;
int e = oldlen & 1;
if (e) {
target_length++;
}
register unsigned char *str = (unsigned char *)safe_emalloc(target_length, sizeof(char), 1);
size_t i, j;
for (i = j = 0; i < target_length; i++) {
char c = old[j++];
char c;
if (j == 0 && e) {
c = '0';
} else {
c = old[j++];
}
if (c >= '0' && c <= '9') {
str[i] = (c - '0') << 4;
} else if (c >= 'a' && c <= 'f') {
Expand Down
9 changes: 9 additions & 0 deletions ext/standard/tests/strings/61660.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--TEST--
hex2bin() function
--FILE--
<?php
$hex = bin2hex(hex2bin('12345'));
echo "$hex\n";
?>
--EXPECT--
012345