Merge pull request #2 from Patch2PDF/nil-ptr-dereference

Jannik-Hm · web-flow · commit a2b90540790e · 2025-12-24T16:44:07.000+01:00
Nil ptr dereference
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.25.4
 
 require (
 	github.com/Patch2PDF/GDTF-Mesh-Reader v1.1.2
-	github.com/Patch2PDF/GDTF-Parser v0.2.1
+	github.com/Patch2PDF/GDTF-Parser v0.2.2
 	golang.org/x/sync v0.19.0
 )
 
diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/Patch2PDF/GDTF-Mesh-Reader v1.1.2 h1:4LHeQjH+cwRoXuv+O4X9YoJaZAO/DihGGN5t3jVIFFk=
 github.com/Patch2PDF/GDTF-Mesh-Reader v1.1.2/go.mod h1:4Uipj5UA1HhD3v032aSnEFlpItN80UY5zKB15mIeVwQ=
-github.com/Patch2PDF/GDTF-Parser v0.2.1 h1:FCyzL52Tx+wiS/NFLGbXgQSFSmc27evi8rOKfucBh5I=
-github.com/Patch2PDF/GDTF-Parser v0.2.1/go.mod h1:sXYpcmWKjVBL0JuRWyHwSFHRGzx6kex+HaS/vEPLZ2Y=
+github.com/Patch2PDF/GDTF-Parser v0.2.2 h1:MpUqTsRVxsgqfsM6oTFx1BPUgVL5TaAXfiomI2mMqYI=
+github.com/Patch2PDF/GDTF-Parser v0.2.2/go.mod h1:sXYpcmWKjVBL0JuRWyHwSFHRGzx6kex+HaS/vEPLZ2Y=
 github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
 github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/qmuntal/gltf v0.28.0 h1:C4A1temWMPtcI2+qNfpfRq8FEJxoBGUN3ZZM8BCc+xU=
diff --git a/internal/types/mvrxml/general.go b/internal/types/mvrxml/general.go
@@ -158,7 +158,7 @@ type ConvertToDestinationMapStruct[T any] interface {
 
 func ParseList[Source ConvertToDestinationStruct[Destination], Destination any](config ParseConfigData, source *[]Source) []Destination {
 	if source == nil {
-		return nil
+		return []Destination{}
 	}
 	var destination []Destination = make([]Destination, len(*source))
 	for index, element := range *source {
@@ -169,6 +169,9 @@ func ParseList[Source ConvertToDestinationStruct[Destination], Destination any](
 }
 
 func ParseMap[Source ConvertToDestinationMapStruct[Destination], Destination any](config ParseConfigData, source *[]Source) map[string]*Destination {
+	if source == nil {
+		return map[string]*Destination{}
+	}
 	destination := make(map[string]*Destination)
 	for _, element := range *source {
 		parsedElement := element.Parse(config)
diff --git a/mvr-parser.go b/mvr-parser.go
@@ -27,6 +27,9 @@ func ParseMVRZipReader(zipfile *zip.Reader, config MVRTypes.MVRParserConfig) (*M
 	}
 
 	// parse mvr xml
+	if fileMap["GeneralSceneDescription.xml"] == nil {
+		return nil, fmt.Errorf("Invalid MVR: missing GeneralSceneDescription.xml")
+	}
 	xmlFile, err := fileMap["GeneralSceneDescription.xml"].Open()
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.25.4`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/Patch2PDF/GDTF-Mesh-Reader v1.1.2`
`7`		`- github.com/Patch2PDF/GDTF-Parser v0.2.1`
	`7`	`+ github.com/Patch2PDF/GDTF-Parser v0.2.2`
`8`	`8`	`golang.org/x/sync v0.19.0`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ func ParseMVRZipReader(zipfile zip.Reader, config MVRTypes.MVRParserConfig) (M`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// parse mvr xml`
	`30`	`+ if fileMap["GeneralSceneDescription.xml"] == nil {`
	`31`	`+ return nil, fmt.Errorf("Invalid MVR: missing GeneralSceneDescription.xml")`
	`32`	`+ }`
`30`	`33`	`xmlFile, err := fileMap["GeneralSceneDescription.xml"].Open()`
`31`	`34`	`if err != nil {`
`32`	`35`	`return nil, err`