[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 0bba8b7a66bdb57d135c2e4bdf6caed1e03e4510
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 11 21:02:02 2002 +0000

    	Thought I has checking for nil enough, but not enough as I raised an exception on Avie's machine.
    
            * Plugins.subproj/WebPlugin.m:
            (-[WebNetscapePlugin getPluginInfo]): check for the nil extension case
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d7d7bca..0cbffda 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-11  Chris Blumenberg  <cblu at apple.com>
+
+	Thought I has checking for nil enough, but not enough as I raised an exception on Avie's machine.
+
+        * Plugins.subproj/WebPlugin.m:
+        (-[WebNetscapePlugin getPluginInfo]): check for the nil extension case
+
 2002-10-11  Darin Adler  <darin at apple.com>
 
 	Apply a simplified technique I learned while working on the Favorites button
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d7d7bca..0cbffda 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-11  Chris Blumenberg  <cblu at apple.com>
+
+	Thought I has checking for nil enough, but not enough as I raised an exception on Avie's machine.
+
+        * Plugins.subproj/WebPlugin.m:
+        (-[WebNetscapePlugin getPluginInfo]): check for the nil extension case
+
 2002-10-11  Darin Adler  <darin at apple.com>
 
 	Apply a simplified technique I learned while working on the Favorites button
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index b16e602..26e5b3b 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -89,16 +89,27 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
         }
 
         extensionsList = [self stringForStringListID:128 andIndex:i+1];
-        extensions = [extensionsList componentsSeparatedByString:@","];
-        [MIMEToExtensions setObject:extensions forKey:MIME];
-
-        NSEnumerator *enumerator = [extensions objectEnumerator];
-        while ((extension = [enumerator nextObject]) != nil) {
-            [extensionToMIME setObject:MIME forKey:extension];
+        if(extensionsList){
+            extensions = [extensionsList componentsSeparatedByString:@","];
+            
+            [MIMEToExtensions setObject:extensions forKey:MIME];
+            
+            // Reverse the mapping
+            NSEnumerator *enumerator = [extensions objectEnumerator];
+            while ((extension = [enumerator nextObject]) != nil) {
+                [extensionToMIME setObject:MIME forKey:extension];
+            }
+        }else{
+            // DRM and WMP claim MIMEs without extensions. Use a @"" extension in this case.
+            [MIMEToExtensions setObject:[NSArray arrayWithObject:@""] forKey:MIME];
         }
         
         description = [self stringForStringListID:127 andIndex:[MIMEToExtensions count]];
-        [MIMEToDescription setObject:description forKey:MIME];
+        if(description){
+            [MIMEToDescription setObject:description forKey:MIME];
+        }else{
+            [MIMEToDescription setObject:@"" forKey:MIME];
+        }
     }
     
     pluginDescription = [self stringForStringListID:126 andIndex:1];

-- 
WebKit Debian packaging