merged from 5_2 (mysqli_info crash)

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index a13aad652c98ecb7d033f217cfbfd9f2b16e45f5..b73c4081bcdb0b57ab72f11a2b9ce42cf47c984b 100644 (file)
--- 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);
 }
 /* }}} */