Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 12:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make plugin streaming safer and fix crash in bug 77319 r=av sr=attinasi

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2001-04-28 02:24:29 +00:00
parent 93f995ca81
commit 87a2130326
2 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/plugin/base/src/ns4xPluginInstance.cpp
View File

@ -175,7 +175,7 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
nsIInputStream* input,
PRUint32 length)
{
if (!mInst)
if (!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
const NPPluginFuncs *callbacks = nsnull;
@ -216,18 +216,11 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
{
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_RETURN(numtowrite, CallNPP_WriteReadyProc(callbacks->writeready,
NS_TRY_SAFE_CALL_RETURN(numtowrite, CallNPP_WriteReadyProc(callbacks->writeready,
npp,
&mNPStream), lib);
}
// if WriteReady returned 0, the plugin is not ready to handle
// the data, return FAILURE for now
@ -278,7 +271,7 @@ NS_IMETHODIMP
ns4xPluginStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo,
const char* fileName)
{
if(!mInst)
if(!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
NPP npp;
@ -296,20 +289,12 @@ ns4xPluginStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo,
return NS_OK;
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_VOID(CallNPP_StreamAsFileProc(callbacks->asfile,
NS_TRY_SAFE_CALL_VOID(CallNPP_StreamAsFileProc(callbacks->asfile,
npp,
&mNPStream,
fileName), lib);
}
return NS_OK;
}
@ -318,7 +303,7 @@ NS_IMETHODIMP
ns4xPluginStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo,
nsresult status)
{
if(!mInst)
if(!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
NPP npp;
@ -339,20 +324,12 @@ ns4xPluginStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo,
{
// XXX need to convert status to NPReason
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_RETURN(error, CallNPP_DestroyStreamProc(callbacks->destroystream,
NS_TRY_SAFE_CALL_RETURN(error, CallNPP_DestroyStreamProc(callbacks->destroystream,
npp,
&mNPStream,
NPRES_DONE), lib);
}
if(error != NPERR_NO_ERROR)
return NS_ERROR_FAILURE;
}

41
modules/plugin/nglsrc/ns4xPluginInstance.cpp
View File

@ -175,7 +175,7 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
nsIInputStream* input,
PRUint32 length)
{
if (!mInst)
if (!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
const NPPluginFuncs *callbacks = nsnull;
@ -216,18 +216,11 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
{
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_RETURN(numtowrite, CallNPP_WriteReadyProc(callbacks->writeready,
NS_TRY_SAFE_CALL_RETURN(numtowrite, CallNPP_WriteReadyProc(callbacks->writeready,
npp,
&mNPStream), lib);
}
// if WriteReady returned 0, the plugin is not ready to handle
// the data, return FAILURE for now
@ -278,7 +271,7 @@ NS_IMETHODIMP
ns4xPluginStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo,
const char* fileName)
{
if(!mInst)
if(!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
NPP npp;
@ -296,20 +289,12 @@ ns4xPluginStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo,
return NS_OK;
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_VOID(CallNPP_StreamAsFileProc(callbacks->asfile,
NS_TRY_SAFE_CALL_VOID(CallNPP_StreamAsFileProc(callbacks->asfile,
npp,
&mNPStream,
fileName), lib);
}
return NS_OK;
}
@ -318,7 +303,7 @@ NS_IMETHODIMP
ns4xPluginStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo,
nsresult status)
{
if(!mInst)
if(!mInst || !mInst->IsStarted())
return NS_ERROR_FAILURE;
NPP npp;
@ -339,20 +324,12 @@ ns4xPluginStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo,
{
// XXX need to convert status to NPReason
PRLibrary* lib = nsnull;
PRBool started = PR_FALSE;
if(mInst)
{
lib = mInst->fLibrary;
started = mInst->IsStarted();
}
lib = mInst->fLibrary;
if (started)
{
NS_TRY_SAFE_CALL_RETURN(error, CallNPP_DestroyStreamProc(callbacks->destroystream,
NS_TRY_SAFE_CALL_RETURN(error, CallNPP_DestroyStreamProc(callbacks->destroystream,
npp,
&mNPStream,
NPRES_DONE), lib);
}
if(error != NPERR_NO_ERROR)
return NS_ERROR_FAILURE;
}