rpms/kdelibs/FC-5 kdelibs-3.5.3-konqueror-khtml.patch, NONE, 1.1 kdelibs.spec, 1.132, 1.133

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32414

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-konqueror-khtml.patch 
Log Message:
apply patch to fix crash in konqueror



kdelibs-3.5.3-konqueror-khtml.patch:
 dom_stringimpl.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdelibs-3.5.3-konqueror-khtml.patch ---
--- kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp.orig	2006-06-14 11:47:06.000000000 +0200
+++ kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp	2006-06-14 11:49:01.000000000 +0200
@@ -308,6 +308,11 @@
     str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;
+
+    // If we have no commas, we have no array. 
+    if( len == 1 ) 
+        return 0L; 
+ 
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdelibs.spec	7 Jun 2006 21:52:35 -0000	1.132
+++ kdelibs.spec	14 Jun 2006 10:08:35 -0000	1.133
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -54,6 +54,9 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -185,6 +188,9 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream patches
+%patch100 -p1 -b .konqueror-khtml
+
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
    perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
@@ -389,6 +395,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- apply patch to fix crash in konqueror
+
 * Wed May 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3