Changeset 418 for trunk/icedtea-web/plugin/icedteanp

Timestamp:

Feb 11, 2013, 8:53:47 PM (13 years ago)

Author:

dmik

Message:

Merge icedtea-web v1.3 to trunk.

Location:

trunk/icedtea-web

Files:

• . (modified) (1 prop)
• plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (modified) (5 diffs)
• plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (23 diffs)
• plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (modified) (23 diffs)
• plugin/icedteanp/IcedTeaPluginUtils.cc (modified) (15 diffs)
• plugin/icedteanp/IcedTeaPluginUtils.h (modified) (2 diffs)
• plugin/icedteanp/java/netscape/javascript/JSObject.java (modified) (2 diffs)
• plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java (modified) (1 diff)
• plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java (modified) (1 diff)
• plugin/icedteanp/java/sun/applet/JavaConsole.java (modified) (3 diffs)
• plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java (modified) (2 diffs)
• plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (modified) (5 diffs)
• plugin/icedteanp/java/sun/applet/PluginCallRequest.java (modified) (1 diff)
• plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java (modified) (2 diffs)
• plugin/icedteanp/java/sun/applet/PluginCookieManager.java (modified) (2 diffs)
• plugin/icedteanp/java/sun/applet/PluginException.java (modified) (1 diff)
• plugin/icedteanp/java/sun/applet/PluginMain.java (modified) (2 diffs)
• plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java (modified) (1 diff)
• plugin/icedteanp/java/sun/applet/PluginStreamHandler.java (modified) (3 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

@@ -921 +921 @@
     {
         className = "java.lang.String";
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-        stringArg += NPVARIANT_TO_STRING(variant).utf8characters;
-#else
-        stringArg += NPVARIANT_TO_STRING(variant).UTF8Characters;
-#endif
+        stringArg = IcedTeaPluginUtilities::NPVariantAsString(variant);
     } else if (NPVARIANT_IS_OBJECT(variant))
     {
@@ -938 +934 @@
             PLUGIN_DEBUG("NPObject is not a Java object\n");
             NPIdentifier length_id = browser_functions.getstringidentifier("length");
+            bool isJSObjectArray = false;
 
             // FIXME: We currently only handle <= 2 dim arrays. Do we really need more though?
@@ -953 +950 @@
                 IcedTeaPluginUtilities::itoa(NPVARIANT_TO_INT32(length), &length_str);
 
-                if (NPVARIANT_TO_INT32(length) > 0)
+                if (NPVARIANT_TO_INT32(length) >= 0)
                 {
                     NPIdentifier id_0 = browser_functions.getintidentifier(0);
@@ -973 +970 @@
                         getArrayTypeForJava(instance, first_element, &java_array_type);
                     }
-                } else
-                    java_array_type.append("jsobject");
+                }
+
+                // For JSObject arrays, we create a regular object (accessible via JSObject.getSlot())
+                if (NPVARIANT_TO_INT32(length) < 0 || !java_array_type.compare("jsobject"))
+                {
+                    isJSObjectArray = true;
+                    goto createRegularObject;
+                }
 
                 java_result = java_request.newArray(java_array_type, length_str);
@@ -1012 +1015 @@
                 // Got here => no errors above. We're good to return!
                 return;
-            } else // Else it is not an array
+            }
+
+            createRegularObject:
+            if (!IcedTeaPluginUtilities::isObjectJSArray(instance, obj) || isJSObjectArray) // Else it is not an array
             {
 

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -108 +108 @@
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
+
+#ifdef HAVE_JAVA7
+ #define JPI_VERSION "1.7.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;version=1.7:class,jar:IcedTea;"
+ #define PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;version=1.7:class,jar:IcedTea;"
+#else
+ #define JPI_VERSION "1.6.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7
+ #define PLUGIN_BEAN_MIME_DESC7
+#endif
 
 #define PLUGIN_MIME_DESC                                               \
@@ -126 +138 @@
   "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
   "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
-  "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"  \
+  PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"  \
   "application/x-java-bean:class,jar:IcedTea;"                         \
   "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
@@ -142 +155 @@
   "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
-  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
+  PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
@@ -280 +294 @@
 pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
 
+
+#ifdef LEGACY_GLIB
+// Returns key from first item stored in hashtable
+gboolean
+find_first_item_in_hash_table(gpointer key, gpointer value, gpointer user_data)
+{
+    user_data = key;
+    return (gboolean)TRUE;
+}
+
+int
+g_strcmp0(char *str1, char *str2)
+{
+   if (str1 != NULL)
+     return str2 != NULL ? strcmp(str1, str2) : 1;
+   else // str1 == NULL
+     return str2 != NULL ? 1 : 0;
+}
+
+
+#endif
+
+
+/* 
+ * Find first member in GHashTable* depending on version of glib
+ */
+gpointer getFirstInTableInstance(GHashTable* table)
+{
+      gpointer id, instance;
+      #ifndef LEGACY_GLIB
+        GHashTableIter iter;
+        g_hash_table_iter_init (&iter, table);
+        g_hash_table_iter_next (&iter, &instance, &id);
+      #else
+        g_hash_table_find(table, (GHRFunc)find_first_item_in_hash_table, &instance);
+      #endif
+        return instance;
+}
+
 // Functions prefixed by ITNP_ are instance functions.  They are called
 // by the browser and operate on instances of ITNPPluginData.
@@ -405 +458 @@
 
  cleanup_appletviewer_mutex:
-  g_free (data->appletviewer_mutex);
+  g_mutex_free (data->appletviewer_mutex);
   data->appletviewer_mutex = NULL;
 
@@ -965 +1018 @@
 get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len)
 {
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) <= 0)
+  {
+    return NPERR_GENERIC_ERROR;
+  }
 #if MOZILLA_VERSION_COLLAPSED < 1090100
   nsresult rv;
@@ -1008 +1066 @@
   if (browser_functions.getvalueforurl)
   {
-      GHashTableIter iter;
-      gpointer id, instance;
-
-      g_hash_table_iter_init (&iter, instance_to_id_map);
-      g_hash_table_iter_next (&iter, &instance, &id);
-
+      gpointer instance=getFirstInTableInstance(instance_to_id_map);
       return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len);
   } else
@@ -1023 +1076 @@
 
   return NPERR_NO_ERROR;
