diff options
| author | Anatol Belski <ab@php.net> | 2014-10-15 12:09:14 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-15 12:09:14 +0200 |
| commit | d6d856b6db68b152a9cf72d16324a10180735bee (patch) | |
| tree | 00c23c2b2581a0c2151e566e16ce8756c0207d29 | |
| parent | 98a8481e5e6bb111e8bb17af929f6fdbda308cb9 (diff) | |
| parent | 52b93004d070ff59a1ed6dcd91c8b08935fc1c04 (diff) | |
| download | php-git-d6d856b6db68b152a9cf72d16324a10180735bee.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Fixed ext/standard/tests/strings/pack64_32.phpt failure (In PHP7, we must not free array of arguments recieved using "+")
| -rw-r--r-- | ext/standard/pack.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index a95c226b97..07206c8b7b 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -55,7 +55,6 @@ #define INC_OUTPUTPOS(a,b) \ if ((a) < 0 || ((INT_MAX - outputpos)/((int)b)) < (a)) { \ - efree(argv); \ efree(formatcodes); \ efree(formatargs); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer overflow in format string", code); \ @@ -210,7 +209,6 @@ PHP_FUNCTION(pack) case 'J': case 'P': #if SIZEOF_ZEND_LONG < 8 - efree(argv); efree(formatcodes); efree(formatargs); php_error_docref(NULL TSRMLS_CC, E_WARNING, "64-bit format codes are not available for 32-bit versions of PHP"); |