Fix ToString bugs in lua package

256lights · Jan 13, 2025 · d1cd5f2 · d1cd5f2
1 parent 3a53411
commit d1cd5f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/internal/lua/auxlib.go b/internal/lua/auxlib.go
@@ -71,8 +71,8 @@ func ToString(l *State, idx int) (string, sets.Set[string], error) {
 			l.Pop(1)
 			return "", nil, fmt.Errorf("lua: '__tostring' must return a string")
 		}
-		s, _ := l.ToString(idx)
-		sctx := l.StringContext(idx)
+		s, _ := l.ToString(-1)
+		sctx := l.StringContext(-1)
 		l.Pop(1)
 		return s, sctx, nil
 	}

diff --git a/internal/lua/lua.go b/internal/lua/lua.go
@@ -602,8 +602,9 @@ func (l *State) ToString(idx int) (s string, ok bool) {
 	case stringValue:
 		return v.s, true
 	case valueStringer:
-		*p = v.stringValue()
-		return s, true
+		sv := v.stringValue()
+		*p = sv
+		return sv.s, true
 	default:
 		return "", false
 	}