rpms/popt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Temporarily revert a memleak fix due to authselect breakage (#2100287)

Browse Source
This commit is contained in:
Panu Matilainen 2022-06-28 16:47:43 +03:00
parent f387f5d7c2
commit bf98f05128
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Revert-Fix-memory-leak-regressions-in-popt-1.18.patch Normal file
View File

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

6
popt.spec
View File

@ -6,10 +6,11 @@
Summary: C library for parsing command line parameters
Name: popt
Version: %{ver}%{?snap:~%{snap}}
Release: 1%{?dist}
Release: 2%{?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
@ -79,6 +80,9 @@ make check || (cat tests/*.log; exit 1)
%endif
%changelog
* Tue Jun 28 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-2
- Temporarily revert a memleak fix due to authselect breakage (#2100287)
* Wed Jun 22 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-1
- Rebase to 1.19-rc1 (https://github.com/rpm-software-management/popt/releases/tag/popt-1.19-rc1)
- Remove manual .la cleanup, it's automatic nowadays