nsscash: handle errors in SerializePasswd(), SerializeGroup()

No such errors are defined yet.

diff --git a/group.go b/group.go
index 214f91438d78740a331c487cbfe5ecab1355718c..126ebb0dc349e0127c4ff14f3b61f48cb99cc737 100644 (file)
--- a/group.go
+++ b/group.go
@@ -102,7 +102,7 @@ func ParseGroups(r io.Reader) ([]Group, error) {
        return res, nil
 }
 
-func SerializeGroup(g Group) []byte {
+func SerializeGroup(g Group) ([]byte, error) {
        le := binary.LittleEndian
 
        // Concatenate all (NUL-terminated) strings and store the offsets
@@ -158,7 +158,7 @@ func SerializeGroup(g Group) []byte {
        // struct are 8 byte aligned
        alignBufferTo(&res, 8)
 
-       return res.Bytes()
+       return res.Bytes(), nil
 }
 
 func SerializeGroups(w io.Writer, grs []Group) error {
@@ -168,7 +168,11 @@ func SerializeGroups(w io.Writer, grs []Group) error {
        for _, g := range grs {
                // TODO: warn about duplicate entries
                offsets[toKey(g)] = uint64(data.Len())
-               data.Write(SerializeGroup(g))
+               x, err := SerializeGroup(g)
+               if err != nil {
+                       return err
+               }
+               data.Write(x)
        }
 
        // Copy to prevent sorting from modifying the argument

diff --git a/passwd.go b/passwd.go
index 2698765212e0975738ebc8d8273140daee528816..54da63b3f30252f65e5c1717318b683686a037c1 100644 (file)
--- 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