From 100597f9bbf7b47f488026b6f68bc3d6da46e6d3 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 9 Jul 2020 21:29:49 -0400 Subject: [PATCH] Repair 7f44aaf2bf2a4855 to check argument length before `/`. --- pkgs/racket-test-core/tests/racket/file.rktl | 1 + racket/src/io/format/printf.rkt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/racket-test-core/tests/racket/file.rktl b/pkgs/racket-test-core/tests/racket/file.rktl index 7360d93662..aa77e7f3ee 100644 --- a/pkgs/racket-test-core/tests/racket/file.rktl +++ b/pkgs/racket-test-core/tests/racket/file.rktl @@ -1446,6 +1446,7 @@ (err/rt-test (format "apple~")) (err/rt-test (format "~")) (err/rt-test (format "~~~")) + (err/rt-test (format "~s") (lambda (e) (regexp-match "requires one"))) (err/rt-test (format "~o") exn:application:mismatch?) (err/rt-test (format "~o" 1 2) exn:application:mismatch?) (err/rt-test (format "~c" 1) exn:application:mismatch?) diff --git a/racket/src/io/format/printf.rkt b/racket/src/io/format/printf.rkt index 533e73e1d5..d7b2ee256b 100644 --- a/racket/src/io/format/printf.rkt +++ b/racket/src/io/format/printf.rkt @@ -197,7 +197,7 @@ (define (arguments->string fmt+args) (define args (cdr fmt+args)) - (if (or (null? args) (<= (length args) 50)) + (if (<= 1 (length args) 50) (parameterize ([error-print-width (max 2 (round (/ (error-print-width) (length args))))]) (apply string-append