Merge pull request #46541 from furdarius:master

PiperOrigin-RevId: 360673379
Change-Id: I286d4970e142472b54425d456bed985cc9a09373

tensorflow/go/tensor.go

@@ -95,8 +95,17 @@ func NewTensor(value interface{}) (*Tensor, error) {
 		c:     C.TF_AllocateTensor(C.TF_DataType(dataType), shapePtr, C.int(len(shape)), C.size_t(nbytes)),
 		shape: shape,
 	}
-	runtime.SetFinalizer(t, (*Tensor).finalize)
+
 	raw := tensorData(t.c)
+
+	runtime.SetFinalizer(t, func(t *Tensor) {
+		if dataType == String {
+			t.clearTStrings(raw, nflattened)
+		}
+
+		t.finalize()
+	})
+
 	buf := bytes.NewBuffer(raw[:0:len(raw)])
 
 	if isAllArray(val.Type()) {
@@ -206,6 +215,14 @@ func newTensorFromC(c *C.TF_Tensor) *Tensor {
 	return t
 }
 
+func (t *Tensor) clearTStrings(raw []byte, n int64) {
+	tstrs := (*(*[]C.TF_TString)(unsafe.Pointer(&raw)))[:n]
+
+	for _, tstr := range tstrs {
+		C.TF_TString_Dealloc(&tstr)
+	}
+}
+
 func (t *Tensor) finalize() { C.TF_DeleteTensor(t.c) }
 
 // DataType returns the scalar datatype of the Tensor.