Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61660: bin2hex(hex2bin($data)) != $data

Author: nikic

Diff for: ext/standard/string.c

@@ -266,6 +266,11 @@ PHP_FUNCTION(hex2bin)
 		return;
 	}
 
+	if (datalen % 2 != 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Hexadecimal input string must have an even length");
+		RETURN_FALSE;
+	}
+
 	result = php_hex2bin((unsigned char *)data, datalen, &newlen);
 
 	if (!result) {

Diff for: ext/standard/tests/strings/bug61660.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Bug #61660: bin2hex(hex2bin($data)) != $data
+--FILE--
+<?php
+
+var_dump(hex2bin('123'));
+
+?>
+--EXPECTF--
+Warning: hex2bin(): Hexadecimal input string must have an even length in %s on line %d
+bool(false)