Fix copyBufferFromSource throwing an exception

Clarvel · web-flow · commit f260a11a0f64 · 2023-07-30T15:32:56.000-05:00
If usedBuffers was null and the buffer cache reached its maximum size, copyBufferFromSource would throw a null reference error. This adds a null check to that case to instantiate the usedBuffers list as is done elsewhere in this file.
diff --git a/core/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
@@ -823,11 +823,10 @@ public void copyBufferFromSource(Object natRef, ByteBuffer byteBuf,
     } else {
       // The buffer cache reached the maximum size, so we just dispose
       // the new buffer by adding it to the list of used buffers.
-      try {
-        usedBuffers.add(new BufferData(natRef, byteBuf.asIntBuffer(), w, h));
-      } catch (Exception e) {
-        e.printStackTrace();
+      if (usedBuffers == null) {
+        usedBuffers = new LinkedList<BufferData>();
       }
+      usedBuffers.add(new BufferData(natRef, byteBuf.asIntBuffer(), w, h));
     }
   }
 
@@ -1667,4 +1666,4 @@ void dispose() {
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -823,11 +823,10 @@ public void copyBufferFromSource(Object natRef, ByteBuffer byteBuf,`
`823`	`823`	`} else {`
`824`	`824`	`// The buffer cache reached the maximum size, so we just dispose`
`825`	`825`	`// the new buffer by adding it to the list of used buffers.`
`826`		`- try {`
`827`		`- usedBuffers.add(new BufferData(natRef, byteBuf.asIntBuffer(), w, h));`
`828`		`- } catch (Exception e) {`
`829`		`- e.printStackTrace();`
	`826`	`+ if (usedBuffers == null) {`
	`827`	`+ usedBuffers = new LinkedList<BufferData>();`
`830`	`828`	`}`
	`829`	`+ usedBuffers.add(new BufferData(natRef, byteBuf.asIntBuffer(), w, h));`
`831`	`830`	`}`
`832`	`831`	`}`
`833`	`832`
`@@ -1667,4 +1666,4 @@ void dispose() {`
`1667`	`1666`	`}`
`1668`	`1667`	`}`
`1669`	`1668`	`}`
`1670`		`-}`
	`1669`	`+}`