+}
+
+static NPError
+set_cookie_info(const char* siteAddr, const char* cookieString, uint32_t len)
+{
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) > 0 && browser_functions.getvalueforurl)
+  {
+      // We arbitrarily use the first valid instance we can grab
+      // For an explanation of the logic behind this, see get_cookie_info
+      gpointer instance = getFirstInTableInstance(instance_to_id_map);
+      return browser_functions.setvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len);
+  }
+
+  return NPERR_GENERIC_ERROR;;
 }
 
@@ -1138 +1206 @@
                                href_id, &href);
 
-  // Strip everything after the last "/"
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-  gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1);
-#else
-  gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1);
-#endif
-  guint parts_sz = g_strv_length (parts);
-
-  std::string location_str;
-  for (int i=0; i < parts_sz - 1; i++)
-  {
-      location_str += parts[i];
-      location_str += "/";
-  }
-
-  documentbase_copy = g_strdup (location_str.c_str());
+  std::string href_str = IcedTeaPluginUtilities::NPVariantAsString(href);
+  documentbase_copy = g_strdup (href_str.c_str());
 
   // Release references.
@@ -1258 +1312 @@
 }
 
+static
+void consume_plugin_message(gchar* message) {
+  // internal plugin related message
+  gchar** parts = g_strsplit (message, " ", 5);
+  if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
+  {
+    gchar* proxy;
+    uint32_t len;
+
+    gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+    PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url);
+
+    gchar* proxy_info;
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        proxy = (char*) malloc(sizeof(char)*2048);
+#endif
+
+    proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
+    if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR)
+      {
+        proxy_info = g_strconcat (proxy_info, proxy, NULL);
+      }
+
+    PLUGIN_DEBUG("Proxy info: %s\n", proxy_info);
+    plugin_send_message_to_appletviewer(proxy_info);
+
+    free(decoded_url);
+    decoded_url = NULL;
+    g_free(proxy_info);
+    proxy_info = NULL;
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        g_free(proxy);
+        proxy = NULL;
+#endif
+
+  } else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
+  {
+    gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+
+    gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
+    gchar* cookie_string;
+    uint32_t len;
+    if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
+    {
+        cookie_info = g_strconcat (cookie_info, cookie_string, NULL);
+    }
+
+    PLUGIN_DEBUG("Cookie info: %s\n", cookie_info);
+    plugin_send_message_to_appletviewer(cookie_info);
+
+    free(decoded_url);
+    decoded_url = NULL;
+    g_free(cookie_info);
+    cookie_info = NULL;
+  } else if (g_str_has_prefix(parts[1], "PluginSetCookie"))
+  {
+    // Message structure: plugin PluginSetCookie reference -1 <url> <cookie>
+    gchar** cookie_parts = g_strsplit (message, " ", 6);
+
+    if (g_strv_length(cookie_parts) < 6)
+    {
+       g_strfreev (parts);
+       g_strfreev (cookie_parts);
+       return; // Defensive, message _should_ be properly formatted
+    }
+
+    gchar* decoded_url = (gchar*) calloc(strlen(cookie_parts[4])+1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(cookie_parts[4], &decoded_url);
+
+    gchar* cookie_string = cookie_parts[5];
+    uint32_t len = strlen(cookie_string);
+    if (set_cookie_info(decoded_url, cookie_string, len) == NPERR_NO_ERROR)
+    {
+          PLUGIN_DEBUG("Setting cookie for URL %s to %s\n", decoded_url, cookie_string);
+    } else
+    {
+          PLUGIN_DEBUG("Not able to set cookie for URL %s to %s\n", decoded_url, cookie_string);
+    }
+
+    free(decoded_url);
+    decoded_url = NULL;
+    g_strfreev (cookie_parts);
+    cookie_parts = NULL;
+  }
+
+  g_strfreev (parts);
+  parts = NULL;
+}
+
 void consume_message(gchar* message) {
 
@@ -1287 +1434 @@
 
           // clear the "instance X status" parts
-          sprintf(parts[0], "");
-          sprintf(parts[1], "");
-          sprintf(parts[2], "");
+          strcpy(parts[0], "");
+          strcpy(parts[1], "");
+          strcpy(parts[2], "");
 
           // join the rest
@@ -1320 +1467 @@
   else if (g_str_has_prefix (message, "plugin "))
     {
-      // internal plugin related message
-      gchar** parts = g_strsplit (message, " ", 5);
-      if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
-      {
-        gchar* proxy;
-        uint32_t len;
-
-        gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar));
-        IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
-        PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url);
-
-        gchar* proxy_info;
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-        proxy = (char*) malloc(sizeof(char)*2048);
-#endif
-
-        proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
-        if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR)
-          {
-            proxy_info = g_strconcat (proxy_info, proxy, NULL);
-          }
-
-        PLUGIN_DEBUG("Proxy info: %s\n", proxy_info);
-        plugin_send_message_to_appletviewer(proxy_info);
-
-        g_free(decoded_url);
-        decoded_url = NULL;
-        g_free(proxy_info);
-        proxy_info = NULL;
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-        g_free(proxy);
-        proxy = NULL;
-#endif
-
-      } else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
-      {
-        gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar));
-        IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
-
-        gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
-        gchar* cookie_string;
-        uint32_t len;
-        if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
-        {
-            cookie_info = g_strconcat (cookie_info, cookie_string, NULL);
-        }
-
-        PLUGIN_DEBUG("Cookie info: %s\n", cookie_info);
-        plugin_send_message_to_appletviewer(cookie_info);
-
-        g_free(decoded_url);
-        decoded_url = NULL;
-        g_free(cookie_info);
-        cookie_info = NULL;
-      }
+        consume_plugin_message(message);
     }
   else
@@ -1382 +1473 @@
         g_print ("  Unable to handle message: %s\n", message);
     }
+
 }
 
@@ -1401 +1493 @@
 get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len)
 {
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) <= 0)
+  {
+          return NPERR_GENERIC_ERROR;
+  }
 #if MOZILLA_VERSION_COLLAPSED < 1090100
   nsresult rv;
@@ -1475 +1572 @@
 
       // As in get_cookie_info, we use the first active instance
-      GHashTableIter iter;
-      gpointer id, instance;
-
-      g_hash_table_iter_init (&iter, instance_to_id_map);
-      g_hash_table_iter_next (&iter, &instance, &id);
-
+      gpointer instance=getFirstInTableInstance(instance_to_id_map);
       browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len);
   } else
