Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 598289 - Fix bad parsing of CF_HTML values. r=roc

Browse Source
This commit is contained in:
Brian R. Bondy 2011-09-21 13:22:53 -04:00
parent 23454abb0e
commit 779e524615
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
widget/src/windows/nsClipboard.cpp
View File

@ -693,23 +693,47 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
PRBool PRBool
nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen ) nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen )
{ {
PRBool dataFound = PR_FALSE; // Reference: MSDN doc entitled "HTML Clipboard Format"
// http://msdn.microsoft.com/en-us/library/aa767917(VS.85).aspx#unknown_854
// CF_HTML is UTF8, not unicode. We also can't rely on it being null-terminated
// so we have to check the CF_HTML header for the correct length.
// The length we return is the bytecount from the beginning of the selected data to the end
// of the selected data, without the null termination. Because it's UTF8, we're guaranteed
// the header is ASCII.
if ( outData && *outData ) { if (!outData || !*outData) {
// CF_HTML is UTF8, not unicode. We also can't rely on it being null-terminated return PR_FALSE;
// so we have to check the CF_HTML header for the correct length. The length we return
// is the bytecount from the beginning of the data to the end, without
// the null termination. Because it's UTF8, we're guaranteed the header is ascii (yay!).
float vers = 0.0;
PRUint32 startOfData = 0;
sscanf((char*)*outData, "Version:%f\nStartHTML:%u\nEndHTML:%u", &vers, &startOfData, outDataLen);
NS_ASSERTION(startOfData && *outDataLen, "Couldn't parse CF_HTML description header");
if ( *outDataLen )
dataFound = PR_TRUE;
} }
return dataFound; float vers = 0.0;
PRInt32 startOfData = 0;
PRInt32 endOfData = 0;
int numFound = sscanf((char*)*outData, "Version:%f\nStartHTML:%d\nEndHTML:%d",
&vers, &startOfData, &endOfData);
if (numFound != 3 || startOfData < -1 || endOfData < -1) {
return PR_FALSE;
}
// Fixup the start and end markers if they have no context (set to -1)
if (startOfData == -1) {
startOfData = 0;
}
if (endOfData == -1) {
endOfData = *outDataLen;
}
// Make sure we were passed sane values within our buffer size.
if (!endOfData || startOfData >= endOfData ||
endOfData > *outDataLen) {
return PR_FALSE;
}
// We want to return the buffer not offset by startOfData because it will be
// parsed out later (probably by nsHTMLEditor::ParseCFHTML) when it is still
// in CF_HTML format.
*outDataLen = endOfData;
return PR_TRUE;
} }