diff --git a/experimental/libbox/config.go b/experimental/libbox/config.go index 56c56189..c8d0693a 100644 --- a/experimental/libbox/config.go +++ b/experimental/libbox/config.go @@ -139,17 +139,17 @@ func (s *platformInterfaceStub) SendNotification(notification *platform.Notifica return nil } -func FormatConfig(configContent string) (string, error) { +func FormatConfig(configContent string) (*StringBox, error) { options, err := parseConfig(configContent) if err != nil { - return "", err + return nil, err } var buffer bytes.Buffer encoder := json.NewEncoder(&buffer) encoder.SetIndent("", " ") err = encoder.Encode(options) if err != nil { - return "", err + return nil, err } - return buffer.String(), nil + return wrapString(buffer.String()), nil } diff --git a/experimental/libbox/http.go b/experimental/libbox/http.go index 3e1a04d0..e037de00 100644 --- a/experimental/libbox/http.go +++ b/experimental/libbox/http.go @@ -50,8 +50,7 @@ type HTTPRequest interface { } type HTTPResponse interface { - GetContent() ([]byte, error) - GetContentString() (string, error) + GetContent() (*StringBox, error) WriteTo(path string) error } @@ -210,27 +209,22 @@ type httpResponse struct { } func (h *httpResponse) errorString() string { - content, err := h.GetContentString() + content, err := h.GetContent() if err != nil { return fmt.Sprint("HTTP ", h.Status) } return fmt.Sprint("HTTP ", h.Status, ": ", content) } -func (h *httpResponse) GetContent() ([]byte, error) { +func (h *httpResponse) GetContent() (*StringBox, error) { h.getContentOnce.Do(func() { defer h.Body.Close() h.content, h.contentError = io.ReadAll(h.Body) }) - return h.content, h.contentError -} - -func (h *httpResponse) GetContentString() (string, error) { - content, err := h.GetContent() - if err != nil { - return "", err + if h.contentError != nil { + return nil, h.contentError } - return string(content), nil + return wrapString(string(h.content)), nil } func (h *httpResponse) WriteTo(path string) error { diff --git a/experimental/libbox/panic.go b/experimental/libbox/panic.go new file mode 100644 index 00000000..62fe1326 --- /dev/null +++ b/experimental/libbox/panic.go @@ -0,0 +1,12 @@ +package libbox + +// https://github.com/golang/go/issues/46893 +// TODO: remove after `bulkBarrierPreWrite: unaligned arguments` fixed + +type StringBox struct { + Value string +} + +func wrapString(value string) *StringBox { + return &StringBox{Value: value} +} diff --git a/experimental/libbox/service_error.go b/experimental/libbox/service_error.go index 2f22574a..bb0593bf 100644 --- a/experimental/libbox/service_error.go +++ b/experimental/libbox/service_error.go @@ -13,12 +13,12 @@ func ClearServiceError() { os.Remove(serviceErrorPath()) } -func ReadServiceError() (string, error) { +func ReadServiceError() (*StringBox, error) { data, err := os.ReadFile(serviceErrorPath()) if err == nil { os.Remove(serviceErrorPath()) } - return string(data), err + return wrapString(string(data)), err } func WriteServiceError(message string) error {