From: Anatol Belski <ab@php.net>
Date: Wed, 6 Jun 2018 09:21:11 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bef16c37bf8c0f6f2132feadee26bbae156ed99;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix VC compilation as variable size array is not supported
  NEWS for 7.2.8
---

7bef16c37bf8c0f6f2132feadee26bbae156ed99
diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c
index 55a6939cef,74a718b960..0aee0d9b94
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@@ -2155,14 -2274,19 +2155,19 @@@ php_mysqlnd_sha256_pk_request_response_
  /* }}} */
  
  static
 -size_t php_mysqlnd_cached_sha2_result_write(void * _packet)
 +size_t php_mysqlnd_cached_sha2_result_write(MYSQLND_CONN_DATA * conn, void * _packet)
  {
  	MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet;
 -	MYSQLND_ERROR_INFO * error_info = packet->header.error_info;
 -	MYSQLND_PFC * pfc = packet->header.protocol_frame_codec;
 -	MYSQLND_VIO * vio = packet->header.vio;
 -	MYSQLND_STATS * stats = packet->header.stats;
 +	MYSQLND_ERROR_INFO * error_info = conn->error_info;
 +	MYSQLND_PFC * pfc = conn->protocol_frame_codec;
 +	MYSQLND_VIO * vio = conn->vio;
 +	MYSQLND_STATS * stats = conn->stats;
+ #ifndef _MSC_VER
  	zend_uchar buffer[MYSQLND_HEADER_SIZE + packet->password_len + 1];
+ #else
+ 	ALLOCA_FLAG(use_heap)
+ 	zend_uchar *buffer = do_alloca(MYSQLND_HEADER_SIZE + packet->password_len + 1, use_heap);
+ #endif
  	size_t sent;
  
  	DBG_ENTER("php_mysqlnd_cached_sha2_result_write");