svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

johannes Mon, 05 Mar 2012 23:55:12 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323929 Log: Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled # 5.3 not affected Bugs: https://bugs.php.net/60948 (Assigned) mysqlnd FTBFS when -Wformat-security is enabled https://bugs.php.net/5 (Closed) fclose in php3_minit_file undeclared Changed paths: U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-03-05 23:38:15 UTC (rev 323928) +++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-03-05 23:55:12 UTC (rev 323929) @@ -500,7 +500,7 @@ const char * const msg = "Authentication data too long. " "Won't fit into the buffer and will be truncated. Authentication will thus fail"; SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, msg); - php_error_docref(NULL TSRMLS_CC, E_WARNING, msg); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", msg); DBG_RETURN(0); } Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-03-05 23:38:15 UTC (rev 323928) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-03-05 23:55:12 UTC (rev 323929) @@ -500,7 +500,7 @@ const char * const msg = "Authentication data too long. " "Won't fit into the buffer and will be truncated. Authentication will thus fail"; SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, msg); - php_error_docref(NULL TSRMLS_CC, E_WARNING, msg); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", msg); DBG_RETURN(0); }