[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 65f84ae3e0b7b87822f1de2813c4584f6789d254
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 2 17:39:35 2002 +0000

    	- fixed 2978806 -- Crash going to ebay home page
    
            * khtml/ecma/kjs_navigator.cpp: (PluginBase::PluginBase): Check to be sure
    	that we are not at the end of the "tokens" collection before dereferencing
    	the iterator.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1492 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7a7ebbd..1485105 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-02  Darin Adler  <darin at apple.com>
+
+	- fixed 2978806 -- Crash going to ebay home page
+
+        * khtml/ecma/kjs_navigator.cpp: (PluginBase::PluginBase): Check to be sure
+	that we are not at the end of the "tokens" collection before dereferencing
+	the iterator.
+
 2002-07-01  Maciej Stachowiak  <mjs at apple.com>
 
         Fixed Radar 2953256 - JavaScript window.moveTo() and
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7a7ebbd..1485105 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-07-02  Darin Adler  <darin at apple.com>
+
+	- fixed 2978806 -- Crash going to ebay home page
+
+        * khtml/ecma/kjs_navigator.cpp: (PluginBase::PluginBase): Check to be sure
+	that we are not at the end of the "tokens" collection before dereferencing
+	the iterator.
+
 2002-07-01  Maciej Stachowiak  <mjs at apple.com>
 
         Fixed Radar 2953256 - JavaScript window.moveTo() and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7a7ebbd..1485105 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-07-02  Darin Adler  <darin at apple.com>
+
+	- fixed 2978806 -- Crash going to ebay home page
+
+        * khtml/ecma/kjs_navigator.cpp: (PluginBase::PluginBase): Check to be sure
+	that we are not at the end of the "tokens" collection before dereferencing
+	the iterator.
+
 2002-07-01  Maciej Stachowiak  <mjs at apple.com>
 
         Fixed Radar 2953256 - JavaScript window.moveTo() and
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index dbc8b0e..00bb802 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -282,13 +282,31 @@ PluginBase::PluginBase(ExecState *exec)
                 QStringList::Iterator token;
 
                 token = tokens.begin();
+#ifdef APPLE_CHANGES
+                if (token == tokens.end()) {
+                    delete mime;
+                    continue;
+                }
+#endif
                 mime->type = (*token).lower();
                 //kdDebug(6070) << "mime->type=" << mime->type << endl;
                 ++token;
 
+#ifdef APPLE_CHANGES
+                if (token == tokens.end()) {
+                    delete mime;
+                    continue;
+                }
+#endif
                 mime->suffixes = *token;
                 ++token;
 
+#ifdef APPLE_CHANGES
+                if (token == tokens.end()) {
+                    delete mime;
+                    continue;
+                }
+#endif
                 mime->desc = *token;
                 ++token;
 

-- 
WebKit Debian packaging