rpms/file/devel file-5.04-ulaw-segfault.patch, NONE, 1.1 file.spec, 1.116, 1.117

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26455

Modified Files:
	file.spec 
Added Files:
	file-5.04-ulaw-segfault.patch 
Log Message:
fix #533245 -  segfaults on star.ulaw


file-5.04-ulaw-segfault.patch:
 softmagic.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE file-5.04-ulaw-segfault.patch ---
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 *,


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- file.spec	25 Jan 2010 12:29:16 -0000	1.116
+++ file.spec	28 Jan 2010 15:00:59 -0000	1.117
@@ -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 at redhat.com> 5.04-2
+- fix #533245 -  segfaults on star.ulaw
+
 * Mon Jan 25 2010 Daniel Novotny <dnovotny at redhat.com> 5.04-1
 - update to new upstream release 5.04