augeas:avoid NULL pointer dereference in function re_case_expand

Signed-off-by: chengguipeng <chengguipeng1@huawei.com>
This commit is contained in:
chengguipeng 2020-09-15 20:18:13 +08:00
parent a71255ad19
commit 7ea2b6b44a
2 changed files with 35 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: augeas
Version: 1.12.0
Release: 4
Release: 5
Summary: Augeas is a configuration editing tool for changing configuration files
License: LGPLv2+
URL: https://augeas.net/
@ -11,6 +11,8 @@ Provides: bundled(gnulib)
Provides: augeas-libs = %{version}-%{release} augeas-libs%{?_isa} = %{version}-%{release}
Obsoletes: augeas-libs < %{version}-%{release}
Patch0001: avoid-NULL-pointer-dereference-in-function-re_case_expand.patch
%description
Augeas is a configuration editing tool. It parses configuration files in their native
formats and transforms them into a tree. Configuration changes are made by manipulating
@ -78,6 +80,12 @@ make check
%doc %{_mandir}/man1/au*.1.gz
%changelog
* Tue Sep 8 2020 chengguipeng<chengguipeng1@huawei.com> - 1.12.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:avoid NULL pointer dereference in function re_case_expand
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.12.0-4
- Type:bugfix
- ID:NA

View File

@ -0,0 +1,26 @@
From c13c26f415405e3203d91f601409497f8aa930dd Mon Sep 17 00:00:00 2001
From: chengguipeng <chengguipeng1@huawei.com>
Date: Thu, 3 Sep 2020 16:54:34 +0800
Subject: [PATCH] 2
Avoid NULL pointer dereference in function re_case_expand.
Because parse_regexp() will return NULL pointer when the input parameter is abnomal.
---
src/fa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fa.c b/src/fa.c
index 8e1d7d4..7935041 100644
--- a/src/fa.c
+++ b/src/fa.c
@@ -4447,7 +4447,7 @@ int fa_expand_nocase(const char *regexp, size_t regexp_len,
parse.rend = regexp + regexp_len;
parse.error = REG_NOERROR;
re = parse_regexp(&parse);
- if (parse.error != REG_NOERROR)
+ if (re == NULL)
return parse.error;
r = re_case_expand(re);
--
1.8.3.1