[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 30903febbfa19b561a21d90f43c4930eca294cc9
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 7 20:36:54 2003 +0000

            Reviewed by Maciej
    
    	There was a bug in this code that caused a relative URL that was
    	being resolved against an empty base URL to process incorrectly.
    	The bug is that the resolution was being done twice. The first
    	time was correct handling of this case, but then the code did
    	not return at this point, and instead proceeded on through the
    	code path that is used to handle resolution of a relative URL
    	against a non-empty base. This double processing is clearly
    	wrong, and we found this bug as the result of the recent addition
    	of an assertion in some related code.
    
            * kwq/KWQKURL.mm:
            (KURL::KURL)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bac2dfc..1eba767 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-08-07  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Maciej
+
+	There was a bug in this code that caused a relative URL that was
+	being resolved against an empty base URL to process incorrectly.
+	The bug is that the resolution was being done twice. The first
+	time was correct handling of this case, but then the code did
+	not return at this point, and instead proceeded on through the
+	code path that is used to handle resolution of a relative URL
+	against a non-empty base. This double processing is clearly
+	wrong, and we found this bug as the result of the recent addition 
+	of an assertion in some related code.
+
+        * kwq/KWQKURL.mm:
+        (KURL::KURL)
+
 2003-08-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bac2dfc..1eba767 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-08-07  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Maciej
+
+	There was a bug in this code that caused a relative URL that was
+	being resolved against an empty base URL to process incorrectly.
+	The bug is that the resolution was being done twice. The first
+	time was correct handling of this case, but then the code did
+	not return at this point, and instead proceeded on through the
+	code path that is used to handle resolution of a relative URL
+	against a non-empty base. This double processing is clearly
+	wrong, and we found this bug as the result of the recent addition 
+	of an assertion in some related code.
+
+        * kwq/KWQKURL.mm:
+        (KURL::KURL)
+
 2003-08-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 53d564b..80aa146 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -301,6 +301,10 @@ KURL::KURL(const KURL &base, const QString &relative, const QTextCodec *codec)
 	if (!base.m_isValid) {
 	    QString newURL = base.urlString + str;
 	    parse(newURL.ascii(), &newURL);
+            if (strBuffer) {
+                free(strBuffer);
+            }
+            return;
 	}
 
 	switch(str[0]) {

-- 
WebKit Debian packaging