[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:53:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 60219a2b1c05b8b1a16187801662795f824228f4
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 12 00:49:06 2001 +0000
Make deep copy in parseAttribute to fix memory smasher
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 4f4c144..2d54688 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -188,7 +188,13 @@ void HTMLEmbedElementImpl::parseAttribute(AttrImpl *attr)
QString val = QConstString( stringImpl->s, stringImpl->l ).string();
// export parameter
+#ifdef _KWQ_
+ // Need to make a deep copy here or "+" operator will attempt to modify
+ // QConstString attribute name
+ QString attrStr = attr->name().string().copy() + "=\"" + val + "\"";
+#else
QString attrStr = attr->name().string() + "=\"" + val + "\"";
+#endif
param.append( attrStr );
int pos;
switch ( attr->attrId )
diff --git a/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp b/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
index 4f4c144..2d54688 100644
--- a/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
+++ b/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
@@ -188,7 +188,13 @@ void HTMLEmbedElementImpl::parseAttribute(AttrImpl *attr)
QString val = QConstString( stringImpl->s, stringImpl->l ).string();
// export parameter
+#ifdef _KWQ_
+ // Need to make a deep copy here or "+" operator will attempt to modify
+ // QConstString attribute name
+ QString attrStr = attr->name().string().copy() + "=\"" + val + "\"";
+#else
QString attrStr = attr->name().string() + "=\"" + val + "\"";
+#endif
param.append( attrStr );
int pos;
switch ( attr->attrId )
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list