- Add fix-heap-corruptor patch from master. Problem spotted by Mr. McCann.

This commit is contained in:
Ray Strode 2009-02-24 18:45:06 +00:00
parent 2382850751
commit 4621eed5f1
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,41 @@
commit e1619f36bf849ba183ae5fb53f4794d5273ea65c
Author: Ray Strode <rstrode@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;
}

View File

@ -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 @@ Requires: initscripts >= 8.83-1
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 @@ Plymouth. It features a blue flamed sun with animated solar flares.
%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 @@ fi
%defattr(-, root, root)
%changelog
* Tue Feb 24 2009 Ray Strode <rstrode@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@redhat.com> 0.6.0-2
- Add patch from drop-nash branch for jeremy