From: dteske <dteske@FreeBSD.org>
Date: Tue, 13 Dec 2016 01:41:06 +0000 (+0000)
Subject: The output of dialog needs to be sanitized
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c52826dc16a1711d23f8e4426d8df2276a34c4b4;p=people%2Froyger%2Ffreebsd.git

The output of dialog needs to be sanitized
for portability/compatibility requirements
---

diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index f892d28d7fc1..d2b307f88c7c 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -126,6 +126,7 @@ dialog_country_select()
 		$regdomains                            \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)
+	f_dialog_data_sanitize regdomain
 
 	f_dialog_title "Country selection"
 	prompt="Select your country."
@@ -142,6 +143,7 @@ dialog_country_select()
 		$countries                           \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)
+	f_dialog_data_sanitize country
 
 	country_set "$regdomain" "$country"
 }
@@ -245,7 +247,9 @@ while :; do
 		$( echo $NETWORKS | tr '\n' ' ' )" \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)
-	case $? in
+	retval=$?
+	f_dialog_data_sanitize NETWORK
+	case $retval in
 	$DIALOG_OK) break ;;
 	$DIALOG_CANCEL)
 		# here we ask if the user wants to select the network manually