Fix?

apache · Aug 28, 2023 · 5472fd1 · 5472fd1
1 parent e265f17
commit 5472fd1
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 12 deletions.
diff --git a/c/driver_manager/adbc_driver_manager.cc b/c/driver_manager/adbc_driver_manager.cc
@@ -642,8 +642,12 @@ const struct AdbcError* AdbcErrorFromArrayStream(struct ArrowArrayStream* stream
     return nullptr;
   }
   auto* private_data = reinterpret_cast<struct ErrorArrayStream*>(stream->private_data);
-  return private_data->private_driver->ErrorFromArrayStream(&private_data->stream,
-                                                            status);
+  auto* error =
+      private_data->private_driver->ErrorFromArrayStream(&private_data->stream, status);
+  if (error) {
+    const_cast<struct AdbcError*>(error)->private_driver = private_data->private_driver;
+  }
+  return error;
 }
 
 #define INIT_ERROR(ERROR, SOURCE)                                    \

diff --git a/go/adbc/drivermgr/adbc_driver_manager.cc b/go/adbc/drivermgr/adbc_driver_manager.cc
@@ -642,8 +642,12 @@ const struct AdbcError* AdbcErrorFromArrayStream(struct ArrowArrayStream* stream
     return nullptr;
   }
   auto* private_data = reinterpret_cast<struct ErrorArrayStream*>(stream->private_data);
-  return private_data->private_driver->ErrorFromArrayStream(&private_data->stream,
-                                                            status);
+  auto* error =
+      private_data->private_driver->ErrorFromArrayStream(&private_data->stream, status);
+  if (error) {
+    const_cast<struct AdbcError*>(error)->private_driver = private_data->private_driver;
+  }
+  return error;
 }
 
 #define INIT_ERROR(ERROR, SOURCE)                                    \

diff --git a/go/adbc/pkg/_tmpl/driver.go.tmpl b/go/adbc/pkg/_tmpl/driver.go.tmpl
@@ -263,7 +263,7 @@ func (cStream *cArrayStream) maybeError() C.int {
 		if cStream.adbcErr != nil {
 			C.{{.Prefix}}errRelease(cStream.adbcErr)
 		} else {
-			cStream.adbcErr = (*C.struct_AdbcError)(C.malloc(C.ADBC_ERROR_1_1_0_SIZE))
+			cStream.adbcErr = (*C.struct_AdbcError)(C.calloc(1, C.ADBC_ERROR_1_1_0_SIZE))
 		}
 		cStream.adbcErr.vendor_code = C.ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA
 		cStream.status = C.AdbcStatusCode(errToAdbcErr(cStream.adbcErr, err))

diff --git a/go/adbc/pkg/_tmpl/utils.h.tmpl b/go/adbc/pkg/_tmpl/utils.h.tmpl
@@ -83,7 +83,10 @@ AdbcStatusCode {{.Prefix}}StatementSetSubstraitPlan(struct AdbcStatement* stmt,
 AdbcStatusCode {{.Prefix}}DriverInit(int version, void* rawDriver, struct AdbcError* err);
 
 static inline void {{.Prefix}}errRelease(struct AdbcError* error) {
-  error->release(error);
+  if (error->release) {
+    error->release(error);
+    error->release = NULL;
+  }
 }
 
 void {{.Prefix}}_release_error(struct AdbcError* error);

diff --git a/go/adbc/pkg/flightsql/driver.go b/go/adbc/pkg/flightsql/driver.go
diff --git a/go/adbc/pkg/flightsql/utils.h b/go/adbc/pkg/flightsql/utils.h
diff --git a/go/adbc/pkg/panicdummy/driver.go b/go/adbc/pkg/panicdummy/driver.go
diff --git a/go/adbc/pkg/panicdummy/utils.h b/go/adbc/pkg/panicdummy/utils.h
diff --git a/go/adbc/pkg/snowflake/driver.go b/go/adbc/pkg/snowflake/driver.go
diff --git a/go/adbc/pkg/snowflake/utils.h b/go/adbc/pkg/snowflake/utils.h