Merge pull request vpenades#102 from Tridify/topic/prevent-merge-buffer-overflow

vpenades · web-flow · commit b4e0140ee874 · 2021-05-25T21:55:09.000+02:00
prevent buffer merge overflow
diff --git a/src/SharpGLTF.Core/Schema2/gltf.Buffer.cs b/src/SharpGLTF.Core/Schema2/gltf.Buffer.cs
@@ -261,7 +261,7 @@ public void MergeBuffers(int maxSize)
 
                 var alreadyFull = last.BufferSize >= maxSize;
                 var notEmpty = last.BufferSize > 0;
-                var bvTooBig = bv.Content.Count >= maxSize;
+                var bvTooBig = (long)bv.Content.Count + last.BufferSize >= maxSize;
 
                 if (alreadyFull || (notEmpty && bvTooBig))
                 {

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ public void MergeBuffers(int maxSize)`
`261`	`261`
`262`	`262`	`var alreadyFull = last.BufferSize >= maxSize;`
`263`	`263`	`var notEmpty = last.BufferSize > 0;`
`264`		`- var bvTooBig = bv.Content.Count >= maxSize;`
	`264`	`+ var bvTooBig = (long)bv.Content.Count + last.BufferSize >= maxSize;`
`265`	`265`
`266`	`266`	`if (alreadyFull \|\| (notEmpty && bvTooBig))`
`267`	`267`	`{`