summaryrefslogtreecommitdiff
path: root/ext/sockets/multicast.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-10-12 14:45:40 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-12 14:46:10 +0200
commit586f8515d5ff6e16700ea1ba0d6e196e2c59b45d (patch)
tree38e41f315e4cbb72c7e64798a5f7cfe2337dc12e /ext/sockets/multicast.c
parentdb54b0fa187e874ae8d02104cb3471cdcd89e9d2 (diff)
parent7439d48bea8583c6986478f6e4de087c6585df0f (diff)
downloadphp-git-586f8515d5ff6e16700ea1ba0d6e196e2c59b45d.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #78665: Multicasting may leak memory
Diffstat (limited to 'ext/sockets/multicast.c')
-rw-r--r--ext/sockets/multicast.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index 481bf94f8c..c6aa9f0c78 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -648,6 +648,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;
@@ -656,9 +657,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;
@@ -688,6 +691,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;
@@ -696,9 +700,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};