Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for leaking all kinds of ns4xStreamListener's bug 83183 r=av sr=attinasi a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@97119 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2001-06-14 02:24:11 +00:00
parent b5c2abff1b
commit b1c3885a47
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -913,6 +913,7 @@ private:
PRUint32 mModified;
nsIPluginInstance * mPluginInstance;
nsPluginStreamListenerPeer * mPluginStreamListenerPeer;
PRBool mDidAddRef;
};
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1000,6 +1001,7 @@ nsPluginStreamInfo::nsPluginStreamInfo()
mSeekable = PR_FALSE;
mLength = 0;
mModified = 0;
mDidAddRef = PR_FALSE;
}
nsPluginStreamInfo::~nsPluginStreamInfo()
@@ -1180,6 +1182,13 @@ nsPluginStreamInfo::RequestRead(nsByteRange* rangeList)
rv = container->SetData(MAGIC_REQUEST_CONTEXT);
if (NS_FAILED(rv)) return rv;
// this is a hack to keep Byte Range streams open (see bug 83183)
// XXX need to figure out where to release, I suggest in Stop() but the ownership is the other way
if (!mDidAddRef)
{
mDidAddRef=PR_TRUE;
NS_ADDREF(mPluginStreamListenerPeer);
}
return channel->AsyncOpen(converter, container);
}
@@ -1741,7 +1750,6 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus)
{
nsresult rv = NS_OK;
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(request);
nsCOMPtr<nsIFile> localFile;
@@ -1899,11 +1907,6 @@ nsresult nsPluginStreamListenerPeer::SetUpStreamListener(nsIRequest *request,
{
if (0 == PL_strcmp(range.get(), "bytes"))
bSeekable = PR_TRUE;
/* XXX FIX-ME (see Bug 83183)
This is a hack to keep byte range request streams open but it casues a leak.
A good place to release would probablybe when the instance is stopped.
*/
NS_ADDREF(this);
}
}

15
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -913,6 +913,7 @@ private:
PRUint32 mModified;
nsIPluginInstance * mPluginInstance;
nsPluginStreamListenerPeer * mPluginStreamListenerPeer;
PRBool mDidAddRef;
};
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1000,6 +1001,7 @@ nsPluginStreamInfo::nsPluginStreamInfo()
mSeekable = PR_FALSE;
mLength = 0;
mModified = 0;
mDidAddRef = PR_FALSE;
}
nsPluginStreamInfo::~nsPluginStreamInfo()
@@ -1180,6 +1182,13 @@ nsPluginStreamInfo::RequestRead(nsByteRange* rangeList)
rv = container->SetData(MAGIC_REQUEST_CONTEXT);
if (NS_FAILED(rv)) return rv;
// this is a hack to keep Byte Range streams open (see bug 83183)
// XXX need to figure out where to release, I suggest in Stop() but the ownership is the other way
if (!mDidAddRef)
{
mDidAddRef=PR_TRUE;
NS_ADDREF(mPluginStreamListenerPeer);
}
return channel->AsyncOpen(converter, container);
}
@@ -1741,7 +1750,6 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus)
{
nsresult rv = NS_OK;
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(request);
nsCOMPtr<nsIFile> localFile;
@@ -1899,11 +1907,6 @@ nsresult nsPluginStreamListenerPeer::SetUpStreamListener(nsIRequest *request,
{
if (0 == PL_strcmp(range.get(), "bytes"))
bSeekable = PR_TRUE;
/* XXX FIX-ME (see Bug 83183)
This is a hack to keep byte range request streams open but it casues a leak.
A good place to release would probablybe when the instance is stopped.
*/
NS_ADDREF(this);
}
}