- fix segfault on empty -p <lua> scriptlet body (#1004062)

This commit is contained in:
Panu Matilainen 2013-09-09 14:15:03 +03:00
parent fdb7b53492
commit 3c10e6e6d5
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up rpm-4.10.3.1/rpmio/rpmlua.c.empty-lua-script rpm-4.10.3.1/rpmio/rpmlua.c
--- rpm-4.10.3.1/rpmio/rpmlua.c.empty-lua-script 2012-10-31 14:23:49.000000000 +0200
+++ rpm-4.10.3.1/rpmio/rpmlua.c 2013-09-09 14:13:49.844888464 +0300
@@ -492,6 +492,8 @@ int rpmluaRunScript(rpmlua _lua, const c
int ret = 0;
if (name == NULL)
name = "<lua>";
+ if (script == NULL)
+ script = "";
if (luaL_loadbuffer(L, script, strlen(script), name) != 0) {
rpmlog(RPMLOG_ERR, _("invalid syntax in lua script: %s\n"),
lua_tostring(L, -1));

View File

@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}2%{?dist}
Release: %{?snapver:0.%{snapver}.}3%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.10.x/%{name}-%{srcver}.tar.bz2
@ -48,6 +48,7 @@ Patch6: rpm-4.9.0-armhfp-logic.patch
Patch100: rpm-4.10.x-caps-double-free.patch
Patch101: rpm-4.10.x-cursor-failchk.patch
Patch102: rpm-4.10.x-db-serialize.patch
Patch103: rpm-4.10.x-empty-lua-script.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
@ -224,6 +225,7 @@ packages on a system.
%patch100 -p1 -b .caps-double-free
%patch101 -p1 -b .cursor-failchk
%patch102 -p1 -b .db-serialize
%patch103 -p1 -b .empty-lua-script
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
@ -455,6 +457,9 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
* Mon Sep 09 2013 Panu Matilainen <pmatilai@redhat.com> - 4.10.3.1-3
- fix segfault on empty -p <lua> scriptlet body (#1004062)
* Mon Aug 26 2013 Panu Matilainen <pmatilai@redhat.com> - 4.10.3.1-2
- fix build-time double-free on file capability processing (#956190)
- check for stale locks when opening write-cursors (#860500)