From 38570e3ea621c50902ed8739563f2ae6d5e0958a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 24 Aug 2020 11:56:53 -0600 Subject: [PATCH] improve unsafe-linklet error message --- pkgs/racket-test-core/tests/racket/sandbox.rktl | 4 ++-- racket/src/bc/src/linklet.c | 2 +- racket/src/cs/linklet.sls | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/racket-test-core/tests/racket/sandbox.rktl b/pkgs/racket-test-core/tests/racket/sandbox.rktl index df75bc7948..30034874f0 100644 --- a/pkgs/racket-test-core/tests/racket/sandbox.rktl +++ b/pkgs/racket-test-core/tests/racket/sandbox.rktl @@ -463,7 +463,7 @@ ;; timestamp .zo file (needed under Windows): (file-or-directory-modify-seconds ,test-zo (current-seconds)) ;; loading 'test gets 'list module declaration via ".zo" - (load/use-compiled ,test-lib) =err> "cannot use linklet loaded with non-original code inspector" + (load/use-compiled ,test-lib) =err> "cannot use unsafe linklet loaded with non-original code inspector" (delete-file ,test-zo) => (void) (delete-file ,test-lib) =err> "`delete' access denied" --top-- @@ -480,7 +480,7 @@ (cp ,list-lib ,test-lib) (cp ,list-zo ,test-zo) (cp ,list-lib ,test2-lib) (cp ,list-zo ,test2-zo) ;; bytecode from test-lib is bad, even when we can read/write to it - (load/use-compiled ,test-zo) =err> "cannot use linklet loaded with non-original code inspector" + (load/use-compiled ,test-zo) =err> "cannot use unsafe linklet loaded with non-original code inspector" ;; bytecode from test2-lib is explicitly allowed (load/use-compiled ,test2-lib) (require 'list) => (void)) diff --git a/racket/src/bc/src/linklet.c b/racket/src/bc/src/linklet.c index 95b85b0dd6..9316b4f04e 100644 --- a/racket/src/bc/src/linklet.c +++ b/racket/src/bc/src/linklet.c @@ -335,7 +335,7 @@ static void check_linklet_allowed(const char *who, Scheme_Linklet *linklet) { if (linklet->reject_eval) { scheme_raise_exn(MZEXN_FAIL, - "%s: cannot use linklet loaded with non-original code inspector", + "%s: cannot use unsafe linklet loaded with non-original code inspector", who); } } diff --git a/racket/src/cs/linklet.sls b/racket/src/cs/linklet.sls index 926d888812..a45caa480d 100644 --- a/racket/src/cs/linklet.sls +++ b/racket/src/cs/linklet.sls @@ -671,7 +671,7 @@ [(faslable-unsafe) (raise (|#%app| exn:fail - "eval-linklet: cannot use linklet loaded with non-original code inspector" + "eval-linklet: cannot use unsafe linklet loaded with non-original code inspector" (current-continuation-marks)))] [else linklet]))