diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-08-13 21:05:18 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-08-13 21:05:57 +0200 |
| commit | 36eddfc785ad2db4293571eabb5fc5ac989bb8d8 (patch) | |
| tree | 4dc114e57fe8f780856621052e95b286b4ebd0d1 | |
| parent | bbf39c550f59648ddb2f084efc457ac9909075f0 (diff) | |
| parent | 207105b1a3844cf4d3fd5f17e17ddbd6804e1938 (diff) | |
| download | php-git-36eddfc785ad2db4293571eabb5fc5ac989bb8d8.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #73793 (WDDX uses wrong decimal seperator)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/wddx/tests/bug73793.phpt | 18 | ||||
| -rw-r--r-- | ext/wddx/wddx.c | 6 |
3 files changed, 26 insertions, 1 deletions
@@ -26,6 +26,9 @@ PHP NEWS . Fixed bug #75054 (A Denial of Service Vulnerability was found when performing deserialization). (Nikita) +- WDDX: + . Fixed bug #73793 (WDDX uses wrong decimal seperator). (cmb) + - XMLRPC: . Fixed bug #74975 (Incorrect xmlrpc serialization for classes with declared properties). (blar) diff --git a/ext/wddx/tests/bug73793.phpt b/ext/wddx/tests/bug73793.phpt new file mode 100644 index 0000000000..fed4b3525f --- /dev/null +++ b/ext/wddx/tests/bug73793.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #73793 (WDDX uses wrong decimal seperator) +--SKIPIF-- +<?php +if (!extension_loaded('wddx')) print 'skip wddx extension not available'; +if (setlocale(LC_NUMERIC, ['de_DE', 'de_DE.UTF-8', 'de-DE']) === false) { + print 'skip German locale not available'; +} +?> +--FILE-- +<?php +setlocale(LC_NUMERIC , ['de_DE', 'de_DE.UTF-8', 'de-DE']); +var_dump(wddx_serialize_value(['foo' => 5.1])); +?> +===DONE=== +--EXPECT-- +string(120) "<wddxPacket version='1.0'><header/><data><struct><var name='foo'><number>5.1</number></var></struct></data></wddxPacket>" +===DONE=== diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index a540b24176..b6af00edd7 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -420,11 +420,15 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var) */ static void php_wddx_serialize_number(wddx_packet *packet, zval *var) { - char tmp_buf[WDDX_BUF_LEN]; + char tmp_buf[WDDX_BUF_LEN], *dec_point; zend_string *str = zval_get_string(var); snprintf(tmp_buf, sizeof(tmp_buf), WDDX_NUMBER, ZSTR_VAL(str)); zend_string_release(str); + dec_point = strchr(tmp_buf, ','); + if (dec_point) { + *dec_point = '.'; + } php_wddx_add_chunk(packet, tmp_buf); } /* }}} */ |