@@ -2086 +2178 @@
 
   // cleanup_appletviewer_mutex:
-  g_free (tofree->appletviewer_mutex);
+  g_mutex_free (tofree->appletviewer_mutex);
   tofree->appletviewer_mutex = NULL;
 
@@ -2109 +2201 @@
 }
 
-static NPError
-plugin_get_entry_points (NPPluginFuncs* pluginTable)
-{
-  // Ensure that the plugin function table we've received is large
-  // enough to store the number of functions that we may provide.
-  if (pluginTable->size < sizeof (NPPluginFuncs))
-    {
-      PLUGIN_ERROR ("Invalid plugin function table.");
-
-      return NPERR_INVALID_FUNCTABLE_ERROR;
-    }
-
-  // Return to the browser the plugin functions that we implement.
+static bool
+initialize_browser_functions(const NPNetscapeFuncs* browserTable)
+{
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
+#else
+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
+#endif
+
+  //Determine the size in bytes, as a difference of the address past the last used field
+  //And the browser table address
+  size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
+
+  // compare the reported size versus the size we required
+  if (browserTable->size < usedSize)
+  {
+    return false;
+  }
+
+  //Ensure any unused fields are NULL
+  memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
+
+  //browserTable->size can be larger than sizeof(NPNetscapeFuncs) (PR1106)
+  size_t copySize = browserTable->size < sizeof(NPNetscapeFuncs) ?
+                    browserTable->size : sizeof(NPNetscapeFuncs);
+
+  //Copy fields according to given size
+  memcpy(&browser_functions, browserTable, copySize);
+
+  return true;
+}
+
+/* Set the plugin table to the correct contents, taking care not to write past
+ * the provided object space */
+static bool
+initialize_plugin_table(NPPluginFuncs* pluginTable)
+{
+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
+
+  //Determine the size in bytes, as a difference of the address past the last used field
+  //And the browser table address
+  size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
+
+  // compare the reported size versus the size we required
+  if (pluginTable->size < usedSize)
+    return false;
+
   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
   pluginTable->size = sizeof (NPPluginFuncs);
@@ -2151 +2277 @@
 #endif
 
-  return NPERR_NO_ERROR;
+  return true;
 }
 
@@ -2200 +2326 @@
     }
 
-  // Ensure that the browser function table is large enough to store
-  // the number of browser functions that we may use.
-  if (browserTable->size < sizeof (NPNetscapeFuncs))
-    {
-      fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
-    }
-
-  // Store in a local table the browser functions that we may use.
-  browser_functions.size                    = browserTable->size;
-  browser_functions.version                 = browserTable->version;
-  browser_functions.geturlnotify            = browserTable->geturlnotify;
-  browser_functions.geturl                  = browserTable->geturl;
-  browser_functions.posturlnotify           = browserTable->posturlnotify;
-  browser_functions.posturl                 = browserTable->posturl;
-  browser_functions.requestread             = browserTable->requestread;
-  browser_functions.newstream               = browserTable->newstream;
-  browser_functions.write                   = browserTable->write;
-  browser_functions.destroystream           = browserTable->destroystream;
-  browser_functions.status                  = browserTable->status;
-  browser_functions.uagent                  = browserTable->uagent;
-  browser_functions.memalloc                = browserTable->memalloc;
-  browser_functions.memfree                 = browserTable->memfree;
-  browser_functions.memflush                = browserTable->memflush;
-  browser_functions.reloadplugins           = browserTable->reloadplugins;
-  browser_functions.getJavaEnv              = browserTable->getJavaEnv;
-  browser_functions.getJavaPeer             = browserTable->getJavaPeer;
-  browser_functions.getvalue                = browserTable->getvalue;
-  browser_functions.setvalue                = browserTable->setvalue;
-  browser_functions.invalidaterect          = browserTable->invalidaterect;
-  browser_functions.invalidateregion        = browserTable->invalidateregion;
-  browser_functions.forceredraw             = browserTable->forceredraw;
-  browser_functions.getstringidentifier     = browserTable->getstringidentifier;
-  browser_functions.getstringidentifiers    = browserTable->getstringidentifiers;
-  browser_functions.getintidentifier        = browserTable->getintidentifier;
-  browser_functions.identifierisstring      = browserTable->identifierisstring;
-  browser_functions.utf8fromidentifier      = browserTable->utf8fromidentifier;
-  browser_functions.intfromidentifier       = browserTable->intfromidentifier;
-  browser_functions.createobject            = browserTable->createobject;
-  browser_functions.retainobject            = browserTable->retainobject;
-  browser_functions.releaseobject           = browserTable->releaseobject;
-  browser_functions.invoke                  = browserTable->invoke;
-  browser_functions.invokeDefault           = browserTable->invokeDefault;
-  browser_functions.evaluate                = browserTable->evaluate;
-  browser_functions.getproperty             = browserTable->getproperty;
-  browser_functions.setproperty             = browserTable->setproperty;
-  browser_functions.removeproperty          = browserTable->removeproperty;
-  browser_functions.hasproperty             = browserTable->hasproperty;
-  browser_functions.hasmethod               = browserTable->hasmethod;
-  browser_functions.releasevariantvalue     = browserTable->releasevariantvalue;
-  browser_functions.setexception            = browserTable->setexception;
-  browser_functions.pluginthreadasynccall   = browserTable->pluginthreadasynccall;
-#if MOZILLA_VERSION_COLLAPSED >= 1090100
-  browser_functions.getvalueforurl          = browserTable->getvalueforurl;
-  browser_functions.setvalueforurl          = browserTable->setvalueforurl;
-#endif
-
-  NPError np_error = NPERR_NO_ERROR;
+  // Copy into a global table (browser_functions) the browser functions that we may use.
+  // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
+  // within this function
+  bool browser_functions_supported = initialize_browser_functions(browserTable);
+
+  // Check if everything we rely on is supported
+  if ( !browser_functions_supported )
+  {
+        PLUGIN_ERROR ("Invalid browser function table.");
+
+        return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
+
 #if !defined(_WIN32) && !defined (__OS2__)
-  np_error = plugin_get_entry_points (pluginTable);
-  if (np_error != NPERR_NO_ERROR)
-    return np_error;
+  // Return to the browser the plugin functions that we implement.
+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
+  // within this function
+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
+
+  // Check if everything we rely on is supported
+  if ( !plugin_functions_supported )
+  {
+    PLUGIN_ERROR ("Invalid plugin function table.");
+
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
 #endif
 
@@ -2287 +2378 @@
       return NPERR_OUT_OF_MEMORY_ERROR;
     }
+  NPError np_error = NPERR_NO_ERROR;
+  gchar* filename = NULL;
 
   // If P_tmpdir does not exist, try /tmp directly
@@ -2293 +2386 @@
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
     {
+      int file_error = 0;
+
       data_directory = g_strconcat ("/tmp", NULL);
         if (!data_directory)
@@ -2453 +2548 @@
   }
 
-  return plugin_get_entry_points (pluginTable);
+  // Return to the browser the plugin functions that we implement.
+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
+  // within this function
+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
+
+  // Check if everything we rely on is supported
+  if ( !plugin_functions_supported )
+  {
+    PLUGIN_ERROR ("Invalid plugin function table.");
+
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
+
+  return NPERR_NO_ERROR;
 }
 #endif
@@ -2459 +2567 @@
 // Returns a string describing the MIME type that this plugin
 // handles.
-const char*
+#ifdef LEGACY_XULRUNNERAPI
+  char* 
+#else
+  const char* 
+#endif
 OSCALL NP_GetMIMEDescription ()
 {

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc

@@ -124 +124 @@
             this->sendWindow(message_parts);
             return true;
+        } else if (!command->find("Finalize"))
+        {
+            // Object can be finalized from the main thread only. And this
+                // call returns immediately, so we do it in the same thread.
+            this->finalize(message_parts);
+            return true;
         } else if (!command->find("GetMember") ||
                    !command->find("SetMember") ||
@@ -131 +137 @@
                    !command->find("SetSlot") ||
                    !command->find("Eval") ||
-                   !command->find("Finalize") ||
                    !command->find("LoadURL"))
         {
@@ -242 +247 @@
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_eval, &thread_data);
 
-    NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
-    std::string result_variant_jniid = std::string();
-    createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid);
-
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
     response += " JavaScriptEval ";
