[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 97d4083058043ba86233ea061c3c85e22a31d01f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 22 14:39:52 2002 +0000

    	* Plugins.subproj/IFPluginView.mm:
    	(-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
    	Fix the fix. It was bumping argsCount even when not putting an
    	argument into the array.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ba3541a..6838506 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-22  Darin Adler  <darin at apple.com>
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
+	Fix the fix. It was bumping argsCount even when not putting an
+	argument into the array.
+
 2002-04-21  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix a plugins memory trasher that was making Alexander crash on
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ba3541a..6838506 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-22  Darin Adler  <darin at apple.com>
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
+	Fix the fix. It was bumping argsCount even when not putting an
+	argument into the array.
+
 2002-04-21  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix a plugins memory trasher that was making Alexander crash on
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 9063080..b07a4e4 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -48,7 +48,6 @@ newCString(NSString *string)
 - initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
 {
     NSString *baseURLString;
-    unsigned maxArguments;
 
     [super initWithFrame: r];
     
@@ -96,10 +95,8 @@ newCString(NSString *string)
         // These arrays are passed to NPP_New, but the strings need to be
         // modifiable and live the entire life of the plugin.
         
-        maxArguments = [arguments count];
-        
-        cAttributes = new char * [maxArguments];
-        cValues = new char * [maxArguments];
+        cAttributes = new char * [[arguments count]];
+        cValues = new char * [[arguments count]];
         
         NSEnumerator *e = [arguments keyEnumerator];
         NSString *key;
@@ -107,8 +104,8 @@ newCString(NSString *string)
             if (![key isEqualToString:@"wkfullmode"]) {
                 cAttributes[argsCount] = newCString(key);
                 cValues[argsCount] = newCString([arguments objectForKey:key]);
+                argsCount++;
             }
-	    argsCount++;
         }
     }
     
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 9063080..b07a4e4 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -48,7 +48,6 @@ newCString(NSString *string)
 - initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
 {
     NSString *baseURLString;
-    unsigned maxArguments;
 
     [super initWithFrame: r];
     
@@ -96,10 +95,8 @@ newCString(NSString *string)
         // These arrays are passed to NPP_New, but the strings need to be
         // modifiable and live the entire life of the plugin.
         
-        maxArguments = [arguments count];
-        
-        cAttributes = new char * [maxArguments];
-        cValues = new char * [maxArguments];
+        cAttributes = new char * [[arguments count]];
+        cValues = new char * [[arguments count]];
         
         NSEnumerator *e = [arguments keyEnumerator];
         NSString *key;
@@ -107,8 +104,8 @@ newCString(NSString *string)
             if (![key isEqualToString:@"wkfullmode"]) {
                 cAttributes[argsCount] = newCString(key);
                 cValues[argsCount] = newCString([arguments objectForKey:key]);
+                argsCount++;
             }
-	    argsCount++;
         }
     }
     

-- 
WebKit Debian packaging