X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fconsole-unix.c;h=38a82c92e957f3cb76cde6f66bd2031f6009c881;hb=6e17b26ef522006054976d29fa77e71638af73f5;hp=6123396fa8d4b94af71c605ba1102cfcdeeb5f49;hpb=9c20705142829bb04f8478c8f9d90916cba644ac;p=mono.git

diff --git a/mono/metadata/console-unix.c b/mono/metadata/console-unix.c
index 6123396fa8d..38a82c92e95 100644
--- a/mono/metadata/console-unix.c
+++ b/mono/metadata/console-unix.c
@@ -498,13 +498,21 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardow
 	if (setup_finished)
 		return TRUE;
 
-	keypad_xmit_str = keypad != NULL ? mono_string_to_utf8 (keypad) : NULL;
+	keypad_xmit_str = NULL;
+	if (keypad != NULL) {
+		keypad_xmit_str = mono_string_to_utf8_checked (keypad, &error);
+		if (mono_error_set_pending_exception (&error))
+			return FALSE;
+	}
 	
 	console_set_signal_handlers ();
 	setup_finished = TRUE;
 	if (!atexit_called) {
-		if (teardown != NULL)
-			teardown_str = mono_string_to_utf8 (teardown);
+		if (teardown != NULL) {
+			teardown_str = mono_string_to_utf8_checked (teardown, &error);
+			if (mono_error_set_pending_exception (&error))
+				return FALSE;
+		}
 
 		mono_atexit (tty_teardown);
 	}