-    response += result_variant_jniid;
+    response += thread_data.result;
 
     plugin_to_java_bus->post(response.c_str());
@@ -275 +276 @@
     NPVariant* result_variant;
     std::string result_variant_jniid = std::string();
-    NPVariant* args_array;
+    NPVariant* args_array = NULL;
     AsyncCallThreadData thread_data = AsyncCallThreadData();
 
@@ -331 +332 @@
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_call, &thread_data);
 
-    result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
-
-    if (result_variant)
-    {
-        createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid);
-    } else
-    {
-        result_variant_jniid = "0";
-    }
-
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
     response += " JavaScriptCall ";
-    response += result_variant_jniid;
+    response += thread_data.result;
 
     plugin_to_java_bus->post(response.c_str());
@@ -410 +401 @@
     NPP instance;
     NPVariant* member;
-    NPIdentifier property_identifier;
+    std::string property_id = std::string();
+    bool int_identifier;
 
     JavaRequestProcessor java_request = JavaRequestProcessor();
@@ -440 +432 @@
     if (*(message_parts->at(4)) == "SetSlot")
     {
-        property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(6)->c_str()));
+        property_id.append(*(message_parts->at(6)));
+        int_identifier = true;
     } else
     {
@@ -452 +445 @@
         }
 
-        property_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
+        property_id.append(*(java_result->return_string));
+        int_identifier = false;
     }
 
@@ -462 +456 @@
     thread_data.parameters.push_back(instance);
     thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*member));
-    thread_data.parameters.push_back(&property_identifier);
+    thread_data.parameters.push_back(&property_id);
     thread_data.parameters.push_back(&value);
+    thread_data.parameters.push_back(&int_identifier);
 
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_setMember, &thread_data);
@@ -478 +473 @@
  * can only be requested from the main thread in Mozilla, this function
  * does whatever it can seperately, and then makes an internal request that
- * causes _sendMember to do the rest of the work.
+ * causes _getMember to do the rest of the work.
  *
  * @param message_parts The request message
@@ -491 +486 @@
     JavaResultData* java_result;
     NPVariant* parent_ptr;
+    NPVariant* member_ptr;
 
     //int reference;
     std::string member_id = std::string();
-    std::string jsObjectClassID = std::string();
-    std::string jsObjectConstructorID = std::string();
     std::string response = std::string();
+    std::string result_id = std::string();
 
     NPIdentifier member_identifier;
@@ -503 +498 @@
     int instance_id;
     int reference;
+    bool int_identifier;
 
     // debug printout of parent thread data
@@ -517 +513 @@
     if (*(message_parts->at(4)) == "GetSlot")
     {
-        member_identifier = browser_functions.getintidentifier(atoi(member_id.c_str()));
+        int_identifier=true;
     } else
     {
@@ -530 +526 @@
         }
 
-        member_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
+        member_id.assign(*(java_result->return_string));
+        int_identifier=false;
     }
 
@@ -546 +543 @@
     thread_data.parameters.push_back(instance);
     thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*parent_ptr));
-    thread_data.parameters.push_back(&member_identifier);
+    thread_data.parameters.push_back(&member_id);
+    thread_data.parameters.push_back(&int_identifier);
 
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_getMember, &thread_data);
 
-    PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str());
-
-    java_result = java_request.findClass(0, "netscape.javascript.JSObject");
-
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
-    jsObjectClassID.append(*(java_result->return_string));
-
-    args = std::vector<std::string>();
-    std::string longArg = "J";
-    args.push_back(longArg);
-
-    java_result = java_request.getMethodID(jsObjectClassID,
-                                           browser_functions.getstringidentifier("<init>"),
-                                           args);
-
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
-    jsObjectConstructorID.append(*(java_result->return_string));
-
-    // We have the method id. Now create a new object.
-
-    args.clear();
-    args.push_back(thread_data.result);
-    java_result = java_request.newObjectWithConstructor("",
-                                         jsObjectClassID,
-                                         jsObjectConstructorID,
-                                         args);
-
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
-
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
-    if (*(message_parts->at(2)) == "GetSlot")
-    {
+    if (*(message_parts->at(4)) == "GetSlot")
+    {
+        response.append(" JavaScriptGetSlot ");
+    } else {
         response.append(" JavaScriptGetMember ");
-    } else {
-        response.append(" JavaScriptGetSlot ");
-    }
-    response.append(java_result->return_string->c_str());
+    }
+    response.append(thread_data.result);
     plugin_to_java_bus->post(response.c_str());
 }
