X-Git-Url: https://ruderich.org/simon/gitweb/?p=nsscash%2Fnsscash.git;a=blobdiff_plain;f=group.go;h=66da8f00551e32de8272a5b02b2fdb7c4006039f;hp=126ebb0dc349e0127c4ff14f3b61f48cb99cc737;hb=526f6f1db39bde8ca1f7684225a3983634bddafe;hpb=7adc7f83eddd37aa372aa10159128b6d16c4320a

diff --git a/group.go b/group.go
index 126ebb0..66da8f0 100644
--- a/group.go
+++ b/group.go
@@ -23,6 +23,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"math"
 	"sort"
 	"strconv"
 	"strings"
@@ -67,6 +68,11 @@ func ParseGroups(r io.Reader) ([]Group, error) {
 		t, err := s.ReadString('\n')
 		if err != nil {
 			if err == io.EOF {
+				if t != "" {
+					return nil, fmt.Errorf(
+						"no newline in last line: %q",
+						t)
+				}
 				break
 			}
 			return nil, err
@@ -130,6 +136,11 @@ func SerializeGroup(g Group) ([]byte, error) {
 	}
 	// And the group members concatenated as above
 	data.Write(mems.Bytes())
+	// Ensure the offsets can fit the length of this entry
+	if data.Len() > math.MaxUint16 {
+		return nil, fmt.Errorf("group too large to serialize: %v, %v",
+			data.Len(), g)
+	}
 	size := uint16(data.Len())
 
 	var res bytes.Buffer // serialized result