andrey Thu, 02 Feb 2012 15:00:42 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323020
Log: assert Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 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_3/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-02-02 13:40:16 UTC (rev 323019) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-02-02 15:00:42 UTC (rev 323020) @@ -958,7 +958,11 @@ BAIL_IF_NO_MORE_DATA; } - /* 1 byte filler */ + /* 1 byte length */ + if (12 != *p) { + DBG_ERR_FMT("Protocol error. Server sent false length. Expected 12 got %d", (int) *p); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol error. Server sent false length. Expected 12"); + } p++; BAIL_IF_NO_MORE_DATA; 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-02-02 13:40:16 UTC (rev 323019) +++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-02-02 15:00:42 UTC (rev 323020) @@ -1177,7 +1177,11 @@ BAIL_IF_NO_MORE_DATA; } - /* 1 byte filler */ + /* 1 byte length */ + if (12 != *p) { + DBG_ERR_FMT("Protocol error. Server sent false length. Expected 12 got %d", (int) *p); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol error. Server sent false length. Expected 12"); + } p++; BAIL_IF_NO_MORE_DATA; Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-02-02 13:40:16 UTC (rev 323019) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2012-02-02 15:00:42 UTC (rev 323020) @@ -1177,7 +1177,11 @@ BAIL_IF_NO_MORE_DATA; } - /* 1 byte filler */ + /* 1 byte length */ + if (12 != *p) { + DBG_ERR_FMT("Protocol error. Server sent false length. Expected 12 got %d", (int) *p); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol error. Server sent false length. Expected 12"); + } p++; BAIL_IF_NO_MORE_DATA;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php