fix memory double free

Signed-off-by: Cai Zhang <[email protected]>

Author: xiaocai2333

arrow/cdata/cdata.go

@@ -408,11 +408,6 @@ func (imp *cimporter) doImportChildren() error {
 		for i, c := range children {
 			imp.children[i].dt = st.Field(i).Type
 			if err := imp.children[i].importChild(imp, c); err != nil {
-				for j := 0; j < i; j++ {
-					if imp.children[j].data != nil {
-						imp.children[j].data.Release()
-					}
-				}
 				return err
 			}
 		}
@@ -436,11 +431,6 @@ func (imp *cimporter) doImportChildren() error {
 		for i, c := range children {
 			imp.children[i].dt = dt.Fields()[i].Type
 			if err := imp.children[i].importChild(imp, c); err != nil {
-				for j := 0; j < i; j++ {
-					if imp.children[j].data != nil {
-						imp.children[j].data.Release()
-					}
-				}
 				return err
 			}
 		}
@@ -449,11 +439,6 @@ func (imp *cimporter) doImportChildren() error {
 		for i, c := range children {
 			imp.children[i].dt = dt.Fields()[i].Type
 			if err := imp.children[i].importChild(imp, c); err != nil {
-				for j := 0; j < i; j++ {
-					if imp.children[j].data != nil {
-						imp.children[j].data.Release()
-					}
-				}
 				return err
 			}
 		}
@@ -484,8 +469,10 @@ func (imp *cimporter) doImportArr(src *CArrowArray) error {
 	// memory that we have to track the lifetime of.
 	defer func() {
 		if imp.alloc.bufCount.Load() == 0 {
-			C.ArrowArrayRelease(imp.arr)
-			C.free(unsafe.Pointer(imp.arr))
+			if C.ArrowArrayIsReleased(imp.arr) == 0 {
+				C.ArrowArrayRelease(imp.arr)
+				C.free(unsafe.Pointer(imp.arr))
+			}
 		}
 	}()
 
@@ -495,20 +482,13 @@ func (imp *cimporter) doImportArr(src *CArrowArray) error {
 // import is called recursively as needed for importing an array and its children
 // in order to generate array.Data objects
 func (imp *cimporter) doImport() error {
-	// move the array from the src object passed in to the one referenced by
-	// this importer. That way we can set up a finalizer on the created
-	// arrow.ArrayData object so we clean up our Array's memory when garbage collected.
-	defer func(arr *CArrowArray) {
-		// this should only occur in the case of an error happening
-		// during import, at which point we need to clean up the
-		// ArrowArray struct we allocated.
-		if imp.data == nil {
-			C.free(unsafe.Pointer(arr))
-		}
-	}(imp.arr)
-
 	// import any children
 	if err := imp.doImportChildren(); err != nil {
+		for _, c := range imp.children {
+			if c.data != nil {
+				c.data.Release()
+			}
+		}
 		return err
 	}
 

arrow/cdata/cdata_test.go

@@ -834,7 +834,6 @@ func TestImportDenseUnionWithInvalidSchema(t *testing.T) {
 	defer freeTestMallocatorArr(carr, mem)
 
 	unionSc := testUnion([]string{"+ud:5,10", "i", "u"}, []string{"", "u0", "u1"}, []int64{0, flagIsNullable, flagIsNullable})
-	defer freeMallocedSchemas(unionSc)
 
 	structSc := testStruct([]string{"+s", "+ud:5,10"}, []string{"", "union_field"}, []int64{0, 0})
 	defer freeMallocedSchemas(structSc)
@@ -886,7 +885,6 @@ func TestImportSPARSEUnionWithInvalidSchema(t *testing.T) {
 	defer freeTestMallocatorArr(carr, mem)
 
 	unionSc := testUnion([]string{"+us:5,10", "i", "u"}, []string{"", "u0", "u1"}, []int64{0, flagIsNullable, flagIsNullable})
-	defer freeMallocedSchemas(unionSc)
 
 	structSc := testStruct([]string{"+s", "+us:5,10"}, []string{"", "union_field"}, []int64{0, 0})
 	defer freeMallocedSchemas(structSc)