From 90c10e0ebab30422d2f2e07ee741cdca980361d7 Mon Sep 17 00:00:00 2001
From: Thomas Nguyen <tnguyen@mozilla.com>
Date: Wed, 24 Aug 2016 17:15:13 +0800
Subject: [PATCH] Bug 1201716 - Missing status check in SafeBrowsing::Merge
 causes SafeBrowsing malfunction. r=francois

MozReview-Commit-ID: CtF4Gczkoa1

--HG--
extra : transplant_source : %D9E%045%FF%EB%91%04%12%D3%E2%E3%E9R%15z-%01%22%8E
---
 toolkit/components/url-classifier/HashStore.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp
index 9ae15d6b6320..8f10a145cb03 100644
--- a/toolkit/components/url-classifier/HashStore.cpp
+++ b/toolkit/components/url-classifier/HashStore.cpp
@@ -551,7 +551,9 @@ Merge(ChunkSet* aStoreChunks,
   // to make the chunkranges continuous.
   aStoreChunks->Merge(aUpdateChunks);
 
-  aStorePrefixes->AppendElements(adds, fallible);
+  if (!aStorePrefixes->AppendElements(adds, fallible))
+    return NS_ERROR_OUT_OF_MEMORY;
+
   EntrySort(*aStorePrefixes);
 
   return NS_OK;