fix: Check if variable is already set before creating another one

Author: hyperupcall

pkg/lib/traverse-set.sh

@@ -6,8 +6,6 @@ bash_object.traverse-set() {
 		stdtrace.log 0 "CALL: bash_object.traverse-set: $*"
 	fi
 
-	# TODO: errors if vmd_dtype, final_value_type is not one of the known ones
-
 	local final_value_type="$1"
 	local root_object_name="$2"
 	local filter="$3"
@@ -41,7 +39,6 @@ bash_object.traverse-set() {
 			# 	# be the name of a new _array_
 			# 	local new_current_object_name="__bash_object_${root_object_name}_tree_${key}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}"
 
-			# 	# TODO: double-check if new_current_object_name only has underscores, dots, etc. (printf %q?)
 			# 	if ! eval "declare -gA $new_current_object_name=()"; then
 			# 		printf '%s\n' 'Error: bash-object: eval declare failed'
 			# 		return 1
@@ -55,34 +52,43 @@ bash_object.traverse-set() {
 			# If we are at the last element in the query
 			elif ((i+1 == ${#REPLIES[@]})); then
 				if [ "$final_value_type" = object ]; then
-					# TODO: late bash srandom
-					local new_current_object_name="__bash_object_${root_object_name}_tree_${key}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}"
-
-					# TODO: test if name is already used
+					bash_object.util.generate_vobject_name
+					local new_current_object_name="$REPLY"
 
 					# TODO: double-check if new_current_object_name only has underscores, dots, etc. (printf %q?)
 
-					# 1. Create object
+					if ((BASH_VERSINFO[0] >= 5)) || ((BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 2)); then
+						if [[ -v "$new_current_object_name" ]]; then
+							bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' "Autogenerated variable '$new_current_object_name' already exists. Did RANDOM or SRANDOM get unset?"
+							return
+						fi
+					else
+						if ! eval "
+							if ! [ -z \${$new_current_object_name+x} ]; then
+								bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' \"Autogenerated variable '$new_current_object_name' already exists. Did RANDOM or SRANDOM get unset?\"
+								return
+							fi
+						"; then
+							bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' 'Eval unset test'
+							return
+						fi
+					fi
+
 					if ! eval "declare -gA $new_current_object_name=()"; then
-						# TODO: error
-						printf '%s\n' 'Error: bash-object: eval declare failed'
-						return 1
+						bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' 'Eval declare failed'
+						return
 					fi
 
-					# 2. Create virtual object
+					local -n new_current_object="$new_current_object_name"
+
 					current_object["$key"]=$'\x1C\x1D'"type=object;&$new_current_object_name"
 
-					local -n new_current_object="$new_current_object_name"
 					local -n object_to_copy="$final_value"
 					# test if the object_to_copy is of the right type
 					for key in "${!object_to_copy[@]}"; do
 						new_current_object["$key"]="${object_to_copy["$key"]}"
 					done
 				elif [ "$final_value_type" = array ]; then
-					# local new_current_object_name="__bash_object_${root_object_name}_tree_${key}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}"
-					# current_object["$key"]=$'\x1C\x1D'"type=array;&$new_current_object_name"
-
-					# local -n new_array = "$final_value"
 					:
 					# current_object["$key"]=("${new_array[@]}")
 				elif [ "$final_value_type" = string ]; then

pkg/lib/util/util.sh

@@ -7,7 +7,7 @@ declare -gA ERRORS_BASH_OBJECT=(
 	[ERROR_INVALID_ARGS]='Invalid arguments'
 	[ERROR_INTERNAL_INVALID_VOBJ]='Internal virtual object has incorrect metadata'
 	[ERROR_INTERNAL_INVALID_PARAM]='Internal parameter has an incorrect value'
-
+	[ERROR_INTERNAL_MISCELLANEOUS]='Miscellaneous error occured'
 )
 
 bash_object.util.die() {
@@ -37,6 +37,19 @@ bash_object.util.die() {
 	return 2
 }
 
+bash_object.util.generate_vobject_name() {
+	unset REPLY
+
+	local random_string=
+	if ((BASH_VERSINFO[0] >= 6)) || ((BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 1)); then
+		random_string="${SRANDOM}_${SRANDOM}_${SRANDOM}_${SRANDOM}_${SRANDOM}"
+	else
+		random_string="${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}"
+	fi
+
+	REPLY="__bash_object_${root_object_name}_tree_${key}_${random_string}"
+}
+
 # TODO
 stdtrace.log() {
     local level="$1"

tests/set.bats

@@ -0,0 +1,16 @@
+# shellcheck shell=bash
+
+load './util/init.sh'
+
+@test "Error if random variable already exists" {
+	bash_object.util.generate_vobject_name() {
+		REPLY="some_other_var"
+	}
+	declare -g some_other_var=
+
+	run bash_object.traverse-set object 'OBJECT' '.obj' obj
+
+	assert_failure
+	assert_output -p 'ERROR_INTERNAL_MISCELLANEOUS'
+	assert_output -p "Autogenerated variable 'some_other_var' already exists"
+}