Commit 1592dea775c for php
commit 1592dea775c41711f8a20475d1fbc9181431a986
Author: Weilin Du <weilindu@php.net>
Date: Sat Nov 21 03:11:41 2026 +0800
Fix MSVC C4815 when reading empty mysqlnd client statistics (#25633)
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index 0d94303ea36..5d915b0b6cf 100644
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -243,13 +243,12 @@ mysqlnd_stats_end(MYSQLND_STATS * stats, const bool persistent)
PHPAPI void
_mysqlnd_get_client_stats(MYSQLND_STATS * stats_ptr, zval *return_value ZEND_FILE_LINE_DC)
{
- MYSQLND_STATS stats;
DBG_ENTER("_mysqlnd_get_client_stats");
- if (!stats_ptr) {
- memset(&stats, 0, sizeof(stats));
- stats_ptr = &stats;
+ if (stats_ptr) {
+ mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC);
+ } else {
+ array_init(return_value);
}
- mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC);
DBG_VOID_RETURN;
}
/* }}} */