fix(go/adbc/pkg): guard against potential crash

We think malloc'ing a C struct is one possible way the Go garbage collector may still be seeing invalid Go pointers. See apache#1931.
lidavidm · Jun 25, 2024 · a09da62 · a09da62
1 parent c1ad8df
commit a09da62
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/go/adbc/pkg/_tmpl/driver.go.tmpl b/go/adbc/pkg/_tmpl/driver.go.tmpl
@@ -98,7 +98,7 @@ func setErrWithDetails(err *C.struct_AdbcError, adbcError adbc.Error) {
 		return
 	}
 
-	cErrPtr := C.malloc(C.sizeof_struct_{{.Prefix}}Error)
+	cErrPtr := C.calloc(C.sizeof_struct_{{.Prefix}}Error, C.size_t(1))
 	cErr := (*C.struct_{{.Prefix}}Error)(cErrPtr)
 	cErr.message = C.CString(adbcError.Msg)
 	err.message = cErr.message
@@ -209,7 +209,7 @@ func printLoggingHelp() {
 // handle.
 func createHandle(hndl cgo.Handle) unsafe.Pointer {
 	// uintptr_t* hptr = malloc(sizeof(uintptr_t));
-	hptr := (*C.uintptr_t)(C.malloc(C.sizeof_uintptr_t))
+	hptr := (*C.uintptr_t)(C.calloc(C.sizeof_uintptr_t, C.size_t(1)))
 	// *hptr = (uintptr)hndl;
 	*hptr = C.uintptr_t(uintptr(hndl))
 	return unsafe.Pointer(hptr)

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