fix: nil recover case

traefik · May 29, 2020 · 56d88ef · 56d88ef
1 parent 5d78c8a
commit 56d88ef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/_test/recover2.go b/_test/recover2.go
@@ -0,0 +1,15 @@
+package main
+
+func main() {
+	println("hello")
+
+	var r interface{} = 1
+	r = recover()
+	if r == nil {
+		println("world")
+	}
+}
+
+// Output:
+// hello
+// world
diff --git a/interp/run.go b/interp/run.go
@@ -459,13 +459,9 @@ func _println(n *node) {
 func _recover(n *node) {
 	tnext := getExec(n.tnext)
 	dest := genValue(n)
-	var err error
-	nilErr := reflect.ValueOf(valueInterface{n, reflect.ValueOf(&err).Elem()})
 
 	n.exec = func(f *frame) bltn {
-		if f.anc.recovered == nil {
-			dest(f).Set(nilErr)
-		} else {
+		if f.anc.recovered != nil {
 			dest(f).Set(reflect.ValueOf(valueInterface{n, reflect.ValueOf(f.anc.recovered)}))
 			f.anc.recovered = nil
 		}