Bug 864236 - Make multi-MiB allocations in the url-classifier fallible. r=dcamp

2013-04-22 00:04:46 -07:00
parent 3fe325a11f
commit 1bb46a184d
2 changed files with 17 additions and 9 deletions
--- a/toolkit/components/url-classifier/Classifier.cpp
+++ b/toolkit/components/url-classifier/Classifier.cpp
@@ -301,7 +301,9 @@ Classifier::ApplyUpdates(nsTArray<TableUpdate*>* aUpdates)
      nsCString updateTable(aUpdates->ElementAt(i)->TableName());
      rv = ApplyTableUpdates(aUpdates, updateTable);
      if (NS_FAILED(rv)) {
-        Reset();
+        if (rv != NS_ERROR_OUT_OF_MEMORY) {
+          Reset();
+        }
        return rv;
      }
    }