| 1 |
arfrever 09/06/20 13:43:29 |
| 2 |
|
| 3 |
Modified: 4.2.4-CVE-2009-1690.patch |
| 4 |
Log: |
| 5 |
Update patch for bug #274566. |
| 6 |
(Portage version: 13655-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch |
| 10 |
|
| 11 |
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 |
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: 4.2.4-CVE-2009-1690.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 4.2.4-CVE-2009-1690.patch 17 Jun 2009 22:25:31 -0000 1.1 |
| 22 |
+++ 4.2.4-CVE-2009-1690.patch 20 Jun 2009 13:43:29 -0000 1.2 |
| 23 |
@@ -1,5 +1,72 @@ |
| 24 |
---- branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/01/06 17:13:38 906699 |
| 25 |
-+++ branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h 2009/06/17 21:56:00 983302 |
| 26 |
+https://bugs.gentoo.org/show_bug.cgi?id=274566 |
| 27 |
+http://websvn.kde.org/?view=rev&revision=983302 |
| 28 |
+http://websvn.kde.org/?view=rev&revision=983316 |
| 29 |
+ |
| 30 |
+--- khtml/html/htmlparser.cpp |
| 31 |
++++ khtml/html/htmlparser.cpp |
| 32 |
+@@ -216,7 +216,6 @@ |
| 33 |
+ |
| 34 |
+ form = 0; |
| 35 |
+ map = 0; |
| 36 |
+- head = 0; |
| 37 |
+ end = false; |
| 38 |
+ isindex = 0; |
| 39 |
+ |
| 40 |
+@@ -678,8 +677,7 @@ |
| 41 |
+ case ID_BASE: |
| 42 |
+ if(!head) { |
| 43 |
+ head = new HTMLHeadElementImpl(document); |
| 44 |
+- e = head; |
| 45 |
+- insertNode(e); |
| 46 |
++ insertNode(head.get()); |
| 47 |
+ handled = true; |
| 48 |
+ } |
| 49 |
+ break; |
| 50 |
+@@ -894,7 +892,7 @@ |
| 51 |
+ case ID_HEAD: |
| 52 |
+ if(!head && (current->id() == ID_HTML || current->isDocumentNode())) { |
| 53 |
+ head = new HTMLHeadElementImpl(document); |
| 54 |
+- n = head; |
| 55 |
++ n = head.get(); |
| 56 |
+ } |
| 57 |
+ break; |
| 58 |
+ case ID_BODY: |
| 59 |
+@@ -1800,19 +1798,19 @@ |
| 60 |
+ head = new HTMLHeadElementImpl(document); |
| 61 |
+ HTMLElementImpl *body = doc()->body(); |
| 62 |
+ int exceptioncode = 0; |
| 63 |
+- doc()->documentElement()->insertBefore(head, body, exceptioncode); |
| 64 |
++ doc()->documentElement()->insertBefore(head.get(), body, exceptioncode); |
| 65 |
+ if ( exceptioncode ) { |
| 66 |
+ #ifdef PARSER_DEBUG |
| 67 |
+ kDebug( 6035 ) << "creation of head failed!!!!:" << exceptioncode; |
| 68 |
+ #endif |
| 69 |
+- delete head; |
| 70 |
++ delete head.get(); |
| 71 |
+ head = 0; |
| 72 |
+ } |
| 73 |
+ |
| 74 |
+ // If the body does not exist yet, then the <head> should be pushed as the current block. |
| 75 |
+ if (head && !body) { |
| 76 |
+ pushBlock(head->id(), tagPriority(head->id())); |
| 77 |
+- setCurrent(head); |
| 78 |
++ setCurrent(head.get()); |
| 79 |
+ } |
| 80 |
+ } |
| 81 |
+ |
| 82 |
+--- khtml/html/htmlparser.h |
| 83 |
++++ khtml/html/htmlparser.h |
| 84 |
+@@ -155,7 +155,7 @@ |
| 85 |
+ /* |
| 86 |
+ * the head element. Needed for crappy html which defines <base> after </head> |
| 87 |
+ */ |
| 88 |
+- DOM::HTMLHeadElementImpl *head; |
| 89 |
++ RefPtr<DOM::HTMLHeadElementImpl> head; |
| 90 |
+ |
| 91 |
+ /* |
| 92 |
+ * a possible <isindex> element in the head. Compatibility hack for |
| 93 |
+--- khtml/svg/SVGList.h |
| 94 |
++++ khtml/svg/SVGList.h |
| 95 |
@@ -97,7 +97,11 @@ |
| 96 |
|
| 97 |
Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&) |
Archives