@@ -764 +715 @@
                 processor->setMember(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
-            } else if (command == "Finalize")
-            {
-                // write methods are synchronized
-                pthread_mutex_lock(&syn_write_mutex);
-                processor->finalize(message_parts);
-                pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "LoadURL") // For instance X url <url> <target>
             {
@@ -821 +766 @@
     NPVariant value_variant = NPVariant();
     NPObject* member;
-    NPIdentifier* property;
+    NPIdentifier property_identifier;
+
 
     std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
     instance = (NPP) parameters.at(0);
     member = (NPObject*) parameters.at(1);
-    property = (NPIdentifier*) parameters.at(2);
+    std::string*  property_id = (std::string*) parameters.at(2);
     value = (std::string*) parameters.at(3);
-
-    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(*property), instance, member, value->c_str());
+    bool* int_identifier = (bool*) parameters.at(4);
+
+    if(*int_identifier==true)
+        property_identifier = browser_functions.getintidentifier(atoi(property_id->c_str()));
+    else
+        property_identifier = browser_functions.getstringidentifier(property_id->c_str());
+
+    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(property_identifier), instance, member, value->c_str());
 
     IcedTeaPluginUtilities::javaResultToNPVariant(instance, value, &value_variant);
 
-    ((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, *property, &value_variant);
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, property_identifier, &value_variant);
 
     ((AsyncCallThreadData*) data)->result_ready = true;
@@ -850 +802 @@
     instance = (NPP) parameters.at(0);
     parent_ptr = (NPObject*) parameters.at(1);
-    NPIdentifier* member_identifier = (NPIdentifier*) parameters.at(2);
+    std::string*  member_id = (std::string*) parameters.at(2);
+    NPIdentifier member_identifier;
+
+    bool* int_identifier = (bool*) parameters.at(3);
+
+    if(*int_identifier==true)
+        member_identifier = browser_functions.getintidentifier(atoi(member_id->c_str()));
+    else
+        member_identifier = browser_functions.getstringidentifier(member_id->c_str());
 
     // Get the NPVariant corresponding to this member
-    PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(*member_identifier));
-
-    if (!browser_functions.hasproperty(instance, parent_ptr, *member_identifier))
-    {
-        printf("%s not found!\n", browser_functions.utf8fromidentifier(*member_identifier));
-    }
-    ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, *member_identifier, member_ptr);
+    PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(member_identifier));
+
+    if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
+    {
+        printf("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier));
+    }
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
 
     IcedTeaPluginUtilities::printNPVariant(*member_ptr);
@@ -865 +825 @@
     if (((AsyncCallThreadData*) data)->call_successful)
     {
-        IcedTeaPluginUtilities::JSIDToString(member_ptr, &member_ptr_str);
+        createJavaObjectFromVariant(instance, *member_ptr, &member_ptr_str);
         ((AsyncCallThreadData*) data)->result.append(member_ptr_str);
+
     }
     ((AsyncCallThreadData*) data)->result_ready = true;
@@ -884 +845 @@
     NPIdentifier script_identifier;
     NPString script = NPString();
-    NPVariant* eval_result = new NPVariant();
-    std::string eval_result_ptr_str = std::string();
+    NPVariant* eval_variant = new NPVariant();
+    std::string eval_variant_str = std::string();
 
     PLUGIN_DEBUG("_eval called\n");
@@ -899 +860 @@
     script.utf8length = script_str->size();
 
-    PLUGIN_DEBUG("Evaluating: %s\n", script.utf8characters);
+    PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
 #else
     script.UTF8Characters = script_str->c_str();
     script.UTF8Length = script_str->size();
 
-    PLUGIN_DEBUG("Evaluating: %s\n", script.UTF8Characters);
+    PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
 #endif
 
-    ((AsyncCallThreadData*) data)->call_successful = browser_functions.evaluate(instance, window_ptr, &script, eval_result);
-    IcedTeaPluginUtilities::printNPVariant(*eval_result);
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.evaluate(instance, window_ptr, &script, eval_variant);
+    IcedTeaPluginUtilities::printNPVariant(*eval_variant);
 
     if (((AsyncCallThreadData*) data)->call_successful)
     {
-        IcedTeaPluginUtilities::JSIDToString(eval_result, &eval_result_ptr_str);
-        ((AsyncCallThreadData*) data)->result.append(eval_result_ptr_str);
-    }
+        if (eval_variant)
+        {
+            createJavaObjectFromVariant(instance, *eval_variant, &eval_variant_str);
+        } else
+        {
+            eval_variant_str = "0";
+        }
+    } else
+    {
+        eval_variant_str = "0";
+    }
+
+    ((AsyncCallThreadData*) data)->result.append(eval_variant_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 
@@ -957 +928 @@
     if (((AsyncCallThreadData*) data)->call_successful)
     {
-        IcedTeaPluginUtilities::JSIDToString(call_result, &call_result_ptr_str);
-        ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
-    }
-
+
+        if (call_result)
+        {
+            createJavaObjectFromVariant(instance, *call_result, &call_result_ptr_str);
+        } else
+        {
+                call_result_ptr_str = "0";
+        }
+    } else
+    {
+        call_result_ptr_str = "0";
+    }
+
+    ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 
@@ -1031 +1012 @@
     ((AsyncCallThreadData*) data)->result_ready = true;
 
-    g_free(decoded_url);
+    free(decoded_url);
     decoded_url = NULL;
 

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.cc

@@ -151 +151 @@
 IcedTeaPluginUtilities::JSIDToString(void* id, std::string* result)
 {
-
-        char* id_str = (char*) malloc(sizeof(char)*20); // max = long long = 8446744073709551615 == 19 chars
+        char id_str[NUM_STR_BUFFER_SIZE];
 
         if (sizeof(void*) == sizeof(long long))
         {
-                sprintf(id_str, "%llu", id);
+                snprintf(id_str, NUM_STR_BUFFER_SIZE, "%llu", id);
         }
         else
         {
-                sprintf(id_str, "%lu", id); // else use long
+                snprintf(id_str, NUM_STR_BUFFER_SIZE, "%lu", id); // else use long
         }
 
@@ -166 +165 @@
 
         PLUGIN_DEBUG("Converting pointer %p to %s\n", id, id_str);
-        free(id_str);
 }
 
