Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

cjbj · cjbj · commit 79df8cf9c295 · 2013-07-08T13:30:54.000-07:00
* 'PHP-5.4' of https://git.php.net/repository/php-src: Fixed segfault in mysqlnd when doing long prepare
diff --git a/NEWS b/NEWS
@@ -33,6 +33,9 @@ PHP                                                                        NEWS
   . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
   . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
     (Stas)
+
+- mysqlnd: 
+  . Fixed segfault in mysqlnd when doing long prepare. (Andrey)
   
 - ODBC:
   . Fixed bug #61387 (NULL valued anonymous column causes segfault in 
diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -626,6 +626,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
 		*p += null_count;
 	}
 
+	left = (*buf_len - (*p - *buf));
 /* 1. Store type information */
 	/*
 	  check if need to send the types even if stmt->send_types_to_server is 0. This is because

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar`
`626`	`626`	`*p += null_count;`
`627`	`627`	`}`
`628`	`628`
	`629`	`+ left = (buf_len - (p - *buf));`
`629`	`630`	`/* 1. Store type information */`
`630`	`631`	`/*`
`631`	`632`	`check if need to send the types even if stmt->send_types_to_server is 0. This is because`