summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-10-12 13:49:39 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-12 14:43:43 +0200
commit900bdcbd0311b13eef5a1b9951ef0e7374fce6f7 (patch)
treed98b64189d8c685450f69ca0d2f3eec288e9e616
parent46561dab6a3602bd5f17ef8c0786f4a0f1fc1e9c (diff)
downloadphp-git-900bdcbd0311b13eef5a1b9951ef0e7374fce6f7.tar.gz
Fix #78665: Multicasting may leak memory
-rw-r--r--NEWS3
-rw-r--r--ext/sockets/multicast.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 972a22fc84..52a495287d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP NEWS
. Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
cmb).
+- Sockets:
+ . Fixed bug #78665 (Multicasting may leak memory). (cmb)
+
24 Oct 2019, PHP 7.2.24
- Core:
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index e32b2d8457..672e34e1d3 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -652,6 +652,7 @@ retry:
goto retry;
}
if (retval != NO_ERROR) {
+ efree(addr_table);
php_error_docref(NULL, E_WARNING,
"GetIpAddrTable failed with error %lu", retval);
return FAILURE;
@@ -660,9 +661,11 @@ retry:
MIB_IPADDRROW r = addr_table->table[i];
if (r.dwIndex == if_index) {
out_addr->s_addr = r.dwAddr;
+ efree(addr_table);
return SUCCESS;
}
}
+ efree(addr_table);
php_error_docref(NULL, E_WARNING,
"No interface with index %u was found", if_index);
return FAILURE;
@@ -692,6 +695,7 @@ retry:
goto retry;
}
if (retval != NO_ERROR) {
+ efree(addr_table);
php_error_docref(NULL, E_WARNING,
"GetIpAddrTable failed with error %lu", retval);
return FAILURE;
@@ -700,9 +704,11 @@ retry:
MIB_IPADDRROW r = addr_table->table[i];
if (r.dwAddr == addr->s_addr) {
*if_index = r.dwIndex;
+ efree(addr_table);
return SUCCESS;
}
}
+ efree(addr_table);
{
char addr_str[17] = {0};