Add null resolver safeguard

onflow · Oct 25, 2023 · 20fdb4d · 20fdb4d
1 parent 4ecc397
commit 20fdb4d
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/languageserver/cmd/languageserver/main_wasm.go b/languageserver/cmd/languageserver/main_wasm.go
@@ -160,15 +160,25 @@ func start(id int) {
 	)
 
 	addressImportResolver := func(location common.AddressLocation) (code string, err error) {
-		res := global.Call(globalFunctionName(id, "getAddressCode"), location.String())
+		getAddressCodeFunc := global.Get(globalFunctionName(id, "getAddressCode"))
+		if getAddressCodeFunc.IsNull() || getAddressCodeFunc.IsUndefined() {
+			return "", fmt.Errorf("CLS %d: getAddressCode not defined", id)
+		}
+
+		res := getAddressCodeFunc.Invoke(location.Address().String())
 		if res.IsNull() || res.IsUndefined() {
 			return "", fmt.Errorf("CLS %d: getAddressCode failed: %s", id, res)
 		}
 		return res.String(), nil
 	}
 
 	stringImportResolver := func(location common.StringLocation) (code string, err error) {
-		res := global.Call(globalFunctionName(id, "getStringCode"), location.String())
+		getStringCodeFunc = global.Get(globalFunctionName(id, "getStringCode"))
+		if getStringCodeFunc.IsNull() || getStringCodeFunc.IsUndefined() {
+			return "", fmt.Errorf("CLS %d: getStringCode not defined", id)
+		}
+
+		res := getStringCodeFunc.Invoke(location.String())
 		if res.IsNull() || res.IsUndefined() {
 			return "", fmt.Errorf("CLS %d: getStringCode failed: %s", id, res)
 		}