Merge branch 'maint'

* maint:
  erl_process_dump: Don't assume that literals can be found
  Remove one superfluous closing parenthesis in oam_intro.xml

1 files changed, 9 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 12ef4aab8a..0b7f361622 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -728,8 +728,15 @@ static void mark_literal(Eterm* ptr)
 
     ap = bsearch(ptr, lit_areas, num_lit_areas, sizeof(ErtsLiteralArea*),
                  search_areas);
-    ASSERT(ap);
-    ap[0]->off_heap = (struct erl_off_heap_header *) 1;
+
+    /*
+     * If the literal was created by native code, this search will not
+     * find it and ap will be NULL.
+     */
+
+    if (ap) {
+        ap[0]->off_heap = (struct erl_off_heap_header *) 1;
+    }
 }