Bug 1553226 - Don't attempt to read annotations associated with Flash…

… process crashes r=froydnj a=jcristau Differential Revision: https://phabricator.services.mozilla.com/D32133 --HG-- extra : source : 56fea0bcb2c46e4f2fee062479799f491f5f0a29
trman · May 22, 2019 · 54553a6 · 54553a6
1 parent 8c2ce37
commit 54553a6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -3271,7 +3271,11 @@ bool TakeMinidumpForChild(uint32_t childPid, nsIFile** dump,
   if (!pd) return false;
 
   NS_IF_ADDREF(*dump = pd->minidump);
-  aAnnotations = *(pd->annotations);
+  // Only Flash process minidumps don't have annotations. Once we get rid of
+  // the Flash processes this check will become redundant.
+  if (pd->annotations) {
+    aAnnotations = *(pd->annotations);
+  }
   if (aSequence) {
     *aSequence = pd->sequence;
   }