Attachment 636984 Details for Bug 869040 – Final patch from Deepak Bhole

[patch] Final patch from Deepak Bhole

MOZ756792.patch (text/plain), 1.64 KB, created by Tomas Hoger on 2012-11-02 08:45:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2012-11-02 08:45:54 UTC

Size: 1.64 KB

patch

obsolete

>diff -r 2c3a063c1aff plugin/icedteanp/IcedTeaScriptablePluginObject.cc
>--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Fri Oct 26 12:15:18 2012 +0200
>+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Fri Oct 26 15:28:31 2012 -0400
>@@ -591,10 +591,7 @@
> 
>     if (java_result->error_occurred)
>     {
>-        // error message must be allocated on heap
>-        char* error_msg = (char*) malloc(java_result->error_msg->length()*sizeof(char));
>-        strcpy(error_msg, java_result->error_msg->c_str());
>-        browser_functions.setexception(npobj, error_msg);
>+        browser_functions.setexception(npobj, java_result->error_msg->c_str());
>         return false;
>     }
> 
>@@ -853,11 +850,7 @@
>         createJavaObjectFromVariant(instance, args[i], &id);
>         if (id == "0")
>         {
>-            // error message must be allocated on heap
>-            char* error_msg = (char*) malloc(1024*sizeof(char));
>-            strcpy(error_msg, "Unable to create argument on Java side");
>-
>-            browser_functions.setexception(npobj, error_msg);
>+            browser_functions.setexception(npobj, "Unable to create argument on Java side");
>             return false;
>         }
> 
>@@ -871,12 +864,7 @@
> 
>     if (java_result->error_occurred)
>     {
>-        // error message must be allocated on heap
>-        int length = java_result->error_msg->length();
>-        char* error_msg = (char*) malloc((length+1)*sizeof(char));
>-        strcpy(error_msg, java_result->error_msg->c_str());
>-
>-        browser_functions.setexception(npobj, error_msg);
>+        browser_functions.setexception(npobj, java_result->error_msg->c_str());
>         return false;
>     }
>

Actions: View | Diff

Attachments on bug 869040: 631741 | 635041 | 636971 | 636984