From 88b11f9278119d70be8a6b3a49af37fb5f5f778b Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Thu, 28 Jan 2010 15:00:59 +0000
Subject: [PATCH] fix #533245 - segfaults on star.ulaw

---
 file-5.04-ulaw-segfault.patch | 11 +++++++++++
 file.spec                     |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 file-5.04-ulaw-segfault.patch

diff --git a/file-5.04-ulaw-segfault.patch b/file-5.04-ulaw-segfault.patch
new file mode 100644
index 0000000..0f2fba2
--- /dev/null
+++ b/file-5.04-ulaw-segfault.patch
@@ -0,0 +1,11 @@
+diff -up file-5.04/src/softmagic.c.segfault file-5.04/src/softmagic.c
+--- file-5.04/src/softmagic.c.segfault	2009-10-19 15:10:20.000000000 +0200
++++ file-5.04/src/softmagic.c	2010-01-28 15:28:20.000000000 +0100
+@@ -946,6 +946,7 @@ mcopy(struct magic_set *ms, union VALUET
+ 			end = last = (const char *)s + nbytes;
+ 			/* mget() guarantees buf <= last */
+ 			for (lines = linecnt, b = buf; lines &&
++			     b < end && c < end &&
+ 			     ((b = CAST(const char *,
+ 				 memchr(c = b, '\n', CAST(size_t, (end - b)))))
+ 			     || (b = CAST(const char *,
diff --git a/file.spec b/file.spec
index fa8acd8..c12b927 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.04
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -13,6 +13,7 @@ URL: http://www.darwinsys.com/file/
 Patch0: file-4.21-pybuild.patch
 Patch1: file-5.00-devdrv.patch
 Patch2: file-5.00-mdmp.patch
+Patch3: file-5.04-ulaw-segfault.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,6 +71,8 @@ file(1) command.
 %patch1 -p1
 #fixes #485835
 %patch2 -p1
+#fixes #533245
+%patch3 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -146,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 28 2010 Daniel Novotny <dnovotny@redhat.com> 5.04-2
+- fix #533245 -  segfaults on star.ulaw
+
 * Mon Jan 25 2010 Daniel Novotny <dnovotny@redhat.com> 5.04-1
 - update to new upstream release 5.04