Fix CVE-2023-33461
This commit is contained in:
parent
47d5c4887e
commit
befbdaafa6
45
CVE-2023-33461.patch
Normal file
45
CVE-2023-33461.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Antonio <antoniolrt@gmail.com>
|
||||||
|
Date: Fri, 2 Jun 2023 15:03:10 -0300
|
||||||
|
Subject: [PATCH] Handle null return from iniparser_getstring
|
||||||
|
|
||||||
|
Origin: https://github.com/ndevilla/iniparser/pull/146
|
||||||
|
|
||||||
|
Fix handling of NULL returns from iniparser_getstring in
|
||||||
|
iniparser_getboolean, iniparser_getlongint and iniparser_getdouble,
|
||||||
|
avoiding a crash.
|
||||||
|
---
|
||||||
|
src/iniparser.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/iniparser.c b/src/iniparser.c
|
||||||
|
index f1d1658..dbceb20 100644
|
||||||
|
--- a/src/iniparser.c
|
||||||
|
+++ b/src/iniparser.c
|
||||||
|
@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n
|
||||||
|
const char * str ;
|
||||||
|
|
||||||
|
str = iniparser_getstring(d, key, INI_INVALID_KEY);
|
||||||
|
- if (str==INI_INVALID_KEY) return notfound ;
|
||||||
|
+ if (str==NULL || str==INI_INVALID_KEY) return notfound ;
|
||||||
|
return strtol(str, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou
|
||||||
|
const char * str ;
|
||||||
|
|
||||||
|
str = iniparser_getstring(d, key, INI_INVALID_KEY);
|
||||||
|
- if (str==INI_INVALID_KEY) return notfound ;
|
||||||
|
+ if (str==NULL || str==INI_INVALID_KEY) return notfound ;
|
||||||
|
return atof(str);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound)
|
||||||
|
const char * c ;
|
||||||
|
|
||||||
|
c = iniparser_getstring(d, key, INI_INVALID_KEY);
|
||||||
|
- if (c==INI_INVALID_KEY) return notfound ;
|
||||||
|
+ if (c==NULL || c==INI_INVALID_KEY) return notfound ;
|
||||||
|
if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') {
|
||||||
|
ret = 1 ;
|
||||||
|
} else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') {
|
||||||
@ -1,10 +1,11 @@
|
|||||||
Name: iniparser
|
Name: iniparser
|
||||||
Version: 4.1
|
Version: 4.1
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: ini file parser
|
Summary: ini file parser
|
||||||
License: MIT and Zlib
|
License: MIT and Zlib
|
||||||
URL: https://github.com/ndevilla/iniparser
|
URL: https://github.com/ndevilla/iniparser
|
||||||
Source0: https://github.com/ndevilla/iniparser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/ndevilla/iniparser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: CVE-2023-33461.patch
|
||||||
|
|
||||||
BuildRequires: gcc doxygen chrpath
|
BuildRequires: gcc doxygen chrpath
|
||||||
|
|
||||||
@ -12,7 +13,7 @@ BuildRequires: gcc doxygen chrpath
|
|||||||
This modules offers parsing of ini files from the C level. See a complete documentation in HTML format, from this directory open the file html/index.html with any HTML-capable browser.
|
This modules offers parsing of ini files from the C level. See a complete documentation in HTML format, from this directory open the file html/index.html with any HTML-capable browser.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}/
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="${RPM_OPT_FLAGS}"
|
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||||
@ -53,6 +54,9 @@ echo "%{_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
|||||||
%config(noreplace) /etc/ld.so.conf.d/*
|
%config(noreplace) /etc/ld.so.conf.d/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jun 25 2023 wangkai <13474090681@163.com> - 4.1-5
|
||||||
|
- Fix CVE-2023-33461
|
||||||
|
|
||||||
* Mon Aug 22 2022 yaoxin <yaoxin20@h-partners.com> - 4.1-4
|
* Mon Aug 22 2022 yaoxin <yaoxin20@h-partners.com> - 4.1-4
|
||||||
- Fix not striped problem
|
- Fix not striped problem
|
||||||
- Remove rpath
|
- Remove rpath
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user