wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 942802 - Make nsDocShell::SetForcedCharset check its argument. r=smaug.

Browse Source
This commit is contained in:
Henri Sivonen 2013-11-26 14:49:42 +02:00
parent d1410db013
commit 8bd0e92016
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docshell/base/nsDocShell.cpp
View File

@ -186,6 +186,7 @@
#include "nsIURILoader.h"
#include "nsIWebBrowserFind.h"
#include "nsIWidget.h"
#include "mozilla/dom/EncodingUtils.h"
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
@ -1968,14 +1969,25 @@ NS_IMETHODIMP
nsDocShell::SetCharset(const nsACString& aCharset)
{
// set the charset override
SetForcedCharset(aCharset);
return NS_OK;
return SetForcedCharset(aCharset);
}
NS_IMETHODIMP nsDocShell::SetForcedCharset(const nsACString& aCharset)
{
mForcedCharset = aCharset;
if (aCharset.IsEmpty()) {
mForcedCharset.Truncate();
return NS_OK;
}
nsAutoCString encoding;
if (!EncodingUtils::FindEncodingForLabel(aCharset, encoding)) {
// Reject unknown labels
return NS_ERROR_INVALID_ARG;
}
if (!EncodingUtils::IsAsciiCompatible(encoding)) {
// Reject XSS hazards
return NS_ERROR_INVALID_ARG;
}
mForcedCharset = encoding;
return NS_OK;
}