[wpiutil] Fix RawFrame.setInfo() NPE (#6167)

wpilibsuite · Jan 6, 2024 · dd90965 · dd90965
1 parent 8659372
commit dd90965
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/RawFrame.java b/wpiutil/src/main/java/edu/wpi/first/util/RawFrame.java
@@ -17,7 +17,7 @@ public class RawFrame implements AutoCloseable {
   private int m_width;
   private int m_height;
   private int m_stride;
-  private PixelFormat m_pixelFormat;
+  private PixelFormat m_pixelFormat = PixelFormat.kUnknown;
 
   /** Construct a new empty RawFrame. */
   public RawFrame() {
@@ -102,7 +102,12 @@ public void setInfo(int width, int height, int stride, PixelFormat pixelFormat)
     m_stride = stride;
     m_pixelFormat = pixelFormat;
     WPIUtilJNI.setRawFrameInfo(
-        m_nativeObj, m_data.limit(), width, height, stride, pixelFormat.getValue());
+        m_nativeObj,
+        m_data != null ? m_data.limit() : 0,
+        width,
+        height,
+        stride,
+        pixelFormat.getValue());
   }
 
   /**
@@ -142,7 +147,7 @@ public long getDataPtr() {
    * @return The total size of the data stored in the frame.
    */
   public int getSize() {
-    return m_data.limit();
+    return m_data != null ? m_data.limit() : 0;
   }
 
   /**