* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: 4.2.4-CVE-2009-1690.patch
@ 2009-06-20 13:43 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 2+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2009-06-20 13:43 UTC (permalink / raw
To: gentoo-commits
arfrever 09/06/20 13:43:29
Modified: 4.2.4-CVE-2009-1690.patch
Log:
Update patch for bug #274566.
(Portage version: 13655-svn/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch?r1=1.1&r2=1.2
Index: 4.2.4-CVE-2009-1690.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 4.2.4-CVE-2009-1690.patch 17 Jun 2009 22:25:31 -0000 1.1
+++ 4.2.4-CVE-2009-1690.patch 20 Jun 2009 13:43:29 -0000 1.2
@@ -1,5 +1,72 @@
---- branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/01/06 17:13:38 906699
-+++ branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/06/17 21:56:00 983302
+https://bugs.gentoo.org/show_bug.cgi?id=274566
+http://websvn.kde.org/?view=rev&revision=983302
+http://websvn.kde.org/?view=rev&revision=983316
+
+--- khtml/html/htmlparser.cpp
++++ khtml/html/htmlparser.cpp
+@@ -216,7 +216,6 @@
+
+ form = 0;
+ map = 0;
+- head = 0;
+ end = false;
+ isindex = 0;
+
+@@ -678,8 +677,7 @@
+ case ID_BASE:
+ if(!head) {
+ head = new HTMLHeadElementImpl(document);
+- e = head;
+- insertNode(e);
++ insertNode(head.get());
+ handled = true;
+ }
+ break;
+@@ -894,7 +892,7 @@
+ case ID_HEAD:
+ if(!head && (current->id() == ID_HTML || current->isDocumentNode())) {
+ head = new HTMLHeadElementImpl(document);
+- n = head;
++ n = head.get();
+ }
+ break;
+ case ID_BODY:
+@@ -1800,19 +1798,19 @@
+ head = new HTMLHeadElementImpl(document);
+ HTMLElementImpl *body = doc()->body();
+ int exceptioncode = 0;
+- doc()->documentElement()->insertBefore(head, body, exceptioncode);
++ doc()->documentElement()->insertBefore(head.get(), body, exceptioncode);
+ if ( exceptioncode ) {
+ #ifdef PARSER_DEBUG
+ kDebug( 6035 ) << "creation of head failed!!!!:" << exceptioncode;
+ #endif
+- delete head;
++ delete head.get();
+ head = 0;
+ }
+
+ // If the body does not exist yet, then the <head> should be pushed as the current block.
+ if (head && !body) {
+ pushBlock(head->id(), tagPriority(head->id()));
+- setCurrent(head);
++ setCurrent(head.get());
+ }
+ }
+
+--- khtml/html/htmlparser.h
++++ khtml/html/htmlparser.h
+@@ -155,7 +155,7 @@
+ /*
+ * the head element. Needed for crappy html which defines <base> after </head>
+ */
+- DOM::HTMLHeadElementImpl *head;
++ RefPtr<DOM::HTMLHeadElementImpl> head;
+
+ /*
+ * a possible <isindex> element in the head. Compatibility hack for
+--- khtml/svg/SVGList.h
++++ khtml/svg/SVGList.h
@@ -97,7 +97,11 @@
Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: 4.2.4-CVE-2009-1690.patch
@ 2009-06-17 22:25 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-17 22:25 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/06/17 22:25:31
Added: 4.2.4-CVE-2009-1690.patch
Log:
Revision bump. Apply security patch from upstream. Per bug #274566. Remove affected stuff.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch?rev=1.1&content-type=text/plain
Index: 4.2.4-CVE-2009-1690.patch
===================================================================
--- branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/01/06 17:13:38 906699
+++ branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/06/17 21:56:00 983302
@@ -97,7 +97,11 @@
Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
{
- m_vector.insert(index, newItem);
+ if (index < m_vector.size()) {
+ m_vector.insert(index, newItem);
+ } else {
+ m_vector.append(newItem);
+ }
return newItem;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-20 13:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-20 13:43 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: 4.2.4-CVE-2009-1690.patch Arfrever Frehtes Taifersar Arahesis (arfrever)
-- strict thread matches above, loose matches on Subject: below --
2009-06-17 22:25 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox