]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Wed, 6 Jun 2018 09:21:11 +0000 (11:21 +0200)
committerAnatol Belski <ab@php.net>
Wed, 6 Jun 2018 09:21:11 +0000 (11:21 +0200)
* PHP-7.2:
  Fix VC compilation as variable size array is not supported
  NEWS for 7.2.8

1  2 
ext/mysqlnd/mysqlnd_wireprotocol.c

index 55a6939cef6cffff1c2f6296144e965d765b8e65,74a718b960e0801eea8ca26c63bf004991f5ed78..0aee0d9b94b0b632362ca827524fe79e07fc3891
@@@ -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");