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

diff --git a/group.go b/group.go
index 126ebb0..4741171 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
@@ -183,7 +194,7 @@ func SerializeGroups(w io.Writer, grs []Group) error {
 	tmp := make([]byte, 8)
 
 	// Create index "sorted" in input order, used when iterating over all
-	// passwd entries (getgrent_r); keeping the original order makes
+	// group entries (getgrent_r); keeping the original order makes
 	// debugging easier
 	var indexOrig bytes.Buffer
 	for _, g := range grs {