@@ -262 +260 @@
 IcedTeaPluginUtilities::itoa(int i, std::string* result)
 {
-        // largest possible integer is 10 digits long
-        char* int_str = (char*) malloc(sizeof(char)*11);
-        sprintf(int_str, "%d", i);
+        char int_str[NUM_STR_BUFFER_SIZE];
+        snprintf(int_str, NUM_STR_BUFFER_SIZE, "%d", i);
         result->append(int_str);
-
-        free(int_str);
 }
 
@@ -297 +292 @@
  * @param str The string to split
  * @param The delimiters to split on
- * @return A string vector containing the aplit components
+ * @return A string vector containing the split components
  */
 
@@ -307 +302 @@
         char* copy;
 
-        // Tokening is done on a copy
+        // Tokenization is done on a copy
         copy = (char*) malloc (sizeof(char)*strlen(str) + 1);
         strcpy(copy, str);
@@ -318 +313 @@
             // Allocation on heap since caller has no way to knowing how much will
             // be needed. Make sure caller cleans up!
-                std::string* s = new std::string();
-                s->append(tok_ptr);
-                v->push_back(s);
-                tok_ptr = strtok (NULL, " ");
+            std::string* s = new std::string();
+            s->append(tok_ptr);
+            v->push_back(s);
+            tok_ptr = strtok (NULL, delim);
         }
+        free(copy);
 
         return v;
@@ -376 +372 @@
         ostream << length;
 
-        // UTF-8 characters are 4-bytes max + space + '\0'
-        char* hex_value = (char*) malloc(sizeof(char)*10);
+        char hex_value[NUM_STR_BUFFER_SIZE];
 
         for (int i = 0; i < str->length(); i++)
         {
-                sprintf(hex_value, " %hx", str->at(i));
+                snprintf(hex_value, NUM_STR_BUFFER_SIZE," %hx", str->at(i));
                 ostream << hex_value;
         }
@@ -388 +383 @@
         *utf_str = ostream.str();
 
-        free(hex_value);
         PLUGIN_DEBUG("Converted %s to UTF-8 string %s\n", str->c_str(), utf_str->c_str());
 }
@@ -673 +667 @@
     else if (NPVARIANT_IS_STRING(variant))
     {
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-        PLUGIN_DEBUG("STRING: %s\n", NPVARIANT_TO_STRING(variant).utf8characters);
-#else
-        PLUGIN_DEBUG("STRING: %s\n", NPVARIANT_TO_STRING(variant).UTF8Characters);
-#endif
+        std::string str = IcedTeaPluginUtilities::NPVariantAsString(variant);
+        PLUGIN_DEBUG("STRING: %s (length=%d)\n", str.c_str(), str.size());
     }
     else
@@ -688 +679 @@
 IcedTeaPluginUtilities::NPVariantToString(NPVariant variant, std::string* result)
 {
-        char* str = (char*) malloc(sizeof(char)*32); // enough for everything except string
-
-    if (NPVARIANT_IS_VOID(variant))
-    {
-        sprintf(str, "%p", variant);
-    }
-    else if (NPVARIANT_IS_NULL(variant))
-    {
-        sprintf(str, "NULL");
-    }
-    else if (NPVARIANT_IS_BOOLEAN(variant))
-    {
-        if (NPVARIANT_TO_BOOLEAN(variant))
-                sprintf(str, "true");
-        else
-                sprintf(str, "false");
-    }
-    else if (NPVARIANT_IS_INT32(variant))
-    {
-        sprintf(str, "%d", NPVARIANT_TO_INT32(variant));
-    }
-    else if (NPVARIANT_IS_DOUBLE(variant))
-    {
-        sprintf(str, "%f", NPVARIANT_TO_DOUBLE(variant));;
-    }
-    else if (NPVARIANT_IS_STRING(variant))
-    {
-        free(str);
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-        str = (char*) malloc(sizeof(char)*NPVARIANT_TO_STRING(variant).utf8length);
-        sprintf(str, "%s", NPVARIANT_TO_STRING(variant).utf8characters);
-#else
-        str = (char*) malloc(sizeof(char)*NPVARIANT_TO_STRING(variant).UTF8Length);
-        sprintf(str, "%s", NPVARIANT_TO_STRING(variant).UTF8Characters);
-#endif
-    }
+  char conv_str[NUM_STR_BUFFER_SIZE]; // conversion buffer
+  bool was_string_already = false;
+
+  if (NPVARIANT_IS_STRING(variant))
+  {
+    result->append(IcedTeaPluginUtilities::NPVariantAsString(variant));
+    was_string_already = true;
+  }
+  else if (NPVARIANT_IS_VOID(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%p", variant);
+  }
+  else if (NPVARIANT_IS_NULL(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "NULL");
+  }
+  else if (NPVARIANT_IS_BOOLEAN(variant))
+  {
+    if (NPVARIANT_TO_BOOLEAN(variant))
+      snprintf(conv_str, NUM_STR_BUFFER_SIZE, "true");
     else
-    {
-        sprintf(str, "[Object %p]", variant);
-    }
-
-    result->append(str);
-    free(str);
+      snprintf(conv_str, NUM_STR_BUFFER_SIZE, "false");
+  }
+  else if (NPVARIANT_IS_INT32(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%d", NPVARIANT_TO_INT32(variant));
+  }
+  else if (NPVARIANT_IS_DOUBLE(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%f", NPVARIANT_TO_DOUBLE(variant));
+  }
+  else
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "[Object %p]", variant);
+  }
+
+  if (!was_string_already){
+    result->append(conv_str);
+  }
 }
 
@@ -869 +856 @@
     IcedTeaPluginUtilities::printNPVariant(constructor_str);
 
-    std::string constructor_name = std::string();
-
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-    constructor_name.append(NPVARIANT_TO_STRING(constructor_str).utf8characters);
-#else
-    constructor_name.append(NPVARIANT_TO_STRING(constructor_str).UTF8Characters);
-#endif
+    std::string constructor_name = IcedTeaPluginUtilities::NPVariantAsString(constructor_str);
 
     PLUGIN_DEBUG("Constructor for NPObject is %s\n", constructor_name.c_str());
@@ -918 +899 @@
 }
 
