From ef702b82436a09280b158d51594ed26f295c466e Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Tue, 20 Feb 2001 13:46:59 +0000 Subject: [PATCH] Make ImageListener not confuse leak logging by doing refcounting the way we do it everywhere else. r=disttsc@bart.nl sr=brendan@mozilla.org b=64452 git-svn-id: svn://10.0.0.236/trunk@87447 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsImageDocument.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 4e4a62c4d67..25273539b74 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -107,9 +107,9 @@ public: ImageListener::ImageListener(nsImageDocument* aDoc) { + NS_INIT_ISUPPORTS(); mDocument = aDoc; NS_ADDREF(aDoc); - mRefCnt = 1; } ImageListener::~ImageListener() @@ -118,7 +118,7 @@ ImageListener::~ImageListener() NS_IF_RELEASE(mNextStream); } -NS_IMPL_THREADSAFE_ISUPPORTS(ImageListener, NS_GET_IID(nsIStreamListener)) +NS_IMPL_THREADSAFE_ISUPPORTS1(ImageListener, nsIStreamListener) NS_IMETHODIMP ImageListener::OnStartRequest(nsIChannel* channel, nsISupports *ctxt) @@ -190,6 +190,8 @@ nsImageDocument::StartDocumentLoad(const char* aCommand, nsIStreamListener **aDocListener, PRBool aReset) { + NS_ASSERTION(aDocListener, "null aDocListener"); + nsresult rv = Init(); if (NS_FAILED(rv) && rv != NS_ERROR_ALREADY_INITIALIZED) { @@ -209,6 +211,10 @@ nsImageDocument::StartDocumentLoad(const char* aCommand, } *aDocListener = new ImageListener(this); + if (!*aDocListener) + return NS_ERROR_OUT_OF_MEMORY; + + NS_ADDREF(*aDocListener); return NS_OK; }