Update to 0.12.9

This includes our fixes upstream and therefore removes vendor patches.

Resolves: RHEL-42425
This commit is contained in:
Christian Hergert 2024-06-19 16:33:20 -07:00
parent 82aacd4cdb
commit 530de8f3c1
4 changed files with 9 additions and 46 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/editorconfig-core-c-0.12.5.tar.gz /editorconfig-core-c-0.12.5.tar.gz
/editorconfig-core-c-0.12.6.tar.gz /editorconfig-core-c-0.12.6.tar.gz
/editorconfig-core-c-0.12.7.tar.gz /editorconfig-core-c-0.12.7.tar.gz
/editorconfig-core-c-0.12.9.tar.gz

View File

@ -15,8 +15,8 @@ editors.}
Name: editorconfig Name: editorconfig
Summary: Parser for EditorConfig files written in C Summary: Parser for EditorConfig files written in C
Version: 0.12.7 Version: 0.12.9
Release: 2%{?dist} Release: 1%{?dist}
# The entire source is BSD-2-Clause, except: # The entire source is BSD-2-Clause, except:
# BSD-3-Clause: src/lib/ini.h # BSD-3-Clause: src/lib/ini.h
@ -34,8 +34,6 @@ License: BSD-2-Clause AND BSD-3-Clause AND BSD-1-Clause
URL: https://github.com/editorconfig/editorconfig-core-c URL: https://github.com/editorconfig/editorconfig-core-c
Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
Patch0: plug-leak-nums-utarray.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc BuildRequires: gcc
@ -141,8 +139,11 @@ rm %{buildroot}/%{_libdir}/libeditorconfig_static.a
%changelog %changelog
* Wed Jun 12 2024 Christian Hergert <chergert@redhat.com> - 0.12.7-2 * Wed Jun 19 2024 Christian Hergert <chergert@redhat.com> - 0.12.9-1
- Add patch to plug resource leak of nums utarray - Update to 0.12.9
* Thu Jun 13 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 0.12.8-1
- Update to 0.12.8 (close RHBZ#2292212)
* Wed Apr 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 0.12.7-1 * Wed Apr 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 0.12.7-1
- Update to 0.12.7 (close RHBZ#2272370) - Update to 0.12.7 (close RHBZ#2272370)

View File

@ -1,39 +0,0 @@
From ca14e1521e52981d94fbd35d7e8fcbc32c45fa50 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Wed, 12 Jun 2024 13:21:49 -0700
Subject: [PATCH] lib/ec_glob: plug leak of nums utarray
---
src/lib/ec_glob.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/lib/ec_glob.c b/src/lib/ec_glob.c
index c2b83cf..9bfaf9e 100644
--- a/src/lib/ec_glob.c
+++ b/src/lib/ec_glob.c
@@ -53,16 +53,20 @@ static const UT_icd ut_int_pair_icd = {sizeof(int_pair),NULL,NULL,NULL};
#define STRING_CAT(p, string, end) do { \
size_t string_len = strlen(string); \
assert(end > p); \
- if (string_len >= (size_t)(end - p)) \
+ if (string_len >= (size_t)(end - p)) { \
+ utarray_free(nums); \
return -1; \
+ } \
strcat(p, string); \
p += string_len; \
} while(0)
/* safely add a char to a string then move the pointer to the end */
#define ADD_CHAR(string, new_chr, end) do { \
- if (string + 1 >= end) \
+ if (string + 1 >= end) { \
+ utarray_free(nums); \
return -1; \
+ } \
*(string ++) = new_chr; \
} while(0)
--
2.45.1

View File

@ -1 +1 @@
SHA512 (editorconfig-core-c-0.12.7.tar.gz) = 37af762ca5b9a83cb9062457ab5dd354c883a4e71329e84f7f49516dad02c04f5105753ad1dbfc41d63aeb24bbbb0a1b6a2a84215fddf8c34e6cff46f3dcd656 SHA512 (editorconfig-core-c-0.12.9.tar.gz) = c5769871c8fc945f9fedf9d33803a4df03eadaee4b724243e6a653fb8418e35417c33c0f6ba8e1ea709d9841a21c7da36fd0fd696be5cc9ac36610812b9dd1f6