com php-src: Fixed string destruction (ext/mysql/tests/mysql _list_fields.phpt was failed): ext/mysqlnd/mysq lnd_result_meta.c

Commit: ba45650d632f2116178ec282deda98bc65d9b09c Author: Dmitry Stogov <dmitry@zend.com> Mon, 23 Jun 2014 17:18:47 +0400 Parents: 0c5a1b835ea8d2ef47d3fa1a162d9333ec2686b5 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba45650d632f2116178ec282deda98bc65d9b09c Log: Fixed string destruction (ext/mysql/tests/mysql_list_fields.phpt was failed) Changed paths: M ext/mysqlnd/mysqlnd_result_meta.c Diff: diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index c3906ed..5bd9f0f 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -36,12 +36,24 @@ php_mysqlnd_free_field_metadata(MYSQLND_FIELD *meta, zend_bool persistent TSRMLS if (meta->def) { STR_RELEASE(meta->def); } - STR_RELEASE(meta->name); - STR_RELEASE(meta->org_name); - STR_RELEASE(meta->table); - STR_RELEASE(meta->org_table); - STR_RELEASE(meta->db); - STR_RELEASE(meta->catalog); + if (meta->name) { + STR_RELEASE(meta->name); + } + if (meta->org_name) { + STR_RELEASE(meta->org_name); + } + if (meta->table) { + STR_RELEASE(meta->table); + } + if (meta->org_table) { + STR_RELEASE(meta->org_table); + } + if (meta->db) { + STR_RELEASE(meta->db); + } + if (meta->catalog) { + STR_RELEASE(meta->catalog); + } } } /* }}} */