fixup! load goarc files with safe slave interpreter

genodelabs#99
jschlatow · Sep 10, 2024 · bb74546 · bb74546
1 parent 18258b3
commit bb74546
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/share/goa/lib/actions/build.tcl b/share/goa/lib/actions/build.tcl
@@ -153,7 +153,7 @@ namespace eval goa {
 		global config::cross_dev_prefix config::depot_dir config::rebuild
 		global config::arch config::olevel config::cc_march config::debug
 		global config::cc_cxx_opt_std config::ld_march config::abi_dir
-		global config::build_dir config::api_dirs
+		global config::build_dir api_dirs
 
 		#
 		# Check for availability of the Genode tool chain

diff --git a/share/goa/lib/build/cmake.tcl b/share/goa/lib/build/cmake.tcl
@@ -6,7 +6,7 @@ proc create_or_update_build_dir { } {
 	global ldlibs_so env cmake_quirk_args
 	global config::build_dir config::project_dir config::abi_dir
 	global config::cross_dev_prefix config::include_dirs config::project_name
-	global config::api_dirs
+	global api_dirs
 
 	if {![file exists $build_dir]} {
 		file mkdir $build_dir }

diff --git a/share/goa/lib/command_line.tcl b/share/goa/lib/command_line.tcl
@@ -5,6 +5,17 @@
 proc const_var { n1 n2 op } {
 	exit_with_error "Write access to const variable $n1" }
 
+#
+# Trace callback for sanitizing version information
+#
+proc version_var { n1 n2 op } {
+	global config::version
+	set value [string trim $version($n2)]
+	set version($n2) $value
+	if {[string first / $value] >= 0} {
+		exit_with_error "Value of 'version($n2)' must not contain slashes" }
+}
+
 #
 # Determine verbosity level as evaluated by 'diag'
 #
@@ -292,7 +303,9 @@ unset original_dir
 
 # make all variables (except version array) in config namespace immutable
 foreach var [info vars ::config::*] {
-	if {$var != "::config::version"} {
+	if {$var == "::config::version"} {
+		trace add variable $var write version_var
+	} else {
 		trace add variable $var write const_var
 	}
 }

diff --git a/share/goa/lib/config.tcl b/share/goa/lib/config.tcl
@@ -109,7 +109,7 @@ namespace eval ::config {
 		if {$nargs == 1} {
 			return [set ::config::$name] }
 
-		set value [lindex $args 1]
+		set value [string trim [lindex $args 1]]
 
 		if {[llength $value] > 1} {
 			exit_with_error "$rcfile contains malformed definition of $name" }