From ba45650d632f2116178ec282deda98bc65d9b09c Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 23 Jun 2014 17:18:47 +0400 Subject: [PATCH] Fixed string destruction (ext/mysql/tests/mysql_list_fields.phpt was failed) --- ext/mysqlnd/mysqlnd_result_meta.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index c3906ed8a6..5bd9f0f0b2 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); + } } } /* }}} */ -- 2.40.0