rpms/plymouth/F-10 plymouth-0.6.0-dont-crash-on-null-free.patch, NONE, 1.1 plymouth.spec, 1.108, 1.109

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29711

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-0.6.0-dont-crash-on-null-free.patch 
Log Message:
- Allow NULL to ply_image_free


plymouth-0.6.0-dont-crash-on-null-free.patch:

--- NEW FILE plymouth-0.6.0-dont-crash-on-null-free.patch ---
diff -up plymouth-0.6.0/src/libplybootsplash/ply-image.c.dont-crash-on-null-free plymouth-0.6.0/src/libplybootsplash/ply-image.c
--- plymouth-0.6.0/src/libplybootsplash/ply-image.c.dont-crash-on-null-free	2008-11-14 22:09:39.000000000 -0500
+++ plymouth-0.6.0/src/libplybootsplash/ply-image.c	2008-11-14 22:09:58.000000000 -0500
@@ -115,7 +115,9 @@ ply_image_new (const char *filename)
 void
 ply_image_free (ply_image_t *image)
 {
-  assert (image != NULL);
+  if (image == NULL)
+    return;
+
   assert (image->filename != NULL);
 
   if (image->layout.address != NULL)


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-10/plymouth.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- plymouth.spec	14 Nov 2008 18:30:16 -0000	1.108
+++ plymouth.spec	15 Nov 2008 03:11:53 -0000	1.109
@@ -20,6 +20,8 @@
 
 Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 
+Patch0: plymouth-0.6.0-dont-crash-on-null-free.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -149,6 +151,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .dont-crash-on-null-free
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -306,6 +309,9 @@
 %defattr(-, root, root)
 
 %changelog
+* Fri Nov 14 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.14.3
+- Allow NULL to ply_image_free
+
 * Fri Nov 14 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.14.2
 - Don't loop forever when tty returns NUL byte (bug 471498)