38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From b6df9380443ddcb7b3c0b5f8c0dcfbf97893b621 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b6df9380443ddcb7b3c0b5f8c0dcfbf97893b621.1656418954.git.pmatilai@redhat.com>
|
|
From: Panu Matilainen <pmatilai@redhat.com>
|
|
Date: Thu, 23 Jun 2022 11:49:58 +0300
|
|
Subject: [PATCH] Revert "Fix memory leak regressions in popt 1.18"
|
|
|
|
This reverts commit 7182e4618ad5a0186145fc2aa4a98c2229afdfa8.
|
|
---
|
|
src/popt.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/src/popt.c b/src/popt.c
|
|
index f3f26a3..0521c8d 100644
|
|
--- a/src/popt.c
|
|
+++ b/src/popt.c
|
|
@@ -216,9 +216,6 @@ void poptResetContext(poptContext con)
|
|
else
|
|
con->os->next = 0;
|
|
|
|
- for (i = 0; i < con->numLeftovers; i++) {
|
|
- con->leftovers[i] = _free(con->leftovers[i]);
|
|
- }
|
|
con->numLeftovers = 0;
|
|
con->nextLeftover = 0;
|
|
con->restLeftover = 0;
|
|
@@ -1537,7 +1534,7 @@ poptContext poptFreeContext(poptContext con)
|
|
con->numExecs = 0;
|
|
|
|
for (i = 0; i < con->numLeftovers; i++) {
|
|
- con->leftovers[i] = _free(con->leftovers[i]);
|
|
+ con->leftovers[i] = _free(&con->leftovers[i]);
|
|
}
|
|
con->leftovers = _free(con->leftovers);
|
|
|
|
--
|
|
2.36.1
|
|
|