From a8d9958f70213e4558056e0fb8805e1c106f093c Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Sat, 6 Jan 2007 05:50:36 +0000 Subject: [PATCH] merged from 5_2 (mysqli_info crash) --- ext/mysqli/mysqli_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index a13aad652c..b73c4081bc 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1099,7 +1099,7 @@ PHP_FUNCTION(mysqli_info) } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); - RETURN_UTF8_STRING(mysql->mysql->info, ZSTR_DUPLICATE); + RETURN_UTF8_STRING((mysql->mysql->info) ? mysql->mysql->info : "", ZSTR_DUPLICATE); } /* }}} */ -- 2.50.1