GNU bug report logs - #32711
[PATCH] ui: Fix abort on #\nul character in build output.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32711 in the body.
You can then email your comments to 32711 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: ericbavier <at> centurylink.net
To: guix-patches <at> gnu.org
Cc: Eric Bavier <bavier <at> member.fsf.org>
Subject: [PATCH] ui: Fix abort on #\nul character in build output.
Date: Tue, 11 Sep 2018 21:38:23 -0500

From: Eric Bavier <bavier <at> member.fsf.org>

Fixes build of "lz4" package, e.g.

* guix/ui.scm (build-output-port)[handle-string]: Check for #\nul before doing
any regex matching.
---
 guix/ui.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index c55ae7e2f..207aba8ad 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1762,18 +1762,19 @@ phase announcements and replaces any other output with a spinner."
                      RED BLUE RED BLUE RED BLUE))))
       (lambda (str)
         (let ((processed
-               (any (match-lambda
-                      ((pattern #:transform transform)
-                       (and=> (string-match pattern str)
-                              transform))
-                      ((pattern . colors)
-                       (and=> (string-match pattern str)
-                              (lambda (m)
-                                (let ((substrings
-                                       (map (cut match:substring m <>)
-                                            (iota (- (match:count m) 1) 1))))
-                                  (string-join (map proc substrings colors) ""))))))
-                    rules)))
+               (and (not (string-index str #\nul)) ;(ice-9 regex) cannot handle #\nul
+                    (any (match-lambda
+                          ((pattern #:transform transform)
+                           (and=> (string-match pattern str)
+                                  transform))
+                          ((pattern . colors)
+                           (and=> (string-match pattern str)
+                                  (lambda (m)
+                                    (let ((substrings
+                                           (map (cut match:substring m <>)
+                                                (iota (- (match:count m) 1) 1))))
+                                      (string-join (map proc substrings colors) ""))))))
+                         rules))))
           (when spun?
             (display (string #\backspace) port))
           (if processed
-- 
2.18.0

Message #10 received at 32711-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: ericbavier <at> centurylink.net
Cc: 32711-done <at> debbugs.gnu.org, Eric Bavier <bavier <at> member.fsf.org>
Subject: Re: [bug#32711] [PATCH] ui: Fix abort on #\nul character in build
 output.
Date: Fri, 28 Sep 2018 23:14:49 +0200

Hi Eric,

ericbavier <at> centurylink.net skribis:

> From: Eric Bavier <bavier <at> member.fsf.org>
>
> Fixes build of "lz4" package, e.g.
>
> * guix/ui.scm (build-output-port)[handle-string]: Check for #\nul before doing
> any regex matching.

This is fixed in the new (guix status) code, commit
dc0f74e5fc26977a3ee6c4f2aa74a141f4359982 (see the ‘color-rules’ macro.)

Thank you, and sorry for not responding earlier!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.