Merge pull request #2114 from jennifersp/master

jackc · web-flow · commit e9bd382c519c · 2024-08-26T07:28:47.000-05:00
add byte length check to uint32
diff --git a/pgtype/uint32.go b/pgtype/uint32.go
@@ -296,6 +296,10 @@ func (scanPlanBinaryUint32ToTextScanner) Scan(src []byte, dst any) error {
 		return s.ScanText(Text{})
 	}
 
+	if len(src) != 4 {
+		return fmt.Errorf("invalid length for uint32: %v", len(src))
+	}
+
 	n := uint64(binary.BigEndian.Uint32(src))
 	return s.ScanText(Text{String: strconv.FormatUint(n, 10), Valid: true})
 }

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,10 @@ func (scanPlanBinaryUint32ToTextScanner) Scan(src []byte, dst any) error {`
`296`	`296`	`return s.ScanText(Text{})`
`297`	`297`	`}`
`298`	`298`
	`299`	`+ if len(src) != 4 {`
	`300`	`+ return fmt.Errorf("invalid length for uint32: %v", len(src))`
	`301`	`+ }`
	`302`	`+`
`299`	`303`	`n := uint64(binary.BigEndian.Uint32(src))`
`300`	`304`	`return s.ScanText(Text{String: strconv.FormatUint(n, 10), Valid: true})`
`301`	`305`	`}`