diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-04-29 11:13:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-04-29 11:13:29 +0800 |
| commit | 2f17ef1d25988d8a0a642d262c8dc92d0f205b3c (patch) | |
| tree | f9c173460c4c9436350c23a1d653b33da84fa310 | |
| parent | 153b27dff12678a2bd3d4a76e8f515e7e0403a26 (diff) | |
| parent | a5718539b16616bb23fb2897124733c0514454bd (diff) | |
| download | php-git-2f17ef1d25988d8a0a642d262c8dc92d0f205b3c.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed build
Add NEWS entry for bug #71331 (fixed in 7.0.3)
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
| -rw-r--r-- | ext/interbase/ibase_blobs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c index 209904b18a..3cd649dbf9 100644 --- a/ext/interbase/ibase_blobs.c +++ b/ext/interbase/ibase_blobs.c @@ -99,7 +99,7 @@ int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, zend_ulong max_ zend_ulong cur_len; unsigned short seg_len; - bl_data = zend_string_alloc(1, max_len, 0, 0); + bl_data = zend_string_safe_alloc(1, max_len, 0, 0); for (cur_len = stat = 0; (stat == 0 || stat == isc_segment) && cur_len < max_len; cur_len += seg_len) { |