From e6c9332b26cdb5b93e362e78692c16a2bc6ef5ff Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Tue, 21 Jul 1998 21:17:58 +0000 Subject: [PATCH] plug leak, ensure viewstream initialization in IL_ViewStream. a:pnunn git-svn-id: svn://10.0.0.236/trunk@6105 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libimg/src/external.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mozilla/modules/libimg/src/external.c b/mozilla/modules/libimg/src/external.c index 1d2526567ba..7a3e10e9a2a 100644 --- a/mozilla/modules/libimg/src/external.c +++ b/mozilla/modules/libimg/src/external.c @@ -113,9 +113,10 @@ NET_StreamClass * IL_ViewStream(FO_Present_Types format_out, void *newshack, URL_Struct *urls, OPAQUE_CONTEXT *cx) { - IL_Stream *stream = nil, *viewstream; - il_container *ic = nil; - char *org_content_type; + IL_Stream *stream = nil, + *viewstream = nil; + il_container *ic = nil; + char *org_content_type; char *image_url; /* multi-part reconnect hack */ @@ -188,13 +189,13 @@ IL_ViewStream(FO_Present_Types format_out, void *newshack, URL_Struct *urls, image_url = (char*) XP_ALLOC(XP_STRLEN(urls->address) + 29); if (!image_url) { XP_FREE(stream); - XP_FREE(viewstream); + XP_FREEIF(viewstream); return NULL; } XP_SPRINTF(image_url, "internal-external-reconnect:%s", urls->address); if (!il_load_image(cx, image_url, urls->force_reload)) { XP_FREE(stream); - XP_FREE(viewstream); + XP_FREEIF(viewstream); return NULL; } XP_FREE(image_url); @@ -219,6 +220,7 @@ IL_ViewStream(FO_Present_Types format_out, void *newshack, URL_Struct *urls, urls->content_type = org_content_type; } /* !newshack */ + XP_FREEIF(viewstream); return stream; }