rev 5564 - in trunk/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-02-07 00:02:26 +0100 (Wed, 07 Feb 2007)
New Revision: 5564

Added:
   trunk/packages/kdelibs/debian/patches/45_konqueror-CVE-2007-0537.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
First security patch for kde 3.5.6


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-02-06 22:35:32 UTC (rev 5563)
+++ trunk/packages/kdelibs/debian/changelog	2007-02-06 23:02:26 UTC (rev 5564)
@@ -14,6 +14,10 @@
 
   * Bump shlibs.
 
+  +++ Changes by Ana:
+
+  * Copy entry from etch's branch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Feb 2007 01:46:55 +0200
 
 kdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low

Added: trunk/packages/kdelibs/debian/patches/45_konqueror-CVE-2007-0537.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/45_konqueror-CVE-2007-0537.diff	2007-02-06 22:35:32 UTC (rev 5563)
+++ trunk/packages/kdelibs/debian/patches/45_konqueror-CVE-2007-0537.diff	2007-02-06 23:02:26 UTC (rev 5564)
@@ -0,0 +1,20 @@
+--- kdelibs-3.5.5a.dfsg.1/khtml/html/htmltokenizer.cpp
++++ kdelibs-3.5.5a.dfsg.1/khtml/html/htmltokenizer.cpp
+@@ -316,7 +316,7 @@ void HTMLTokenizer::parseSpecial(Tokeniz
+     while ( !src.isEmpty() ) {
+         checkScriptBuffer();
+         unsigned char ch = src->latin1();
+-        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
++        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
+             comment = true;
+             scriptCode[ scriptCodeSize++ ] = ch;
+             ++src;
+@@ -495,7 +495,7 @@ void HTMLTokenizer::parseComment(Tokeniz
+ 
+             if (canClose || handleBrokenComments || scriptEnd ){
+                 ++src;
+-                if ( !( script || xmp || textarea || style) ) {
++                if ( !( title || script || xmp || textarea || style) ) {
+ #ifdef COMMENTS_IN_DOM
+                     checkScriptBuffer();
+                     scriptCode[ scriptCodeSize ] = 0;