third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x/model: copy text in UnmarshalText

Browse Source
This commit is contained in:
Blake Mizerany 2024-04-07 10:16:55 -07:00
parent 6ba495d4a3
commit 07f27312fa
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x/model/name.go
View File

@ -11,7 +11,6 @@ import (
"slices" "slices"
"strings" "strings"
"sync" "sync"
"unsafe"
"github.com/ollama/ollama/x/types/structs" "github.com/ollama/ollama/x/types/structs"
) )
@ -333,14 +332,10 @@ func (r *Name) UnmarshalText(text []byte) error {
// the immutability of the Name. // the immutability of the Name.
return errors.New("model.Name: UnmarshalText on valid Name") return errors.New("model.Name: UnmarshalText on valid Name")
} }
// unsafeString is safe here because the contract of UnmarshalText
// that text belongs to us for the duration of the call.
*r = ParseName(unsafeString(text))
return nil
}
func unsafeString(b []byte) string { // The contract of UnmarshalText is that we copy to keep the text.
return *(*string)(unsafe.Pointer(&b)) *r = ParseName(string(text))
return nil
} }
// Complete reports whether the Name is fully qualified. That is it has a // Complete reports whether the Name is fully qualified. That is it has a