From 1abd73ac761e5bf8ebdfe95950609d8059e3fd9f Mon Sep 17 00:00:00 2001
From: Joshua Root <jmr@macports.org>
Date: Mon, 30 Oct 2023 08:14:11 +1100
Subject: [PATCH] revupgrade: avoid possible TOCTOU error

Make sure not to use registry entries after they could potentially have
been uninstalled.

Closes: https://trac.macports.org/ticket/66186
---
 src/macports1.0/macports.tcl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
index 6e07ed3a5f..ce7237e4bc 100644
--- a/src/macports1.0/macports.tcl
+++ b/src/macports1.0/macports.tcl
@@ -5538,8 +5538,16 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
         set status 0
         array set my_options [array get macports::global_options]
         set my_options(ports_revupgrade) yes
+
+        # Depending on the options, calling macports::upgrade could
+        # uninstall later entries in this list. So get the info we need
+        # from all the entries first.
+        set topsort_portnames [list]
         foreach port $topsort_ports {
-            set portname [$port name]
+            lappend topsort_portnames [$port name]
+            #registry::entry close $port
+        }
+        foreach portname $topsort_portnames {
             if {![info exists depscache(port:$portname)]} {
                 unset -nocomplain my_options(ports_revupgrade_second_run) \
                                   my_options(ports_nodeps)
@@ -5561,7 +5569,6 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
                     error "Error rebuilding $portname"
                 }
             }
-            #registry::entry close $port
         }
 
         if {[info exists options(ports_dryrun)] && $options(ports_dryrun)} {