wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-28 03:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1401858 - add null check to avoid crash in EncodedHeader()/DecodedHeader().

Browse source 
Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-10 22:54:16 -05:00 • committed by Roy Tam
commit 6c3fade999
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mailnews/mime/src/MimeHeaderParser.cpp
View file

@ -10,7 +10,6 @@
#include "nsMemory.h" #include "nsMemory.h"
#include "nsAutoPtr.h" #include "nsAutoPtr.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsIMimeConverter.h"
#include "nsIMsgHeaderParser.h" #include "nsIMsgHeaderParser.h"
namespace mozilla { namespace mozilla {
@ -76,6 +75,7 @@ nsCOMArray<msgIAddressObject> DecodedHeader(const nsAString &aHeader)
return retval; return retval;
} }
nsCOMPtr<nsIMsgHeaderParser> headerParser(services::GetHeaderParser()); nsCOMPtr<nsIMsgHeaderParser> headerParser(services::GetHeaderParser());
NS_ENSURE_TRUE(headerParser, retval);
msgIAddressObject **addresses = nullptr; msgIAddressObject **addresses = nullptr;
uint32_t length; uint32_t length;
nsresult rv = headerParser->ParseDecodedHeader(aHeader, false, nsresult rv = headerParser->ParseDecodedHeader(aHeader, false,
@ -95,6 +95,7 @@ nsCOMArray<msgIAddressObject> EncodedHeader(const nsACString &aHeader,
return retval; return retval;
} }
nsCOMPtr<nsIMsgHeaderParser> headerParser(services::GetHeaderParser()); nsCOMPtr<nsIMsgHeaderParser> headerParser(services::GetHeaderParser());
NS_ENSURE_TRUE(headerParser, retval);
msgIAddressObject **addresses = nullptr; msgIAddressObject **addresses = nullptr;
uint32_t length; uint32_t length;
nsresult rv = headerParser->ParseEncodedHeader(aHeader, aCharset, nsresult rv = headerParser->ParseEncodedHeader(aHeader, aCharset,