rpms/plymouth/devel plymouth-0.6.0-fix-heap-corruptor.patch, NONE, 1.1 plymouth.spec, 1.117, 1.118

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12122

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-0.6.0-fix-heap-corruptor.patch 
Log Message:
- Add fix-heap-corruptor patch from master.  Problem
  spotted by Mr. McCann.


plymouth-0.6.0-fix-heap-corruptor.patch:

--- NEW FILE plymouth-0.6.0-fix-heap-corruptor.patch ---
commit e1619f36bf849ba183ae5fb53f4794d5273ea65c
Author: Ray Strode <rstrode at redhat.com>
Date:   Tue Feb 24 13:36:15 2009 -0500

    Fix heap corruptor in ply-boot-server
    
    This fixes a memory corruption bug that
    cropped up during a round of leak fixes
    a while back.

diff --git a/src/ply-boot-server.c b/src/ply-boot-server.c
index 8615f3b..77115e5 100644
--- a/src/ply-boot-server.c
+++ b/src/ply-boot-server.c
@@ -196,7 +196,7 @@ ply_boot_connection_read_request (ply_boot_connection_t  *connection,
 
       if (!ply_read (connection->fd, &argument_size, sizeof (uint8_t)))
         {
-          free(command);
+          free (*command);
           return false;
         }
 
@@ -204,7 +204,7 @@ ply_boot_connection_read_request (ply_boot_connection_t  *connection,
 
       if (!ply_read (connection->fd, *argument, argument_size))
         {
-          free(command);
+          free (*command);
           return false;
         }
     }
@@ -307,7 +307,7 @@ ply_boot_connection_on_request (ply_boot_connection_t *connection)
                       strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NAK)))
         ply_error ("could not write bytes: %m");
 
-      free(command);
+      free (command);
       return;
     }
 


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- plymouth.spec	17 Dec 2008 21:38:08 -0000	1.117
+++ plymouth.spec	24 Feb 2009 18:45:06 -0000	1.118
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 
 Patch0: plymouth-0.6.0-drop-nash.patch
+Patch1: plymouth-0.6.0-fix-heap-corruptor.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -152,6 +153,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .drop-nash
+%patch1 -p1 -b .fix-heap-corruptor
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -314,6 +316,10 @@
 %defattr(-, root, root)
 
 %changelog
+* Tue Feb 24 2009 Ray Strode <rstrode at redhat.com> 0.6.0-3
+- Add fix-heap-corruptor patch from master.  Problem
+  spotted by Mr. McCann.
+
 * Wed Dec 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-2
 - Add patch from drop-nash branch for jeremy