[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 40efe749520274358228a8da6f5057ce7360733d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 30 19:22:19 2002 +0000

    Tests:
    
            Reviewed by Darin and Gramps
    
    	Added some more test cases as part of the work to fix this bug:
    
    	Radar 3136795 (type URL with ../ in it, get assertion)
    
    	I also notice an unrelated change in ifnsurlextensions-test.chk where
    	leading whitespace in a URL is now getting removed correctly. Bonus.
    
            * TestURLs.h
            * WebFoundation-Misc/ifnsurlextensions-test.chk
            * WebFoundation-Misc/ifnsurlextensions-test.m:
            (main)
    
    WebFoundation:
    
            Reviewed by Darin and Gramps
    
            Radar 3136795 (type URL with ../ in it, get assertion)
    
            The code to remove relative portions from URLs was eating leading slashes on
            URL paths. This caused absolute paths with relative portions to get mangled,
            resulting in a URL that the engine could not use. Now, leading slashes are no
            longer removed from URL paths, resulting in usuable URLs.
    
            * Misc.subproj/WebNSURLExtras.m:
            (pathRemovingDots)
            (-[NSURL _web_URLComponents])
    
    WebCore:
    
            Reviewed by Darin and Gramps
    
    	Fix for this bug:
    
    	Radar 3136795 (type URL with ../ in it, get assertion)
    
    	The code to remove relative portions from URLs was eating leading slashes on
    	URL paths. This caused absolute paths with relative portions to get mangled,
    	resulting in a URL that the engine could not use. Now, leading slashes are no
    	longer removed from URL paths, resulting in usuable URLs.
    
            * kwq/KWQKURL.mm:
            (copyPathRemovingDots)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 56b1ea0..4d09c77 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-12-30  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin and Gramps
+
+	Fix for this bug:
+
+	Radar 3136795 (type URL with ../ in it, get assertion)
+
+	The code to remove relative portions from URLs was eating leading slashes on
+	URL paths. This caused absolute paths with relative portions to get mangled,
+	resulting in a URL that the engine could not use. Now, leading slashes are no
+	longer removed from URL paths, resulting in usuable URLs.
+
+        * kwq/KWQKURL.mm:
+        (copyPathRemovingDots)
+
 2002-12-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 56b1ea0..4d09c77 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-12-30  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin and Gramps
+
+	Fix for this bug:
+
+	Radar 3136795 (type URL with ../ in it, get assertion)
+
+	The code to remove relative portions from URLs was eating leading slashes on
+	URL paths. This caused absolute paths with relative portions to get mangled,
+	resulting in a URL that the engine could not use. Now, leading slashes are no
+	longer removed from URL paths, resulting in usuable URLs.
+
+        * kwq/KWQKURL.mm:
+        (copyPathRemovingDots)
+
 2002-12-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index d21e0ea..b3d978b 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -762,7 +762,8 @@ static int copyPathRemovingDots(char *dst, const char *src, int srcStart, int sr
                 }
                 // Note that these two while blocks differ subtly.
                 // The first helps to remove multiple adjoining slashes as we rewind.
-                while (dst > bufferPathStart && dst[-1] == '/') {
+                // The +1 to bufferPathStart in the first while block prevents eating a leading slash
+                while (dst > bufferPathStart + 1 && dst[-1] == '/') {
                     dst--;
                 }
                 while (dst > bufferPathStart && dst[-1] != '/') {

-- 
WebKit Debian packaging