sesser Fri Dec 23 18:23:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c
Log:
Beware of format strings...
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.11&r2=1.118.2.12&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.11
php-src/ext/mysqli/mysqli_api.c:1.118.2.12
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.11 Thu Dec 22 18:11:39 2005
+++ php-src/ext/mysqli/mysqli_api.c Fri Dec 23 18:23:43 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.11 2005/12/22 18:11:39 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.12 2005/12/23 18:23:43 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1409,7 +1409,7 @@
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;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.3&r2=1.54.2.4&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.3
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.4
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.3 Thu Dec 22 14:55:55 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Fri Dec 23 18:23:43 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.3 2005/12/22 14:55:55 zeev Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.4 2005/12/23 18:23:43 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -91,7 +91,7 @@
/* 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 @@
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;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_report.c?r1=1.11&r2=1.11.2.1&diff_format=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.11
php-src/ext/mysqli/mysqli_report.c:1.11.2.1
--- php-src/ext/mysqli/mysqli_report.c:1.11 Wed Aug 3 14:07:31 2005
+++ php-src/ext/mysqli/mysqli_report.c Fri Dec 23 18:23:43 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.11 2005/08/03 14:07:31 sniper Exp $
+ $Id: mysqli_report.c,v 1.11.2.1 2005/12/23 18:23:43 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -46,7 +46,7 @@
/* {{{ 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);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
