From 2a9a4322c8a5d70d0a2799bc79b44e850c09c0e3 Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Fri, 21 Nov 2008 12:06:33 +0000
Subject: [PATCH] fix #468926

---
 logrotate-3.7.7-toolarge.patch | 17 +++++++++++++++++
 logrotate.spec                 |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 logrotate-3.7.7-toolarge.patch

diff --git a/logrotate-3.7.7-toolarge.patch b/logrotate-3.7.7-toolarge.patch
new file mode 100644
index 0000000..68027c8
--- /dev/null
+++ b/logrotate-3.7.7-toolarge.patch
@@ -0,0 +1,17 @@
+diff -up logrotate-3.7.7/config.c.toolarge logrotate-3.7.7/config.c
+--- logrotate-3.7.7/config.c.toolarge	2008-11-21 12:57:25.000000000 +0100
++++ logrotate-3.7.7/config.c	2008-11-21 12:57:41.000000000 +0100
+@@ -530,6 +530,13 @@ static int readConfigFile(const char *co
+ 
+     length = sb.st_size;
+ 
++    if (length > 0xffffff) {
++        message(MESS_ERROR, "file %s too large, probably not a config file.\n",
++                configFile);
++        close(fd);
++        return 1;
++    }    
++
+     buf = alloca(length + 2);
+     if (!buf) {
+ 	message(MESS_ERROR, "alloca() of %d bytes failed\n", (int) length);
diff --git a/logrotate.spec b/logrotate.spec
index bd514d6..e862141 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -1,11 +1,12 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.7-curdir2.patch
+Patch2: logrotate-3.7.7-toolarge.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -25,6 +26,7 @@ log files on your system.
 %prep
 %setup -q
 %patch1 -p1 -b .curdir
+%patch2 -p1 -b .toolarge
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Fri Nov 21 2008 Daniel Novotny <dnovotny@redhat.com> 3.7.7-4
+- fix #468926 (segfault with very large /var/log/messages)
+
 * Thu Nov 20 2008 Daniel Novotny <dnovotny@redhat.com> 3.7.7-3
 - less aggressive approach to the fix