Fix Command out-of-bounds segfault. Close #10.

gabordemooij · Jan 28, 2016 · de44cb9 · de44cb9
1 parent 344da4a
commit de44cb9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/system.c b/system.c
@@ -142,7 +142,7 @@ ctr_object* ctr_shell_call(ctr_object* myself, ctr_argument* argumentList) {
 ctr_object* ctr_command_argument(ctr_object* myself, ctr_argument* argumentList) {
 	ctr_object* numberObject = ctr_internal_cast2number(argumentList->object);
 	int n = (int) numberObject->value.nvalue;
-	if (n >= ctr_argc) return CtrStdNil;
+	if (n >= ctr_argc || n < 0) return CtrStdNil;
 	return ctr_build_string(ctr_argv[n], strlen(ctr_argv[n]));
 }
 

diff --git a/tests/test0116.ctr b/tests/test0116.ctr
@@ -0,0 +1,7 @@
+#Command argument should segfault when out-of-bounds, issue#10
+wrong := Command argument: -10.
+(wrong = Nil) ifTrue: {\
+	Pen write: 'I can handle out-of-bound Command arguments.\n'.
+}, else: {\
+	Pen write: 'Fail\n'.
+}.
diff --git a/tests/test0116.exp b/tests/test0116.exp
@@ -0,0 +1 @@
+I can handle out-of-bound Command arguments.