[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: substitute: Sanitize the client-provided column number.
|
From: |
Ludovic Courtès |
|
Subject: |
05/05: substitute: Sanitize the client-provided column number. |
|
Date: |
Wed, 20 Apr 2016 21:29:52 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 85fc958d9b8b36fb4b540882dfbcec45aab9eb82
Author: Ludovic Courtès <address@hidden>
Date: Wed Apr 20 23:21:49 2016 +0200
substitute: Sanitize the client-provided column number.
* guix/scripts/substitute.scm (client-terminal-columns): Sanitize the
client's column number.
---
guix/scripts/substitute.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index fa1dd09..1cfab81 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -981,7 +981,9 @@ found."
default value."
(or (and=> (or (find-daemon-option "untrusted-terminal-columns")
(find-daemon-option "terminal-columns"))
- string->number)
+ (lambda (str)
+ (let ((number (string->number str)))
+ (and number (max 20 (- number 1))))))
80))
(define (guix-substitute . args)