rpms/gphoto2/devel gphoto2-2.1.99-library-null.patch, NONE, 1.1 gphoto2.spec, 1.59, 1.60

[fedora-cvs-commits redhat com]

Author: rvokal

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

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-2.1.99-library-null.patch 
Log Message:
 - fix crash in ptp2 module

gphoto2-2.1.99-library-null.patch:
 library.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gphoto2-2.1.99-library-null.patch ---
--- gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/ptp2/library.c.null	2006-04-04 12:04:07.000000000 +0200
+++ gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/ptp2/library.c	2006-04-04 12:06:25.000000000 +0200
@@ -1021,7 +1021,7 @@
 static int
 camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 {
-	char		*data;
+	unsigned char	*data = NULL;
 	uint32_t	size;
 	int ret;
 	PTPParams *params = &camera->pl->params;


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gphoto2.spec	14 Mar 2006 11:06:41 -0000	1.59
+++ gphoto2.spec	4 Apr 2006 10:24:37 -0000	1.60
@@ -5,7 +5,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 9
+Release: 10
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -18,6 +18,7 @@
 Patch3: gphoto2-2.1.99-dbus.patch
 Patch4: gphoto2-2.1.99-canon_segv.patch
 Patch5: gphoto2-2.1.99-config.patch
+Patch6: gphoto2-2.1.99-library-null.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -77,6 +78,7 @@
 %patch3 -p1 -b .dbus
 %patch4 -p1 -b .segv
 %patch5 -p1 -b .config
+%patch6 -p1 -b .null
 
 ####################################
 %build
@@ -215,6 +217,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Apr 04 2006 Radek Vokál <rvokal redhat com> 2.1.99-10
+- fix crash in ptp2 module
+
 * Tue Mar 14 2006 Than Ngo <than redhat com> 2.1.99-9
 - fix gphoto2-config