Fix for bugs:
34351 ( nsbeta2+ ) - Made webshell service available to observer base through parser bundle. 37503,36852 ( nsbeta2+ ) - Fixed crash in Observer base... ( caused by a wrong assumtion for document key ). The key now is always nsISupports*. 24474 - Fixed content leakage in my.netscape.com caused by a script entity in LAYER. 31890 - Mlk fix ( patch provided by Patrick ) ( r=me ) r= nisheeth
This commit is contained in:
@@ -1357,7 +1357,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a
|
||||
}
|
||||
else {
|
||||
//If you're here, handle an unquoted key.
|
||||
static nsString theTerminals = NS_ConvertToString("\b\t\n\r \"<=>",9);
|
||||
static nsString theTerminals = NS_ConvertToString("\b\t\n\r \"=>",8);
|
||||
result=aScanner.ReadUntil(mTextKey,theTerminals,PR_FALSE);
|
||||
}
|
||||
|
||||
@@ -1391,6 +1391,18 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a
|
||||
mHasEqualWithoutValue=PR_TRUE;
|
||||
result=aScanner.PutBack(aChar);
|
||||
}
|
||||
else if(kAmpersand==aChar) {
|
||||
// XXX - Discard script entity for now....except in
|
||||
// view-source
|
||||
PRBool discard=!aRetainWhitespace;
|
||||
mTextValue.Append(aChar);
|
||||
result=aScanner.GetChar(aChar);
|
||||
if(NS_OK==result) {
|
||||
mTextValue.Append(aChar);
|
||||
result=CEntityToken::ConsumeEntity(aChar,mTextValue,aScanner);
|
||||
}
|
||||
if(discard) mTextValue.Truncate();
|
||||
}
|
||||
else {
|
||||
mTextValue.Append(aChar); //it's an alphanum attribute...
|
||||
result=ConsumeAttributeValueText(aChar,mTextValue,aScanner);
|
||||
|
||||
Reference in New Issue
Block a user