+/* Copies a variant data type into a C++ string */
+std::string
+IcedTeaPluginUtilities::NPVariantAsString(NPVariant variant)
+{
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+  return std::string(
+    NPVARIANT_TO_STRING(variant).utf8characters,
+    NPVARIANT_TO_STRING(variant).utf8length);
+#else
+  return std::string(
+    NPVARIANT_TO_STRING(variant).UTF8Characters,
+    NPVARIANT_TO_STRING(variant).UTF8Length);
+#endif
+}
 
 /**
@@ -1081 +1076 @@
                 PLUGIN_DEBUG("Error: Unable to initialize message queue mutex: %d\n", ret);
 
-        PLUGIN_DEBUG("Mutexs %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
+        PLUGIN_DEBUG("Mutexes %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
 }
 
@@ -1145 +1140 @@
 MessageBus::post(const char* message)
 {
-        char* msg = (char*) malloc(sizeof(char)*strlen(message) + 1);
         bool message_consumed = false;
-
-        // consumer frees this memory
-        strcpy(msg, message);
 
         PLUGIN_DEBUG("Trying to lock %p...\n", &msg_queue_mutex);
         pthread_mutex_lock(&subscriber_mutex);
 
-    PLUGIN_DEBUG("Message %s received on bus. Notifying subscribers.\n", msg);
+    PLUGIN_DEBUG("Message %s received on bus. Notifying subscribers.\n", message);
 
     std::list<BusSubscriber*>::const_iterator i;
     for( i = subscribers.begin(); i != subscribers.end() && !message_consumed; ++i ) {
-        PLUGIN_DEBUG("Notifying subscriber %p of %s\n", *i, msg);
-        message_consumed = ((BusSubscriber*) *i)->newMessageOnBus(msg);
+        PLUGIN_DEBUG("Notifying subscriber %p of %s\n", *i, message);
+        message_consumed = ((BusSubscriber*) *i)->newMessageOnBus(message);
     }
 
@@ -1165 +1156 @@
 
     if (!message_consumed)
-        PLUGIN_DEBUG("Warning: No consumer found for message %s\n", msg);
+        PLUGIN_DEBUG("Warning: No consumer found for message %s\n", message);
 
     PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex);

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.h

@@ -97 +97 @@
      (*c >= 'A' && *c <= 'F'))
 
+//long long max ~ 19 chars + terminator
+//leave some room for converting strings like "<var> = %d"
+const size_t NUM_STR_BUFFER_SIZE = 32;
+
 /*
  * This struct holds data specific to a Java operation requested by the plugin
@@ -206 +210 @@
         static void itoa(int i, std::string* result);
 
+        /* Copies a variant data type into a C++ string */
+        static std::string NPVariantAsString(NPVariant variant);
+
         /* Frees the given vector and the strings that its contents point to */
         static void freeStringPtrVector(std::vector<std::string*>* v);

trunk/icedtea-web/plugin/icedteanp/java/netscape/javascript/JSObject.java

@@ -131 +131 @@
             boolean mayProceed = false;
 
-            for (int i = 0; i < stack.length; i++) {
-                if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
-                        stack[i].getMethodName().equals("getWindow")) {
+            for (StackTraceElement element : stack) {
+                if (element.getClassName().equals("netscape.javascript.JSObject") &&
+                        element.getMethodName().equals("getWindow")) {
                     mayProceed = true;
                 }
@@ -210 +210 @@
 
         PluginDebug.debug("JSObject.call ", methodName);
-        for (int i = 0; i < args.length; i++)
-            PluginDebug.debug(" ", args[i]);
+        for (Object arg : args) {
+            PluginDebug.debug(" ", arg);
+        }
         PluginDebug.debug("");
         return PluginAppletViewer.call(internal, methodName, args);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java

@@ -1 @@
-/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
+/* AppletSecurityContextManager -- handles messages in an appropriate security
+ context
+
    Copyright (C) 2008  Red Hat
 

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java

@@ -51 +51 @@
         // FIXME: Is it even possible to distinguish between null and void
         // here?
-        if (args[3] != "null" && args[3] != "void")
+        if (!"null".equals(args[3]) && !"void".equals(args[3]))
             object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[3]));
         setDone(true);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/JavaConsole.java

@@ -66 +66 @@
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.ImageResources;
 
 /**
@@ -93 +94 @@
 
         consoleWindow = new JFrame("Java Console");
+        consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
 
         JPanel contentPanel = new JPanel();
@@ -307 +309 @@
         boolean toShowConsole = false;
 
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] == "--show-console") {
+        for (String arg : args) {
+            if ("--show-console".equals(arg)) {
                 toShowConsole = true;
             }

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java

@@ -244 +244 @@
         if (System.getSecurityManager() == null) {
             JNLPRuntime.initialize(/* isApplication */false);
-            JNLPRuntime.setDefaultLaunchHandler(new DefaultLaunchHandler());
+            JNLPRuntime.setDefaultLaunchHandler(new DefaultLaunchHandler(System.err));
         }
 
@@ -1296 +1296 @@
         Permissions grantedPermissions = new Permissions();
 
