Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 35076. r=vidur. escape the URL if it contains non ASCII character. Escape from the position

Browse Source 
which the first non ASCII char appear.
This commit is contained in:
ftang%netscape.com 2000-06-27 21:27:30 +00:00
parent d2f7467c68
commit b8d44ad36a
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/src/base/nsGlobalWindow.cpp
View File

@ -2706,9 +2706,31 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext* cx, jsval* argv,
JSString *mJSStrURL = JS_ValueToString(cx, argv[0]);
NS_ENSURE_TRUE(mJSStrURL, NS_ERROR_FAILURE);
nsAutoString mURL;
mURL.Assign(NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars(mJSStrURL)));
nsAutoString unescapedURL;
unescapedURL.Assign(NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars(mJSStrURL)));
// fix bug 35076
// if the URL contains non ASCII, then escape from the first non ASCII char
nsAutoString mURL;
if(unescapedURL.IsASCII()) {
mURL = unescapedURL;
} else {
const PRUnichar* pt = unescapedURL.GetUnicode();
PRUint32 len=unescapedURL.Length();
PRUint32 i;
for(i=0;i<len;i++)
{
if(0!=(0xFF80 & (*pt++)))
break;
}
nsAutoString right,right2;
unescapedURL.Left(mURL, i);
unescapedURL.Right(right, len-i);
if(NS_SUCCEEDED(Escape(right, right2)))
mURL.Append(right2);
else
mURL = unescapedURL;
}
if(!mURL.IsEmpty())
{
nsAutoString mAbsURL;