Bad signed conversion in plugin streaming code bug 100888 r=av sr=attinasi
git-svn-id: svn://10.0.0.236/branches/MOZILLA_0_9_4_BRANCH@103805 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -273,8 +273,8 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
|
||||
if(!callbacks)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
PRUint32 numtowrite = 0;
|
||||
PRUint32 amountRead = 0;
|
||||
PRInt32 numtowrite = 0;
|
||||
PRInt32 amountRead = 0;
|
||||
PRInt32 writeCount = 0;
|
||||
PRUint32 leftToRead = 0; // just in case OnDataaAvail tries to overflow our buffer
|
||||
PRBool createdHere = PR_FALSE; // we did malloc in locally, so we must free locally
|
||||
@@ -300,7 +300,7 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
|
||||
leftToRead = length - MAX_PLUGIN_NECKO_BUFFER; // break it up
|
||||
length = MAX_PLUGIN_NECKO_BUFFER;
|
||||
}
|
||||
nsresult rv = input->Read(mStreamBuffer, length, &amountRead);
|
||||
nsresult rv = input->Read(mStreamBuffer, length, (PRUint32*)&amountRead);
|
||||
if (NS_FAILED(rv))
|
||||
goto error;
|
||||
|
||||
@@ -406,8 +406,8 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
|
||||
if(!callbacks)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
PRUint32 numtowrite = 0;
|
||||
PRUint32 amountRead = 0;
|
||||
PRInt32 numtowrite = 0;
|
||||
PRInt32 amountRead = 0;
|
||||
PRInt32 writeCount = 0;
|
||||
PRUint32 leftToRead = 0; // just in case OnDataaAvail tries to overflow our buffer
|
||||
PRBool createdHere = PR_FALSE; // we did malloc in locally, so we must free locally
|
||||
@@ -441,7 +441,7 @@ ns4xPluginStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo,
|
||||
leftToRead = length - MAX_PLUGIN_NECKO_BUFFER; // break it up
|
||||
length = MAX_PLUGIN_NECKO_BUFFER;
|
||||
}
|
||||
nsresult rv = input->Read(mStreamBuffer, length, &amountRead);
|
||||
nsresult rv = input->Read(mStreamBuffer, length, (PRUint32*)&amountRead);
|
||||
if (NS_FAILED(rv))
|
||||
goto error;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user