me
/
guix
Archived
1
0
Fork 0
Code

status: Guard against a numerical overflow condition. 

Fixes <https://issues.guix.gnu.org/62766>.

* guix/status.scm (update-build): Use 0 as progress when an exception occurs
while computing it.
master
Maxim Cournoyer 2023-04-10 22:08:09 -04:00
parent 0f59fbe2db
commit 7747da6aed
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
guix/status.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -190,9 +191,17 @@ a completion indication."
((regexp-exec %fraction-line-rx line)
=>
(lambda (match)
(let ((done (string->number (match:substring match 1)))
(total (string->number (match:substring match 3))))
(update (* 100. (/ done total))))))
(let* ((done (string->number (match:substring match 1)))
(total (string->number (match:substring match 3)))
;; It's possible that both done and total are 0 (see:
;; https://issues.guix.gnu.org/62766). Special case this
;; pathological case as a null progress (0).
(progress (catch 'numerical-overflow
(lambda ()
(/ done total))
(lambda _
0))))
(update (* 100. progress)))))
((regexp-exec %phase-start-rx line)
=>
(lambda (match)