aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-10-30 10:18:48 +0100
committerBjörn Gustavsson <[email protected]>2017-10-30 10:18:48 +0100
commit7b4ee9cdff7f4a5ea7600033186efe7fd6568d8e (patch)
treee4cd9652ff65cf985f5f46b2001e547eba44c865
parent40c19a6674b9034a35f1d0e5540fa755cfd54b7c (diff)
parent3ffdb15e2315a0ad784f1b45db97c3748325e567 (diff)
downloadotp-7b4ee9cdff7f4a5ea7600033186efe7fd6568d8e.tar.gz
otp-7b4ee9cdff7f4a5ea7600033186efe7fd6568d8e.tar.bz2
otp-7b4ee9cdff7f4a5ea7600033186efe7fd6568d8e.zip
Merge branch 'maint'
* maint: erl_process_dump: Don't assume that literals can be found Remove one superfluous closing parenthesis in oam_intro.xml
-rw-r--r--erts/emulator/beam/erl_process_dump.c11
-rw-r--r--system/doc/oam/oam_intro.xml2
2 files changed, 10 insertions, 3 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;
+ }
}
diff --git a/system/doc/oam/oam_intro.xml b/system/doc/oam/oam_intro.xml
index d3867f03ca..ead8c026b9 100644
--- a/system/doc/oam/oam_intro.xml
+++ b/system/doc/oam/oam_intro.xml
@@ -211,7 +211,7 @@ snmp:c("MY-MIB", [{il, ["sasl/priv/mibs"]}]).</code>
<p>The following MIBs are defined in the OTP system:</p>
<list type="bulleted">
- <item><p><c>OTP-REG)</c> (in SASL) contains the top-level
+ <item><p><c>OTP-REG</c> (in SASL) contains the top-level
OTP registration objects, used by all other MIBs.</p></item>
<item><p><c>OTP-TC</c> (in SASL) contains the general
Textual Conventions, which can be used by any other MIB.</p></item>