aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-09-28 20:58:59 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-09-28 20:58:59 +0000
commitf190ecb855b083eb3f469c5005da5e93b65d9a69 (patch)
tree750fec3cf497e2b94f764c590074342282c34c76
parent8c70d1b07c755bb56b53106b4839bb5eb7a2caf7 (diff)
parent48b5cbc7533673fd68100e1e29ffe0d228257443 (diff)
downloadiptables-f190ecb855b083eb3f469c5005da5e93b65d9a69.tar.gz
Merge cherrypicks of [12721685, 12721367, 12721368, 12721369, 12721348, 12721705, 12721725, 12721726, 12721745] into rvc-releaseandroid-11.0.0_r17android11-release
Change-Id: I44ceabaf53c02c41890d16721da2e0bae480e749
-rw-r--r--libxtables/xtables.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 895f6988..9c5827e5 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -757,6 +757,7 @@ xtables_find_target(const char *name, enum xtables_tryload tryload)
for (ptr = xtables_targets; ptr; ptr = ptr->next) {
if (extension_cmp(name, ptr->name, ptr->family)) {
+#if 0 /* Code block below causes memory leak. (Bugs 162925719 and 168688680) */
struct xtables_target *clone;
/* First target of this type: */
@@ -772,6 +773,7 @@ xtables_find_target(const char *name, enum xtables_tryload tryload)
clone->next = clone;
ptr = clone;
+#endif
break;
}
}