зеркало из https://github.com/mozilla/gecko-dev.git
Родитель
deb2436f79
Коммит
edda37e990
|
@ -75,10 +75,12 @@ nsresult nsMailtoUrl::ParseMailtoUrl(char * searchPart)
|
||||||
|
|
||||||
switch (nsCRT::ToUpper(*token))
|
switch (nsCRT::ToUpper(*token))
|
||||||
{
|
{
|
||||||
|
/* DO NOT support attachment= in mailto urls. This poses a security fire hole!!!
|
||||||
case 'A':
|
case 'A':
|
||||||
if (!nsCRT::strcasecmp (token, "attachment"))
|
if (!nsCRT::strcasecmp (token, "attachment"))
|
||||||
m_attachmentPart = value;
|
m_attachmentPart = value;
|
||||||
break;
|
break;
|
||||||
|
*/
|
||||||
case 'B':
|
case 'B':
|
||||||
if (!nsCRT::strcasecmp (token, "bcc"))
|
if (!nsCRT::strcasecmp (token, "bcc"))
|
||||||
{
|
{
|
||||||
|
@ -161,6 +163,8 @@ nsresult nsMailtoUrl::ParseMailtoUrl(char * searchPart)
|
||||||
m_toPart = value;
|
m_toPart = value;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
} // end of switch statement...
|
} // end of switch statement...
|
||||||
|
|
||||||
if (eq)
|
if (eq)
|
||||||
|
@ -180,8 +184,6 @@ nsresult nsMailtoUrl::ParseMailtoUrl(char * searchPart)
|
||||||
nsUnescape(NS_CONST_CAST(char*, m_newsgroupPart.get()));
|
nsUnescape(NS_CONST_CAST(char*, m_newsgroupPart.get()));
|
||||||
if (!m_referencePart.IsEmpty())
|
if (!m_referencePart.IsEmpty())
|
||||||
nsUnescape(NS_CONST_CAST(char*, m_referencePart.get()));
|
nsUnescape(NS_CONST_CAST(char*, m_referencePart.get()));
|
||||||
if (!m_attachmentPart.IsEmpty())
|
|
||||||
nsUnescape(NS_CONST_CAST(char*, m_attachmentPart.get()));
|
|
||||||
if (!m_bodyPart.IsEmpty())
|
if (!m_bodyPart.IsEmpty())
|
||||||
nsUnescape(NS_CONST_CAST(char*, m_bodyPart.get()));
|
nsUnescape(NS_CONST_CAST(char*, m_bodyPart.get()));
|
||||||
if (!m_newsHostPart.IsEmpty())
|
if (!m_newsHostPart.IsEmpty())
|
||||||
|
@ -204,7 +206,6 @@ nsresult nsMailtoUrl::CleanupMailtoState()
|
||||||
m_newsgroupPart = "";
|
m_newsgroupPart = "";
|
||||||
m_newsHostPart = "";
|
m_newsHostPart = "";
|
||||||
m_referencePart = "";
|
m_referencePart = "";
|
||||||
m_attachmentPart = "";
|
|
||||||
m_bodyPart = "";
|
m_bodyPart = "";
|
||||||
m_bccPart = "";
|
m_bccPart = "";
|
||||||
m_followUpToPart = "";
|
m_followUpToPart = "";
|
||||||
|
@ -277,7 +278,7 @@ NS_IMETHODIMP nsMailtoUrl::GetMessageContents(char ** aToPart, char ** aCcPart,
|
||||||
if (aReferencePart)
|
if (aReferencePart)
|
||||||
*aReferencePart = m_referencePart.ToNewCString();
|
*aReferencePart = m_referencePart.ToNewCString();
|
||||||
if (aAttachmentPart)
|
if (aAttachmentPart)
|
||||||
*aAttachmentPart = m_attachmentPart.ToNewCString();
|
*aAttachmentPart = nsnull; // never pass out an attachment part as part of a mailto url
|
||||||
if (aPriorityPart)
|
if (aPriorityPart)
|
||||||
*aPriorityPart = m_priorityPart.ToNewCString();
|
*aPriorityPart = m_priorityPart.ToNewCString();
|
||||||
if (aNewsgroupPart)
|
if (aNewsgroupPart)
|
||||||
|
|
|
@ -58,7 +58,6 @@ protected:
|
||||||
nsCString m_newsgroupPart;
|
nsCString m_newsgroupPart;
|
||||||
nsCString m_newsHostPart;
|
nsCString m_newsHostPart;
|
||||||
nsCString m_referencePart;
|
nsCString m_referencePart;
|
||||||
nsCString m_attachmentPart;
|
|
||||||
nsCString m_bodyPart;
|
nsCString m_bodyPart;
|
||||||
nsCString m_bccPart;
|
nsCString m_bccPart;
|
||||||
nsCString m_followUpToPart;
|
nsCString m_followUpToPart;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче