Restore the memleak fix now that authselect should be fixed

This commit is contained in:
Panu Matilainen 2022-08-24 09:33:53 +03:00
parent 6ab2146ae8
commit fbeebe164f
2 changed files with 4 additions and 39 deletions

View File

@ -1,37 +0,0 @@
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

View File

@ -6,11 +6,10 @@
Summary: C library for parsing command line parameters
Name: popt
Version: %{ver}%{?snap:~%{snap}}
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
URL: https://github.com/rpm-software-management/popt/
Source0: http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{srcver}.tar.gz
Patch0: 0001-Revert-Fix-memory-leak-regressions-in-popt-1.18.patch
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: make
@ -80,6 +79,9 @@ make check || (cat tests/*.log; exit 1)
%endif
%changelog
* Wed Aug 24 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-4
- Restore the memleak fix now that authselect should be fixed
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19~rc1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild