diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-07-02 18:50:54 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-07-02 18:50:54 +0300 |
| commit | 0fd2b4c030c8fc251954e8351dcc66dc10c0155c (patch) | |
| tree | 253c28a605eac7f78e7ae702251cc09954210c0b /ext/interbase/ibase_blobs.c | |
| parent | d0787534c0cae2d8bd4f5bedaff7b11eb8b55d19 (diff) | |
| download | php-git-0fd2b4c030c8fc251954e8351dcc66dc10c0155c.tar.gz | |
Cleanup (avoid reallocation)
Diffstat (limited to 'ext/interbase/ibase_blobs.c')
| -rw-r--r-- | ext/interbase/ibase_blobs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c index 6134694932..7008026ff4 100644 --- a/ext/interbase/ibase_blobs.c +++ b/ext/interbase/ibase_blobs.c @@ -98,29 +98,28 @@ int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long m if (ib_blob->bl_qd.gds_quad_high || ib_blob->bl_qd.gds_quad_low) { /*not null ?*/ ISC_STATUS stat; - char *bl_data; + zend_string *bl_data; unsigned long cur_len; unsigned short seg_len; - bl_data = safe_emalloc(1, max_len, 1); + bl_data = zend_string_alloc(max_len, 0); for (cur_len = stat = 0; (stat == 0 || stat == isc_segment) && cur_len < max_len; cur_len += seg_len) { unsigned short chunk_size = (max_len-cur_len) > USHRT_MAX ? USHRT_MAX : (unsigned short)(max_len-cur_len); - stat = isc_get_segment(IB_STATUS, &ib_blob->bl_handle, &seg_len, chunk_size, &bl_data[cur_len]); + stat = isc_get_segment(IB_STATUS, &ib_blob->bl_handle, &seg_len, chunk_size, &ZSTR_VAL(bl_data)[cur_len]); } - bl_data[cur_len] = '\0'; if (IB_STATUS[0] == 1 && (stat != 0 && stat != isc_segstr_eof && stat != isc_segment)) { - efree(bl_data); + zend_string_free(bl_data); _php_ibase_error(); return FAILURE; } - // TODO: avoid double reallocation??? - RETVAL_STRINGL(bl_data, cur_len); - efree(bl_data); + ZSTR_VAL(bl_data)[cur_len] = '\0'; + ZSTR_LEN(bl_data) = cur_len; + RETVAL_NEW_STR(bl_data); } else { /* null blob */ RETVAL_EMPTY_STRING(); /* empty string */ } |