Compare commits
10 Commits
30a311c697
...
8d0e51f320
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d0e51f320 | ||
|
|
6f11dd16d0 | ||
|
|
d0b5391239 | ||
|
|
00d7314360 | ||
|
|
839a25560a | ||
|
|
f2f1b6ddb9 | ||
|
|
c9100fbdf2 | ||
|
|
15a2c50c78 | ||
|
|
729e597ec4 | ||
|
|
a48c1d05d4 |
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') {
|
||||
BIN
iniparser-4.1.tar.gz
Normal file
BIN
iniparser-4.1.tar.gz
Normal file
Binary file not shown.
63
iniparser.spec
Normal file
63
iniparser.spec
Normal file
@ -0,0 +1,63 @@
|
||||
#%global debug_package %{nil}
|
||||
|
||||
Name: iniparser
|
||||
Version: 4.1
|
||||
Release: 4
|
||||
Summary: ini file parser
|
||||
License: MIT and Zlib
|
||||
URL: https://github.com/ndevilla/iniparser
|
||||
Source0: https://github.com/ndevilla/iniparser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Patch0: CVE-2023-33461.patch
|
||||
|
||||
BuildRequires: gcc doxygen
|
||||
|
||||
%description
|
||||
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
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%make_build
|
||||
cd doc;make
|
||||
|
||||
%install
|
||||
install -d %{buildroot}/%{_includedir}/%{name}
|
||||
install -m 644 -t %{buildroot}%{_includedir}/%{name} src/dictionary.h src/iniparser.h
|
||||
|
||||
install -d %{buildroot}/%{_libdir}
|
||||
install -m 755 -t %{buildroot}%{_libdir}/ libiniparser.so.1
|
||||
ln -s libiniparser.so.1 %{buildroot}%{_libdir}/libiniparser.so
|
||||
|
||||
install -d %{buildroot}/%{_docdir}/%{name}
|
||||
cp -r example %{buildroot}/%{_docdir}/%{name}
|
||||
cp -r html %{buildroot}/%{_docdir}/%{name}
|
||||
|
||||
|
||||
%pre
|
||||
%preun
|
||||
%post
|
||||
%postun
|
||||
|
||||
%check
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md INSTALL AUTHORS FAQ-en.md FAQ-zhcn.md
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*
|
||||
%{_docdir}/*
|
||||
|
||||
%changelog
|
||||
* Sun Jun 25 2023 wangkai <13474090681@163.com> - 4.1-4
|
||||
- Fix CVE-2023-33461
|
||||
|
||||
* Tue Jan 19 2021 Ge Wang <wangge20@huawei.com> - 4.1-3
|
||||
- Modify license information.
|
||||
|
||||
* Tue Oct 13 2020 liqingqing_1229 <liqingqing3@huawei.com>
|
||||
- update source0
|
||||
|
||||
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com>
|
||||
- Package init
|
||||
|
||||
4
iniparser.yaml
Normal file
4
iniparser.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: ndevilla/iniparser
|
||||
tag_prefix: "^v"
|
||||
separator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user