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, 37 insertions, 1 deletions

diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl
index 898f39ded2..c3f36cd689 100644
--- a/lib/observer/src/cdv_wx.erl
+++ b/lib/observer/src/cdv_wx.erl
@@ -412,7 +412,16 @@ load_dump(Frame,undefined) ->
 	    error
     end;
 load_dump(Frame,FileName) ->
-    ok = observer_lib:display_progress_dialog("Crashdump Viewer",
+    case maybe_warn_filename(FileName) of
+        continue ->
+            do_load_dump(Frame,FileName);
+        stop ->
+            error
+    end.
+
+do_load_dump(Frame,FileName) ->
+    ok = observer_lib:display_progress_dialog(wx:null(),
+                                              "Crashdump Viewer",
 					      "Loading crashdump"),
     crashdump_viewer:read_file(FileName),
     case observer_lib:wait_for_progress() of
@@ -431,6 +440,33 @@ load_dump(Frame,FileName) ->
 	    error
     end.
 
+maybe_warn_filename(FileName) ->
+    case os:getenv("ERL_CRASH_DUMP_SECONDS")=="0" orelse
+        os:getenv("ERL_CRASH_DUMP_BYTES")=="0" of
+        true ->
+            continue;
+        false ->
+            DumpName = case os:getenv("ERL_CRASH_DUMP") of
+                           false -> filename:absname("erl_crash.dump");
+                           Name -> filename:absname(Name)
+                       end,
+            case filename:absname(FileName) of
+                DumpName ->
+                    Warning =
+                        "WARNING: the current crashdump might be overwritten "
+                        "if the crashdump_viewer node crashes.\n\n"
+                        "Renaming the file before inspecting it will "
+                        "remove the problem.\n\n"
+                        "Do you want to continue?",
+                    case observer_lib:display_yes_no_dialog(Warning) of
+                        ?wxID_YES -> continue;
+                        ?wxID_NO -> stop
+                    end;
+                _ ->
+                    continue
+            end
+    end.
+
 %%%-----------------------------------------------------------------
 %%% Find help document (HTML files)
 get_help_doc(HelpId) ->