From: Stefan Esser <sesser@php.net>
Date: Fri, 23 Dec 2005 18:43:03 +0000 (+0000)
Subject: MFB: format string fixes
X-Git-Tag: RELEASE_1_0_4~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5790c9d7277d1e16c56e6a2185d5ac5455a7dd67;p=php

MFB: format string fixes
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 3490d430e1..6d7214d5c9 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1370,7 +1370,7 @@ PHP_FUNCTION(mysqli_real_connect)
 		
 		php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC);
 		php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate, mysql->mysql->net.last_errno TSRMLS_CC,
-										mysql->mysql->net.last_error);
+										"%s", mysql->mysql->net.last_error);
 
 		RETURN_FALSE;
 	}
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index e094a85d53..d793fda8d0 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -91,7 +91,7 @@ PHP_FUNCTION(mysqli_connect)
 		/* Save error messages */
 
 		php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate, mysql->mysql->net.last_errno TSRMLS_CC,
-										mysql->mysql->net.last_error);
+										"%s", mysql->mysql->net.last_error);
 
 		php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC);
 
@@ -249,7 +249,7 @@ PHP_FUNCTION(mysqli_query)
 
 	if (!result) {
 		php_mysqli_throw_sql_exception(mysql->mysql->net.sqlstate, mysql->mysql->net.last_errno TSRMLS_CC,
-										mysql->mysql->net.last_error); 
+										"%s", mysql->mysql->net.last_error); 
 		RETURN_FALSE;
 	}
 
diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c
index 0fe664ddda..d25e8319ec 100644
--- a/ext/mysqli/mysqli_report.c
+++ b/ext/mysqli/mysqli_report.c
@@ -46,7 +46,7 @@ PHP_FUNCTION(mysqli_report)
 
 /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ 
 void php_mysqli_report_error(char *sqlstate, int errorno, char *error TSRMLS_DC) {
-	php_mysqli_throw_sql_exception(sqlstate, errorno TSRMLS_CC, error);
+	php_mysqli_throw_sql_exception(sqlstate, errorno TSRMLS_CC, "%s", error);
 }
 /* }}} */