From: Georg Richter <georg@php.net>
Date: Sat, 6 Jan 2007 05:50:36 +0000 (+0000)
Subject: merged from 5_2 (mysqli_info crash)
X-Git-Tag: RELEASE_1_0_0RC1~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8d9958f70213e4558056e0fb8805e1c106f093c;p=php

merged from 5_2 (mysqli_info crash)
---

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);
 }
 /* }}} */