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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit b8fb15a5b88a6fe5816e65ac728848c24db1867b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 30 21:40:06 2003 +0000

    	Fixed: <rdar://problem/3310066>: All images use wrong map if page has image map of name ""
    
            Reviewed by dave.
    
            * config.h:
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::getMap): return 0 if getMap is called with a NULL string instead of treating it like an empty string
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7220962..4015b3e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-06-30  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3310066>: All images use wrong map if page has image map of name ""
+
+        Reviewed by dave.
+
+        * config.h:
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::getMap): return 0 if getMap is called with a NULL string instead of treating it like an empty string
+
 2003-06-30  John Sullivan  <sullivan at apple.com>
 
 	- fixed gcc3.3 incompatibility
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7220962..4015b3e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-06-30  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3310066>: All images use wrong map if page has image map of name ""
+
+        Reviewed by dave.
+
+        * config.h:
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::getMap): return 0 if getMap is called with a NULL string instead of treating it like an empty string
+
 2003-06-30  John Sullivan  <sullivan at apple.com>
 
 	- fixed gcc3.3 incompatibility
diff --git a/WebCore/config.h b/WebCore/config.h
index daec459..4d49268 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -720,7 +720,7 @@ int mkstemps (char* _template, int suffix_len); /* defined in fakes.c */
 #define HAVE_FORK 1
 
 /* Define if Foundation source tree exists */
-#define HAVE_FOUNDATION_SOURCES 1
+/* #undef HAVE_FOUNDATION_SOURCES */
 
 /* Define if you have finite */
 #define HAVE_FUNC_FINITE 1
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index f548dea..ce3e67e 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -315,6 +315,10 @@ void HTMLDocumentImpl::slotHistoryChanged()
 
 HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
 {
+    if (_url.isNull()) {
+        return 0;
+    }
+    
     QString url = _url.string();
     QString s;
     int pos = url.find('#');

-- 
WebKit Debian packaging