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

* 'PHP-5.4' of https://git.php.net/repository/php-src: Fixed segfault in mysqlnd when doing long prepare
13 years ago · 79df8cf9c2
3 changed files with 54 additions and 0 deletions
--- a/3
+++ b/3
@ -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 
--- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
--- 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