php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-15 12:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  Fixed bug #72979 money_format stores wrong length on AIX
This commit is contained in:
Joe Watkins
2017-01-09 05:32:22 +00:00
parent 0738a78c59 8dd523a216
commit bf6eb65673
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -25,6 +25,7 @@ PHP NEWS
. Fixed bug #47021 (SoapClient stumbles over WSDL delivered with
"Transfer-Encoding: chunked"). (Rowan Collins)
. Fixed bug #72974 (imap is undefined service on AIX). (matthieu.sarter)
. Fixed bug #72979 (money_format stores wrong length AIX). (matthieu.sarter)
- ZIP:
. Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb,

8
ext/standard/string.c
View File

@@ -5531,7 +5531,15 @@ PHP_FUNCTION(money_format)
zend_string_free(str);
RETURN_FALSE;
}
#ifdef _AIX
/*
On AIX strfmon seems to include the terminating \0 in the length returned by strfmon,
despite the documentation indicating it is not included.
*/
ZSTR_LEN(str) = strlen(ZSTR_VAL(str));
#else
ZSTR_LEN(str) = (size_t)res_len;
#endif
ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0';
RETURN_NEW_STR(zend_string_truncate(str, ZSTR_LEN(str), 0));