Merge branch 'master' into test_resolve_conflicts

1 files changed, 8 insertions, 1 deletions

diff --git a/modules/safe.py b/modules/safe.py
index 20be16a5..399165a1 100644
--- a/modules/safe.py
+++ b/modules/safe.py
@@ -96,11 +96,18 @@ def load(filename, *args, **kwargs):
         if not shared.cmd_opts.disable_safe_unpickle:

             check_pt(filename)

 

+    except pickle.UnpicklingError:

+        print(f"Error verifying pickled file from {filename}:", file=sys.stderr)

+        print(traceback.format_exc(), file=sys.stderr)

+        print(f"-----> !!!! The file is most likely corrupted !!!! <-----", file=sys.stderr)

+        print(f"You can skip this check with --disable-safe-unpickle commandline argument, but that is not going to help you.\n\n", file=sys.stderr)

+        return None

+

     except Exception:

         print(f"Error verifying pickled file from {filename}:", file=sys.stderr)

         print(traceback.format_exc(), file=sys.stderr)

         print(f"\nThe file may be malicious, so the program is not going to read it.", file=sys.stderr)

-        print(f"You can skip this check with --disable-safe-unpickle commandline argument.", file=sys.stderr)

+        print(f"You can skip this check with --disable-safe-unpickle commandline argument.\n\n", file=sys.stderr)

         return None

 

     return unsafe_torch_load(filename, *args, **kwargs)