Avoid nil-dereference

skx · Apr 9, 2022 · 7ffd819 · 7ffd819
1 parent a9e356b
commit 7ffd819
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/eval/eval.go b/eval/eval.go
@@ -606,7 +606,7 @@ func (e *Interpreter) term() object.Object {
 	f1 := e.factor()
 
 	if f1 == nil {
-		return object.Error("term() - received a nil value from factor()")
+		return object.Error("term() - received a nil value from factor() - f1")
 	}
 
 	if f1.Type() == object.ERROR {
@@ -636,6 +636,10 @@ func (e *Interpreter) term() object.Object {
 		// get the second argument
 		f2 := e.factor()
 
+		if f2 == nil {
+			return object.Error("term() - received a nil value from factor() - f2")
+		}
+
 		if e.offset >= len(e.program) {
 			return object.Error("Hit end of program processing term()")
 		}

diff --git a/eval/testdata/fuzz/FuzzEval/a0e3b497a8745f226673f84d5189d15dff3faa03c07a373650653dbea645f5fd b/eval/testdata/fuzz/FuzzEval/a0e3b497a8745f226673f84d5189d15dff3faa03c07a373650653dbea645f5fd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("DIM A(0)00A=0%A[0 0 0]0")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		go test fuzz v1
		[]byte("DIM A(0)00A=0%A[0 0 0]0")