rpms/kdelibs/F-9 kdelibs-4.2.2-kde#180785-2.patch, NONE, 1.1 kdelibs.spec, 1.390, 1.391
Rex Dieter
rdieter at fedoraproject.org
Sun Apr 19 15:28:23 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3307/F-9
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.2.2-kde#180785-2.patch
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
- fix and simplify the child struct disposal (kde#180785)
kdelibs-4.2.2-kde#180785-2.patch:
--- NEW FILE kdelibs-4.2.2-kde#180785-2.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/18 19:34:41 955904
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/19 10:43:38 956037
@@ -254,10 +254,9 @@
/* Notify wrapper program that the child it started has finished. */
static void child_died(pid_t exit_pid, int exit_status)
{
- struct child *child = children;
- struct child *prev = NULL;
+ struct child *child, **childptr = &children;
- while (child)
+ while ((child = *childptr))
{
if (child->pid == exit_pid)
{
@@ -272,20 +271,12 @@
write(child->sock, request_data, request_header.arg_length);
close(child->sock);
- if (prev)
- {
- prev->next = child->next;
- }
- else
- {
- child = NULL;
- }
+ *childptr = child->next;
free(child);
return;
}
- prev = child;
- child = child->next;
+ childptr = &child->next;
}
}
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- kdelibs.spec 18 Apr 2009 23:13:42 -0000 1.390
+++ kdelibs.spec 19 Apr 2009 15:27:49 -0000 1.391
@@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -91,6 +91,7 @@
Patch101: kdelibs-4.2.2-kjob.patch
Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
Patch103: kdelibs-4.2.2-kde#180785.patch
+Patch104: kdelibs-4.2.2-kde#180785-2.patch
# 4.3 branch
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -235,6 +236,7 @@
%patch101 -p0 -b .kjob
%patch102 -p4 -b .bidi-kde#189161
%patch103 -p4 -b .kde#180785
+%patch104 -p4 -b .kde#180785-2
# 4.3
%patch200 -p1 -b .AllowExternalPaths
@@ -419,6 +421,9 @@
%changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
More information about the scm-commits
mailing list