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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 212e7796bd23acce953a968c196f6731ada3a41d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 1 21:33:54 2003 +0000

            Reviewed by Dave.
    
            - fixed 3496960: nil-deref in idFromNode inside elementDoesAutoComplete:
    
            * kwq/WebCoreBridge.mm:
            (inputElementFromDOMElement): Added nil check.
            (formElementFromDOMElement): Added nil check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 428ee99..a770b20 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3496960: nil-deref in idFromNode inside elementDoesAutoComplete:
+
+        * kwq/WebCoreBridge.mm:
+        (inputElementFromDOMElement): Added nil check.
+        (formElementFromDOMElement): Added nil check.
+
 2003-12-01  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3490959, collapsed border tables don't paint backgrounds.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index f7678ee..653c396 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -611,7 +611,7 @@ static HTMLInputElementImpl *inputElementFromDOMElement(id <WebDOMElement>elemen
 {
     ASSERT([(NSObject *)element isKindOfClass:[WebCoreDOMElement class]]);
     DOM::ElementImpl *domElement = [(WebCoreDOMElement *)element elementImpl];
-    if (idFromNode(domElement) == ID_INPUT) {
+    if (domElement && idFromNode(domElement) == ID_INPUT) {
         return static_cast<HTMLInputElementImpl *>(domElement);
     }
     return nil;
@@ -621,7 +621,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
 {
     ASSERT([(NSObject *)element isKindOfClass:[WebCoreDOMElement class]]);
     DOM::ElementImpl *domElement = [(WebCoreDOMElement *)element elementImpl];
-    if (idFromNode(domElement) == ID_FORM) {
+    if (domElement && idFromNode(domElement) == ID_FORM) {
         return static_cast<HTMLFormElementImpl *>(domElement);
     }
     return nil;

-- 
WebKit Debian packaging