-        for (int i = 0; i < nsPrivilegeList.length; i++) {
-            String privilege = nsPrivilegeList[i];
-
+        for (String privilege : nsPrivilegeList) {
             if (privilege.equals("UniversalBrowserRead")) {
                 BrowserReadPermission bp = new BrowserReadPermission();

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java

@@ -123 +123 @@
 
     public AppletPanel createPanel(PluginStreamHandler streamhandler,
-                                    int identifier,
-                                    long handle, int x, int y,
-                                    final URL doc,
-                                    final Hashtable<String, String> atts) {
+                                   final int identifier,
+                                   final long handle, int x, int y,
+                                   final URL doc,
+                                   final Hashtable<String, String> atts) {
         final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() {
             public NetxPanel run() {
@@ -136 +136 @@
         });
 
-        // create the frame.
-        PluginAppletViewer.framePanel(identifier, handle, panel);
-
-        panel.init();
-
-        // Start the applet
-        initEventQueue(panel);
+        // Framing the panel needs to happen in a thread whose thread group
+        // is the same as the threadgroup of the applet thread. If this
+        // isn't the case, the awt eventqueue thread's context classloader
+        // won't be set to a JNLPClassLoader, and when an applet class needs
+        // to be loaded from the awt eventqueue, it won't be found.
+        Thread panelInit = new Thread(panel.getThreadGroup(), new Runnable() {
+            @Override public void run() {
+                panel.createNewAppContext();
+                // create the frame.
+                PluginAppletViewer.framePanel(identifier, handle, panel);
+                panel.init();
+                // Start the applet
+                initEventQueue(panel);
+            }
+        }, "NetXPanel initializer");
+
+        panelInit.start();
+        while(panelInit.isAlive()) {
+            try {
+                panelInit.join();
+            } catch (InterruptedException e) {
+            }
+        }
 
         // Wait for the panel to initialize
@@ -221 +237 @@
             String[] events = eventList.split(",");
 
-            for (int i = 0; i < events.length; i++) {
-                PluginDebug.debug("Adding event to queue: ", events[i]);
-                if (events[i].equals("dispose"))
+            for (String event : events) {
+                PluginDebug.debug("Adding event to queue: ", event);
+                if ("dispose".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_DISPOSE);
-                else if (events[i].equals("load"))
+                else if ("load".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_LOAD);
-                else if (events[i].equals("init"))
+                else if ("init".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_INIT);
-                else if (events[i].equals("start"))
+                else if ("start".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_START);
-                else if (events[i].equals("stop"))
+                else if ("stop".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_STOP);
-                else if (events[i].equals("destroy"))
+                else if ("destroy".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_DESTROY);
-                else if (events[i].equals("quit"))
+                else if ("quit".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_QUIT);
-                else if (events[i].equals("error"))
+                else if ("error".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_ERROR);
                 else
                     // non-fatal error if we get an unrecognized event
-                    PluginDebug.debug("Unrecognized event name: ", events[i]);
+                    PluginDebug.debug("Unrecognized event name: ", event);
             }
 
@@ -1609 +1625 @@
                 appletShutdown(p);
                 appletPanels.removeElement(p);
+                
+                // Mark classloader unusable
+                ((JNLPClassLoader) cl).decrementLoaderUseCount();
 
                 try {
@@ -1904 +1923 @@
                         String att = t.get("name");
 
-                        if (atts.containsKey(att))
-                            continue;
-
                         if (att == null) {
                             statusMsgStream.println(requiresNameWarning);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCallRequest.java

@@ -38 +38 @@
 package sun.applet;
 
-// FIXME: for each type of request extend a new (anonymous?)
-// PluginCallRequest.
 public abstract class PluginCallRequest {
     private String message;

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java

@@ -1 @@
-/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
+/* PluginCallRequestFactory -- contains factory methods for dispatching
+ an appropriate PluginCallRequest.
    Copyright (C) 2008  Red Hat
 
@@ -42 +43 @@
     public PluginCallRequest getPluginCallRequest(String id, String message, Long reference) {
 
-        if (id == "member") {
+        if ("member".equals(id)) {
             return new GetMemberPluginCallRequest(message, reference);
-        } else if (id == "void") {
+        } else if ("void".equals(id)) {
             return new VoidPluginCallRequest(message, reference);
-        } else if (id == "window") {
+        } else if ("window".equals(id)) {
             return new GetWindowPluginCallRequest(message, reference);
-        } else if (id == "proxyinfo") {
+        } else if ("proxyinfo".equals(id)) {
             return new PluginProxyInfoRequest(message, reference);
-        } else if (id == "cookieinfo") {
+        } else if ("cookieinfo".equals(id)) {
             return new PluginCookieInfoRequest(message, reference);
         } else {

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCookieManager.java

@@ -46 +46 @@
 import java.util.Map;
 
+import com.sun.jndi.toolkit.url.UrlUtil;
+
 public class PluginCookieManager extends CookieManager {
+    private PluginStreamHandler streamHandler;
+
+    public PluginCookieManager(PluginStreamHandler streamHandler) {
+        this.streamHandler = streamHandler;
+    }
+
+    @Override
     public Map<String, List<String>> get(URI uri,
             Map<String, List<String>> requestHeaders) throws IOException {
@@ -85 +94 @@
         return false;
     }
+
+    @Override
+    public void put(URI uri,
+            Map<String, List<String>> responseHeaders) throws IOException {
+        super.put(uri, responseHeaders);
+
+        for (Map.Entry<String, List<String>> headerEntry : responseHeaders.entrySet()) {
+            String type = headerEntry.getKey();
+            if ("Set-Cookie".equalsIgnoreCase(type) || "Set-Cookie2".equalsIgnoreCase(type)) {
+                List<String> cookies = headerEntry.getValue();
+                for (String cookie : cookies) {
+                    streamHandler.write("plugin PluginSetCookie reference -1 " + UrlUtil.encode(uri.toString(), "UTF-8") + " " + cookie);
+                }
+            }
+
+        }
+    }
 }

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginException.java

@@ -1 @@
-/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
+/* PluginException -- represents an exception in handling a plugin message
    Copyright (C) 2008  Red Hat
 

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginMain.java

@@ -115 +115 @@
             // Streams set. Start processing.
             streamHandler.startProcessing();
+
+            setCookieHandler(streamHandler);
+
         } catch (Exception e) {
             e.printStackTrace();
@@ -185 +188 @@
         // override the proxy selector set by JNLPRuntime
         ProxySelector.setDefault(new PluginProxySelector());
+    }
 
-        CookieManager ckManager = new PluginCookieManager();
+    private static void setCookieHandler(PluginStreamHandler streamHandler) {
+        CookieManager ckManager = new PluginCookieManager(streamHandler);
         CookieHandler.setDefault(ckManager);
     }

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java

@@ -1 @@
-/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
+/* PluginMessageHandlerWorker -- worker thread for handling messages
    Copyright (C) 2008  Red Hat
 

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java

@@ -60 +60 @@
 
     private PluginMessageConsumer consumer;
-    private Boolean shuttingDown = false;
+    private volatile boolean shuttingDown = false;
 
 
@@ -323 +323 @@
 
             if (message == null || message.equals("shutdown")) {
-                synchronized (shuttingDown) {
-                    shuttingDown = true;
-                }
+                shuttingDown = true;
                 try {
                     // Close input/output channels to plugin.
@@ -363 +361 @@
                 // if we are shutting down, ignore write failures as 
                 // pipe may have closed
-                synchronized (shuttingDown) {
-                    if (!shuttingDown) {
-                        e.printStackTrace();
-                    }
+                if (!shuttingDown) {
+                    e.printStackTrace();
                 }