From: Xinchen Hui <laruence@php.net>
Date: Mon, 30 Jun 2014 07:26:55 +0000 (+0800)
Subject: Fixed segfault while info printing
X-Git-Tag: POST_PHPNG_MERGE~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d660d7f5997347942452ab639345fee7711254a2;p=php

Fixed segfault while info printing
---

diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 3bcaa06327..e0bc6d126d 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -154,12 +154,12 @@ PHP_MINFO_FUNCTION(mysqlnd)
 		smart_str tmp_str = {0};
 		mysqlnd_plugin_apply_with_argument(mysqlnd_minfo_dump_loaded_plugins, &tmp_str);
 		smart_str_0(&tmp_str);
-		php_info_print_table_row(2, "Loaded plugins", tmp_str.s->val);
+		php_info_print_table_row(2, "Loaded plugins", tmp_str.s? tmp_str.s->val : "");
 		smart_str_free(&tmp_str);
 
 		mysqlnd_minfo_dump_api_plugins(&tmp_str TSRMLS_CC);
 		smart_str_0(&tmp_str);
-		php_info_print_table_row(2, "API Extensions", tmp_str.s->val);
+		php_info_print_table_row(2, "API Extensions", tmp_str.s? tmp_str.s->val : "");
 		smart_str_free(&tmp_str);
 	}