Merge branch 'siri/cdv/crash-on-large-dump/OTP-14386' into maint

* siri/cdv/crash-on-large-dump/OTP-14386:
  observer: Improve debugging code in test suite
  cdv: Add ~tw as formatting option when expanding a term
  observer: Remove compiler warnings in test and set warnings_as_errors
  cdv: Warn about unsafe crashdump
  cdv: Show progress bar while reading big data
  cdv: Optimize reading of crashdump with many binaries
  cdv: Find end of 'Last calls' section
  cdv: Don't mark process as truncated if truncation is after all proc_heaps
  cdv: Set ERL_CRASH_DUMP_SECONDS to 0 in cdv scripts

1 files changed, 18 insertions, 11 deletions

diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
index 3dfcc42ada..a85808a472 100644
--- a/lib/observer/src/observer_html_lib.erl
+++ b/lib/observer/src/observer_html_lib.erl
@@ -337,17 +337,24 @@ href_proc_bin(From, T, Acc, LTB) ->
                 Size = list_to_integer(SizeStr),
                 PreviewSize = min(Size,10),
 		Id = {list_to_integer(Offset),PreviewSize,list_to_integer(Pos)},
-		{ok,PreviewBin} = crashdump_viewer:expand_binary(Id),
-		PreviewStr = preview_string(Size, PreviewBin),
-		if LTB ->
-			href("TARGET=\"expanded\"",
-			     ["#Binary?offset="++Offset++
-				  "&size="++SizeStr++
-				  "&pos="++Pos],
-			     PreviewStr);
-		   true ->
-			PreviewStr
-		end;
+                case crashdump_viewer:expand_binary(Id) of
+                    {ok, '#CDVTruncatedBinary'} ->
+                          lists:flatten(
+                            "<FONT COLOR=\"#FF0000\">"
+                            "&lt;&lt;...(Truncated Binary)&gt;&gt;"
+                            "</FONT>");
+                    {ok, PreviewBin} ->
+                        PreviewStr = preview_string(Size, PreviewBin),
+                        if LTB ->
+                                href("TARGET=\"expanded\"",
+                                     ["#Binary?offset="++Offset++
+                                          "&size="++SizeStr++
+                                          "&pos="++Pos],
+                                     PreviewStr);
+                           true ->
+                                PreviewStr
+                        end
+                end;
 	    [PreviewIntStr,SizeStr,Md5] when From =:= obs ->
 		Size = list_to_integer(SizeStr),
                 PreviewInt = list_to_integer(PreviewIntStr),