From 84ff525a77e083631680ac4d8d8b1e685a0b3740 Mon Sep 17 00:00:00 2001 From: Kraiwin-Namsri Date: Thu, 13 Jun 2024 17:41:38 +0200 Subject: [PATCH 1/2] Bugfix: Arduino Data Dir nil dereference Bug: When dataDir is an empty string: paths.New() returns nil. next Canonical() get's called dereferencing nil. Fix: Ignore --- ls/ls.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ls/ls.go b/ls/ls.go index 478a9df..5d0932e 100644 --- a/ls/ls.go +++ b/ls/ls.go @@ -1487,6 +1487,10 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func } dataDirPath := paths.New(dataDir) + if dataDirPath == nil { + return nil, nil + } + return dataDirPath.Canonical(), nil } From f0bea90700422ec6538322484a57c409480b959d Mon Sep 17 00:00:00 2001 From: Kraiwin-Namsri Date: Thu, 13 Jun 2024 18:28:25 +0200 Subject: [PATCH 2/2] Fixed formatting --- ls/ls.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ls/ls.go b/ls/ls.go index 5d0932e..0beeeb1 100644 --- a/ls/ls.go +++ b/ls/ls.go @@ -1487,9 +1487,9 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func } dataDirPath := paths.New(dataDir) - if dataDirPath == nil { - return nil, nil - } + if dataDirPath == nil { + return nil, nil + } return dataDirPath.Canonical(), nil }