28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From 1560224d3a26574f0195af3853e4d7e050b0b06f Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Malyshev <smalyshev@gmail.com>
|
|
Date: Mon, 6 Jun 2022 00:56:51 -0600
|
|
Subject: [PATCH 2/3] Fix bug #81719: mysqlnd/pdo password buffer overflow
|
|
|
|
(cherry picked from commit 58006537fc5f133ae8549efe5118cde418b3ace9)
|
|
(cherry picked from commit 9433de72e291db518357fe55531cc15432d43ec4)
|
|
---
|
|
ext/mysqlnd/mysqlnd_wireprotocol.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
|
|
index 759b131b63..eb7af323a4 100644
|
|
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
|
|
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
|
|
@@ -794,7 +794,8 @@ php_mysqlnd_change_auth_response_write(void * _packet)
|
|
MYSQLND_VIO * vio = packet->header.vio;
|
|
MYSQLND_STATS * stats = packet->header.stats;
|
|
MYSQLND_CONNECTION_STATE * connection_state = packet->header.connection_state;
|
|
- zend_uchar * buffer = pfc->cmd_buffer.length >= packet->auth_data_len? pfc->cmd_buffer.buffer : mnd_emalloc(packet->auth_data_len);
|
|
+ size_t total_packet_size = packet->auth_data_len + MYSQLND_HEADER_SIZE;
|
|
+ zend_uchar * const buffer = pfc->cmd_buffer.length >= total_packet_size? pfc->cmd_buffer.buffer : mnd_emalloc(total_packet_size);
|
|
zend_uchar * p = buffer + MYSQLND_HEADER_SIZE; /* start after the header */
|
|
|
|
DBG_ENTER("php_mysqlnd_change_auth_response_write");
|
|
--
|
|
2.35.3
|
