guix_mirror_bot pushed a commit to branch master
in repository guix.

commit fa1c0c312a97738ba249c10dfe5e75544b4759b4
Author: Daniel Littlewood <[email protected]>
AuthorDate: Mon Nov 2 15:22:56 2026 +0000

    teams: release: Prevent infinite recursion in os-manifest-generator
    
    The os-manifest-generator script determines which packages to build by
    recursively examining the fields of the objects to build. This recursion can
    fail to terminate if any of these objects (e.g. the top-level operating
    system) refers to itself as a dependency. The transformation field on
    operating-system can currently cause infinite recursion in this way.
    
    This patch prevents an infinite loop by maintaining a list of visited 
objects,
    and ensuring no object is ever processed twice.
    
    * etc/teams/release/os-manifest-generator.scm: Update all-packages to 
prevent
      infinite loops.
    
    Signed-off-by: Jelle Licht <[email protected]>
---
 etc/teams/release/os-manifest-generator.scm | 85 ++++++++++++++---------------
 1 file changed, 40 insertions(+), 45 deletions(-)

diff --git a/etc/teams/release/os-manifest-generator.scm 
b/etc/teams/release/os-manifest-generator.scm
index fd5da39305e..8b55432f971 100755
--- a/etc/teams/release/os-manifest-generator.scm
+++ b/etc/teams/release/os-manifest-generator.scm
@@ -44,51 +44,46 @@ exec guile -e main -s "$0" "$@"
 
 ;; Returns a heterogenous list of packages or services.
 ;; Each service is followed by the list of packages it depends on.
-(define* (all-packages obj #:optional (pred package?))
-  (match obj
-    ((? pred)
-     (list obj))
-    ((? gexp?)
-     (list))
-    ((a . b)
-     (append (all-packages a pred)
-             (all-packages b pred)))
-    ((_ ...)
-     (apply append
-            (map (cut all-packages <> pred)
-                 obj)))
-    (#(_ ...)
-     (all-packages (vector->list obj) pred))
-    ((or (? service-type?)
-         (? origin?))
-     (list))
-    ((? record?)
-     (let* ((record-type (record-type-descriptor obj))
-            (record-fields (record-type-fields record-type))
-            (child-pkgs (apply append
-                               (map (lambda (field)
-                                      (let* ((accessor (record-accessor 
record-type field))
-                                             (field-obj (accessor obj)))
-                                        (if (thunked-field? field field-obj)
-                                            (let ((value (field-obj obj)))
-                                              ;; A procedure-valued field such 
as
-                                              ;; 'transformation' maps a 
record to another
-                                              ;; record of the same type; 
don't descend to prevent
-                                              ;; infinite identity loops
-                                              (if (and (record? value)
-                                                       (eq? 
(record-type-descriptor value)
-                                                            record-type))
-                                                  '()
-                                                  (all-packages value pred)))
-                                            (all-packages field-obj pred))))
-                                    record-fields))))
-       (if (service? obj)
-           (cons obj child-pkgs)
-           child-pkgs)))
-    ((? parameter?)
-     (list))
-    (_
-     (list))))
+(define* (all-packages obj #:optional (pred package?) #:key (seen 
(make-hash-table)))
+  (define already-visited? (hash-ref seen obj))
+  (hash-set! seen obj #t)
+  (define (all-packages-rec node)
+    (all-packages node pred #:seen seen))
+  (if already-visited?
+      (list)
+      (match obj
+        ((? pred)
+         (list obj))
+        ((? gexp?)
+         (list))
+        ((a . b)
+         (append (all-packages-rec a)
+                 (all-packages-rec b)))
+        ((_ ...)
+         (apply append (map all-packages-rec obj)))
+        (#(_ ...)
+         (all-packages-rec (vector->list obj)))
+        ((or (? service-type?)
+             (? origin?))
+         (list))
+        ((? record?)
+         (let* ((record-type (record-type-descriptor obj))
+                (record-fields (record-type-fields record-type))
+                (child-pkgs (apply append
+                                   (map (lambda (field)
+                                          (let* ((accessor (record-accessor 
record-type field))
+                                                 (field-obj (accessor obj)))
+                                            (if (thunked-field? field 
field-obj)
+                                                (all-packages-rec (field-obj 
obj))
+                                                (all-packages-rec field-obj))))
+                                        record-fields))))
+           (if (service? obj)
+               (cons obj child-pkgs)
+               child-pkgs)))
+        ((? parameter?)
+         (list))
+        (_
+         (list)))))
 
 ;; Remove from pkgs-or-services all packages which do not need to be named
 ;; explicitly because they are pulled in by another listed package.

Reply via email to