Stream might not have reached the end even if it doesn't return reque…

…sted amount of bytes
tonihele · Nov 4, 2023 · 28c2421 · 28c2421
1 parent 3c4af6f
commit 28c2421
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfUtils.java b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfUtils.java
@@ -428,18 +428,22 @@ private static void populateByteArray(byte[] array, LittleEndien stream, int cou
 
         if (dataLength == stride) {
             int length = end - index;
-            int read = stream.read(array, 0, length);
-            assertReadLength(read, length);
+            int n = 0;
+            while (n < length) {
+                int cnt = stream.read(array, n, length - n);
+                if (cnt < 0) {
+                    throw new AssetLoadException("Data ended prematurely");
+                }
+                n += cnt;
+            }
 
             return;
         }
 
         int arrayIndex = 0;
         byte[] buffer = new byte[numComponents];
         while (index < end) {
-            int read = stream.read(buffer, 0, numComponents);
-            assertReadLength(read, numComponents);
-
+            stream.read(buffer, 0, numComponents);
             System.arraycopy(buffer, 0, array, arrayIndex, numComponents);
             arrayIndex += numComponents;
             if (dataLength < stride) {
@@ -449,12 +453,6 @@ private static void populateByteArray(byte[] array, LittleEndien stream, int cou
         }
     }
 
-    private static void assertReadLength(int read, int length) {
-        if (read < length) {
-            throw new AssetLoadException("Data ended prematurely");
-        }
-    }
-
     private static void populateShortArray(short[] array, LittleEndien stream, int count, int byteOffset, int byteStride, int numComponents, VertexBuffer.Format format) throws IOException {
         int componentSize = format.getComponentSize();
         int index = byteOffset;