Correct parsing of sub binaries

Correct several problems parsing sub binaries. A sub binary
would often be replaced with '#CDVNonexistingBinary'.

When parsing a sub binary, we must scan ahead to find the
definition of the refc or heap binary being referenced.

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index 41041682c2..bb1755f530 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -21,7 +21,7 @@
 -module(crashdump_helper).
 -export([n1_proc/2,remote_proc/2,
          dump_maps/0,create_maps/0,
-         create_binaries/0]).
+         create_binaries/0,create_sub_binaries/1]).
 -compile(r18).
 -include_lib("common_test/include/ct.hrl").
 
@@ -64,6 +64,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     put(bin,Bin),
     put(bins,create_binaries()),
     put(sub_bin,SubBin),
+    put(sub_bins,create_sub_binaries(get(bins))),
     put(bignum,83974938738373873),
     put(neg_bignum,-38748762783736367),
     put(ext_pid,Pid2),
@@ -104,6 +105,17 @@ create_binaries() ->
          <<Data:Size/unit:8>>
      end || Size <- Sizes].
 
+create_sub_binaries(Bins) ->
+    [create_sub_binary(Bin, Start, LenSub) ||
+        Bin <- Bins,
+        Start <- [0,1,2,3,4,5,10,22],
+        LenSub <- [0,1,2,3,4,6,9]].
+
+create_sub_binary(Bin, Start, LenSub) ->
+    Len = byte_size(Bin) - LenSub - Start,
+    <<_:Start/bytes,Sub:Len/bytes,_/bytes>> = Bin,
+    Sub.
+
 %%%
 %%% Test dumping of maps. Dumping of maps only from OTP 20.2.
 %%%