From 2b1f534ea407a8ec0b94e0389a360f6cdff54598 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 08 九月 2021 14:02:38 +0800
Subject: [PATCH] call C.BHFree after return success
---
api/bhsgo/bhome_node.go | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index 16a5349..ebc9911 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -27,8 +27,8 @@
creply_len := C.int(0)
r := C.BHRegister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -40,8 +40,8 @@
creply_len := C.int(0)
r := C.BHRegisterTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -53,8 +53,8 @@
creply_len := C.int(0)
r := C.BHSubscribeTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -66,8 +66,8 @@
creply_len := C.int(0)
r := C.BHSubscribeNetTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -79,8 +79,8 @@
creply_len := C.int(0)
r := C.BHHeartbeat(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -96,8 +96,8 @@
creply_len := C.int(0)
r := C.BHUnregister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -110,8 +110,8 @@
creply_len := C.int(0)
r := C.BHQueryTopicAddress(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -125,8 +125,8 @@
creply_len := C.int(0)
r := C.BHQueryProcs(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -147,10 +147,13 @@
r := C.BHReadSub(&cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(cpid, cpid_len)
- defer C.BHFree(creply, creply_len)
- *proc_id = string(C.GoBytes(cpid, cpid_len))
- pub.Unmarshal(C.GoBytes(creply, creply_len))
+ if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
+ *proc_id = string(C.GoBytes(cpid, cpid_len))
+ pub.Unmarshal(C.GoBytes(creply, creply_len))
+ }
+
return r
}
@@ -161,8 +164,8 @@
creply_len := C.int(0)
r := C.BHAsyncRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len) > 0
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(creply, creply_len)
*msg_id = C.GoBytes(creply, creply_len)
}
return r
@@ -178,9 +181,9 @@
creply_len := C.int(0)
r := C.BHRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0
- defer C.BHFree(cpid, cpid_len)
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
*proc_id = string(C.GoBytes(cpid, cpid_len))
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -195,9 +198,9 @@
creply_len := C.int(0)
r := C.BHReadRequest(&cpid, &cpid_len, &creply, &creply_len, psrc, C.int(timeout_ms)) > 0
- defer C.BHFree(cpid, cpid_len)
- defer C.BHFree(creply, creply_len)
if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
*proc_id = string(C.GoBytes(cpid, cpid_len))
req.Unmarshal(C.GoBytes(creply, creply_len))
}
--
Gitblit v1.8.0