From: Michael Heimpold <mhei@heimpold.de>
Date: Sun, 14 Jun 2020 20:29:41 +0000 (+0200)
Subject: oniguruma: add patch to fix NULL pointer exception
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b4ddb635ea1693214d75a578b9d652a3388cc6d2;p=feed%2Fpackages.git

oniguruma: add patch to fix NULL pointer exception

I propose to carry this patch until a new upstream
release includes it. For forther references see:

https://github.com/openwrt/packages/issues/12403
and
https://github.com/kkos/oniguruma/pull/196

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/libs/oniguruma/Makefile b/libs/oniguruma/Makefile
index 6e88e5b7b4..93088f02fe 100644
--- a/libs/oniguruma/Makefile
+++ b/libs/oniguruma/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oniguruma
 PKG_VERSION:=6.9.5_rev1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=onig-v$(subst _,-,$(PKG_VERSION)).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)?
diff --git a/libs/oniguruma/patches/0002-i_free_callout_name_entry.patch b/libs/oniguruma/patches/0002-i_free_callout_name_entry.patch
new file mode 100644
index 0000000000..f67a00cff1
--- /dev/null
+++ b/libs/oniguruma/patches/0002-i_free_callout_name_entry.patch
@@ -0,0 +1,13 @@
+--- a/src/regparse.c	2020-04-26 09:20:56.000000000 +0200
++++ b/src/regparse.c	2020-06-14 21:22:18.396966276 +0200
+@@ -1294,7 +1294,9 @@
+ i_free_callout_name_entry(st_callout_name_key* key, CalloutNameEntry* e,
+                           void* arg ARG_UNUSED)
+ {
+-  xfree(e->name);
++  if (IS_NOT_NULL(e)) {
++    xfree(e->name);
++  }
+   /*xfree(key->s); */ /* is same as e->name */
+   xfree(key);
+   xfree(e);