X-Git-Url: https://ruderich.org/simon/gitweb/?p=nsscash%2Fnsscash.git;a=blobdiff_plain;f=passwd.go;h=54da63b3f30252f65e5c1717318b683686a037c1;hp=2698765212e0975738ebc8d8273140daee528816;hb=7adc7f83eddd37aa372aa10159128b6d16c4320a;hpb=c6b898ea9ab372c58c59658c2acf17ea831d71db diff --git a/passwd.go b/passwd.go index 2698765..54da63b 100644 --- a/passwd.go +++ b/passwd.go @@ -86,7 +86,7 @@ func ParsePasswds(r io.Reader) ([]Passwd, error) { return res, nil } -func SerializePasswd(p Passwd) []byte { +func SerializePasswd(p Passwd) ([]byte, error) { // Concatenate all (NUL-terminated) strings and store the offsets var data bytes.Buffer data.Write([]byte(p.Name)) @@ -138,7 +138,7 @@ func SerializePasswd(p Passwd) []byte { // struct are 8 byte aligned alignBufferTo(&res, 8) - return res.Bytes() + return res.Bytes(), nil } func SerializePasswds(w io.Writer, pws []Passwd) error { @@ -148,7 +148,11 @@ func SerializePasswds(w io.Writer, pws []Passwd) error { for _, p := range pws { // TODO: warn about duplicate entries offsets[p] = uint64(data.Len()) - data.Write(SerializePasswd(p)) + x, err := SerializePasswd(p) + if err != nil { + return err + } + data.Write(x) } // Copy to prevent sorting from modifying the argument