rpms/gphoto2/devel gphoto2-ricoh.patch, NONE, 1.1 gphoto2.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26209

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-ricoh.patch 
Log Message:
* Sat May 14 2005 Tim Waugh <twaugh at redhat.com>
- Fixed buffer overrun in ricoh/g3 (bug #157739).


gphoto2-ricoh.patch:
 g3.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gphoto2-ricoh.patch ---
--- gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/ricoh/g3.c.ricoh	2005-05-14 13:19:46.000000000 +0100
+++ gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/ricoh/g3.c	2005-05-14 13:20:15.000000000 +0100
@@ -746,9 +746,9 @@
 				char xfn[13];
 				int date, time, month, year;
 
-				strcpy(xfn, buf+n*32);
+				strncpy(xfn, buf+n*32, 8);
 				xfn[8] = '.';
-				strcpy(xfn+9, buf+n*32+8);
+				strncpy(xfn+9, buf+n*32+8, 3);
 				xfn[8+1+3] = '\0';
 
 				ret = gp_filesystem_append (fs, folder, xfn, context);


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gphoto2.spec	5 May 2005 17:45:07 -0000	1.31
+++ gphoto2.spec	14 May 2005 12:21:33 -0000	1.32
@@ -15,6 +15,7 @@
 Patch1: gphoto2-hotplug.patch
 Patch2: gphoto2-gcc4.patch
 Patch3: gphoto2-memset.patch
+Patch4: gphoto2-ricoh.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 # For /etc/hotplug/usb..
@@ -75,6 +76,7 @@
 %patch1 -p1 -b .hotplug
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .memset
+%patch4 -p1 -b .ricoh
 
 ####################################
 %build
@@ -199,6 +201,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Sat May 14 2005 Tim Waugh <twaugh at redhat.com>
+- Fixed buffer overrun in ricoh/g3 (bug #157739).
+
 * Mon May  2 2005 David Zeuthen <davidz at redhat.com> 2.1.5-8
 - Build and install hal device information files