rpms/sane-backends/devel sane-backends-1.0.18-string-oob.patch, NONE, 1.1 sane-backends.spec, 1.102, 1.103

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24813

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.18-string-oob.patch 
Log Message:
guard against out-of-bounds string access in fujitsu backend (#429338, patch by Caolan McNamara)


sane-backends-1.0.18-string-oob.patch:

--- NEW FILE sane-backends-1.0.18-string-oob.patch ---
diff -ur sane-backends-1.0.18.orig/backend/fujitsu.c sane-backends-1.0.18/backend/fujitsu.c
--- sane-backends-1.0.18.orig/backend/fujitsu.c	2008-01-18 19:38:27.000000000 +0000
+++ sane-backends-1.0.18/backend/fujitsu.c	2008-01-18 19:47:13.000000000 +0000
@@ -416,6 +416,9 @@
     
           /* delete newline characters at end */
           len = strlen (line);
+	  if (!len)
+	    continue;
+
           if (line[len - 1] == '\n')
             line[--len] = '\0';
     


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sane-backends.spec	13 Feb 2008 09:20:14 -0000	1.102
+++ sane-backends.spec	14 Feb 2008 08:35:41 -0000	1.103
@@ -22,7 +22,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch2: sane-backends-1.0.19-pkgconfig.patch
 Patch3: sane-backends-1.0.18-glibc-2.7.patch
 Patch4: sane-backends-1.0.19-policykit.patch
+Patch5: sane-backends-1.0.18-string-oob.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -117,6 +118,7 @@
 %patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .glibc-2.7
 %patch4 -p1 -b .policykit
+%patch5 -p1 -b .string-oob
 
 for i in agfafocus avision coolscan2 umax_pp; do
 	iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_"
@@ -235,6 +237,10 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Thu Feb 14 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-4
+- guard against out-of-bounds string access in fujitsu backend (#429338, patch
+  by Caolan McNamara)
+
 * Wed Feb 13 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-3
 - add HAL policy for SCSI scanners