diff options
| author | Deepak Bhole <dbhole@redhat.com> | 2010-10-27 15:55:55 -0700 |
|---|---|---|
| committer | Deepak Bhole <dbhole@redhat.com> | 2010-10-27 15:55:55 -0700 |
| commit | 8a0acd6ea99c258b491ddf6a02a5e536c846c355 (patch) | |
| tree | 63614b3a5864d1df376e4d3c12527fbea1875e94 | |
| parent | 113056bc664b2a0ee61073de74a75f19539c67ab (diff) | |
Add support for handling spaces between jar names in the archive tag, and other
such issues by encoding the entire applet tag.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugin/icedteanp/IcedTeaNPPlugin.cc | 77 |
2 files changed, 45 insertions, 37 deletions
@@ -1,3 +1,8 @@ +2010-10-27 Deepak Bhole <dbhole@redhat.com> + + * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_create_applet_tag): Escape + the entire applet tag, not just the params. + 2010-10-27 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java diff --git a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlugin.cc index ac40103..a680d23 100644 --- a/plugin/icedteanp/IcedTeaNPPlugin.cc +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc @@ -755,6 +755,7 @@ ITNP_SetWindow (NPP instance, NPWindow* window) } else { + // Else this is initialization PLUGIN_DEBUG ("ITNP_SetWindow: setting window.\n"); @@ -1693,57 +1694,59 @@ plugin_create_applet_tag (int16_t argc, char* argn[], char* argv[]) } else { - // Escape the parameter value so that line termination - // characters will pass through the pipe. + if (argv[i] != '\0') { - // worst case scenario -> all characters are newlines or - // returns, each of which translates to 5 substitutions - char* escaped = (char*) calloc(((strlen(argv[i])*5)+1), sizeof(char)); - - strcpy(escaped, ""); - for (int j=0; j < strlen(argv[i]); j++) - { - if (argv[i][j] == '\r') - strcat(escaped, " "); - else if (argv[i][j] == '\n') - strcat(escaped, " "); - else if (argv[i][j] == '>') - strcat(escaped, ">"); - else if (argv[i][j] == '<') - strcat(escaped, "<"); - else if (argv[i][j] == '&') - strcat(escaped, "&"); - else - { - char* orig_char = (char*) calloc(2, sizeof(char)); - orig_char[0] = argv[i][j]; - orig_char[1] = '\0'; - - strcat(escaped, orig_char); - - free(orig_char); - orig_char = NULL; - } - } - parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i], - "\" VALUE=\"", escaped, "\">", NULL); - - free (escaped); - escaped = NULL; + "\" VALUE=\"", argv[i], "\">", NULL); } } } applet_tag = g_strconcat (applet_tag, ">", parameters, "</EMBED>", NULL); + // Escape the parameter value so that line termination + // characters will pass through the pipe. + + // worst case scenario -> all characters are newlines or + // returns, each of which translates to 5 substitutions + char* applet_tag_escaped = (char*) calloc(((strlen(applet_tag)*5)+1), sizeof(char)); + + strcpy(applet_tag_escaped, ""); + for (int i=0; i < strlen(applet_tag); i++) + { + if (applet_tag[i] == '\r') + strcat(applet_tag_escaped, " "); + else if (applet_tag[i] == '\n') + strcat(applet_tag_escaped, " "); + else if (applet_tag[i] == '>') + strcat(applet_tag_escaped, ">"); + else if (applet_tag[i] == '<') + strcat(applet_tag_escaped, "<"); + else if (applet_tag[i] == '&') + strcat(applet_tag_escaped, "&"); + else + { + char* orig_char = (char*) calloc(2, sizeof(char)); + orig_char[0] = applet_tag[i]; + orig_char[1] = '\0'; + + strcat(applet_tag_escaped, orig_char); + + free(orig_char); + orig_char = NULL; + } + } + + free (applet_tag); + applet_tag = NULL; + g_free (parameters); parameters = NULL; PLUGIN_DEBUG ("plugin_create_applet_tag return\n"); - return applet_tag; + return applet_tag_escaped; } // plugin_send_message_to_appletviewer must be called while holding |