rpms/kdelibs/devel kdelibs-3.5.4-kde#133071.patch, NONE, 1.1 kdelibs.spec, 1.195, 1.196

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#133071.patch 
Log Message:
fix #133071, Crash when characterSet was accessed on newly-created document


kdelibs-3.5.4-kde#133071.patch:
 kjs_dom.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.4-kde#133071.patch ---
Index: khtml/ecma/kjs_dom.cpp
===================================================================
--- khtml/ecma/kjs_dom.cpp	(Revision 590813)
+++ khtml/ecma/kjs_dom.cpp	(Revision 590814)
@@ -932,7 +932,10 @@
     return getDOMNode(exec,doc.documentElement());
   case CharacterSet: {
     DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle());
-    return String(docImpl->part()->encoding());
+    if (docImpl->part())
+      return String(docImpl->part()->encoding());
+    else
+      return Undefined();
   }
   case StyleSheets:
     //kdDebug() << "DOMDocument::StyleSheets, returning " << doc.styleSheets().length() << " stylesheets" << endl;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kdelibs.spec	1 Oct 2006 20:52:26 -0000	1.195
+++ kdelibs.spec	1 Oct 2006 21:07:21 -0000	1.196
@@ -69,6 +69,7 @@
 Patch118: kdelibs-3.5.4-kde#100188.patch
 Patch119: kdelibs-3.5.4-kde#119167.patch
 Patch120: kdelibs-3.5.4-kde#106748.patch
+Patch121: kdelibs-3.5.4-kde#133071.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -221,6 +222,7 @@
 %patch118 -p0 -b .kde#100188
 %patch119 -p0 -b .kde#119167
 %patch120 -p0 -b .kde#106748
+%patch121 -p0 -b .kde#133071
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -446,10 +448,11 @@
 
 %changelog
 * Sun Oct 01 2006 Than Ngo <than at redhat.com> 6:3.5.4-10
-- fix utf8 issue kdeprint
+- fix utf8 issue in kdeprint
 - fix #178320,#198828, follow menu-spec
 - upstream patches,
    fix #106748, Evaluate scripts in <iframe src=javascript:..> in the right context
+   fix #133071, Crash when characterSet was accessed on newly-created document
 
 * Sat Sep 30 2006 Than Ngo <than at redhat.com> 6:3.5.4-9
 - fix #178320,#198828, follow menu-spec