Fix null pointer handling in drop_stream function to prevent potential crashes

kosiew · kosiew · commit 48b919c0dcf7 · 2025-09-02T12:35:18.000+08:00
diff --git a/src/dataframe.rs b/src/dataframe.rs
@@ -69,9 +69,11 @@ unsafe extern "C" fn drop_stream(capsule: *mut ffi::PyObject) {
     }
     let stream_ptr =
         ffi::PyCapsule_GetPointer(capsule, ARROW_STREAM_NAME.as_ptr()) as *mut FFI_ArrowArrayStream;
-    if !stream_ptr.is_null() {
-        drop(Box::from_raw(stream_ptr));
+    if stream_ptr.is_null() {
+        ffi::PyErr_Clear();
+        return;
     }
+    drop(Box::from_raw(stream_ptr));
 }
 
 // https://github.com/apache/datafusion-python/pull/1016#discussion_r1983239116

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,11 @@ unsafe extern "C" fn drop_stream(capsule: *mut ffi::PyObject) {`
`69`	`69`	`}`
`70`	`70`	`let stream_ptr =`
`71`	`71`	`ffi::PyCapsule_GetPointer(capsule, ARROW_STREAM_NAME.as_ptr()) as *mut FFI_ArrowArrayStream;`
`72`		`- if !stream_ptr.is_null() {`
`73`		`- drop(Box::from_raw(stream_ptr));`
	`72`	`+ if stream_ptr.is_null() {`
	`73`	`+ ffi::PyErr_Clear();`
	`74`	`+ return;`
`74`	`75`	`}`
	`76`	`+ drop(Box::from_raw(stream_ptr));`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`// https://github.com/apache/datafusion-python/pull/1016#discussion_r1983239116`