[PATCH 2/3] Use free() rather than g_free() for calloc()ed memory

Adam Domurad adomurad at redhat.com
Mon Jul 9 10:57:34 PDT 2012


On Mon, 2012-07-09 at 19:12 +0200, Martin Olsson wrote:
> ---
>  plugin/icedteanp/IcedTeaNPPlugin.cc               |    4 ++--
>  plugin/icedteanp/IcedTeaPluginRequestProcessor.cc |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlugin.cc
> index 810e383..eb6d4ec 100644
> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc
> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc
> @@ -1272,7 +1272,7 @@ void consume_message(gchar* message) {
>          PLUGIN_DEBUG("Proxy info: %s\n", proxy_info);
>          plugin_send_message_to_appletviewer(proxy_info);
>  
> -        g_free(decoded_url);
> +        free(decoded_url);
>          decoded_url = NULL;
>          g_free(proxy_info);
>          proxy_info = NULL;
> @@ -1298,7 +1298,7 @@ void consume_message(gchar* message) {
>          PLUGIN_DEBUG("Cookie info: %s\n", cookie_info);
>          plugin_send_message_to_appletviewer(cookie_info);
>  
> -        g_free(decoded_url);
> +        free(decoded_url);
>          decoded_url = NULL;
>          g_free(cookie_info);
>          cookie_info = NULL;
> diff --git a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
> index 9ee6e4b..ef23186 100644
> --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
> +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
> @@ -994,7 +994,7 @@ _loadURL(void* data) {
>  
>      ((AsyncCallThreadData*) data)->result_ready = true;
>  
> -    g_free(decoded_url);
> +    free(decoded_url);
>      decoded_url = NULL;
>  
>      PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful);


All three patches look good, thanks for the contributions Martin!
I'll whip up a ChangeLog and push these for you.

Thanks,
Adam




More information about the distro-pkg-dev mailing list