From b984dac55bdd0a5b694837fb8fb2ceb07ce9808f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期二, 07 九月 2021 11:25:57 +0800
Subject: [PATCH] resize the buf allocation to dynamic buf.

---
 src/bh_api.cpp |  110 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/src/bh_api.cpp b/src/bh_api.cpp
index 5b24903..4a3b7a8 100644
--- a/src/bh_api.cpp
+++ b/src/bh_api.cpp
@@ -154,30 +154,29 @@
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
     
+    return false;
   }
 
 #if defined(PRO_DE_SERIALIZE)
-    ::bhome_msg::MsgCommonReply mcr;
-    mcr.mutable_errmsg()->set_errcode(::bhome_msg::ErrorCode(rv));
-    mcr.mutable_errmsg()->set_errstring(errString);
-    *reply_len = mcr.ByteSizeLong();
-    *reply = malloc(*reply_len);
-    mcr.SerializePartialToArray(*reply, *reply_len);
+  ::bhome_msg::MsgCommonReply mcr;
+  mcr.mutable_errmsg()->set_errcode(::bhome_msg::ErrorCode(rv));
+  mcr.mutable_errmsg()->set_errstring(errString);
+  *reply_len = mcr.ByteSizeLong();
+  *reply = malloc(*reply_len);
+  mcr.SerializePartialToArray(*reply, *reply_len);
 #else 
-    min = strlen(errString) + 1;
-    buf = malloc(min) ;
-    memcpy(buf, errString, strlen(errString));
-    *((char *)buf + min - 1) = '\0';
-    
-    *reply = buf;
-    *reply_len = min;
+  min = strlen(errString) + 1;
+  buf = malloc(min) ;
+  memcpy(buf, errString, strlen(errString));
+  *((char *)buf + min - 1) = '\0';
+  
+  *reply = buf;
+  *reply_len = min;
     
 #endif 
-  
-  if (rv == 0)
-    return true;
 
-  return false;
+  return true;
+
 }
 
 int BHUnregister(const void *proc_info, const int proc_info_len, void **reply, int *reply_len, const int timeout_ms)
@@ -256,6 +255,8 @@
     rv = EBUS_RES_BUSY;
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
+    
+    return false;
   }
   
 #if defined(PRO_DE_SERIALIZE)
@@ -275,10 +276,8 @@
   *reply_len = min;
 #endif 
   
-  if (rv == 0)
-    return true;
-
-  return false;
+  return true;
+  
 }
 
 int BHRegisterTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
@@ -392,6 +391,8 @@
     rv = EBUS_RES_BUSY;
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
+    
+    return false;
   }
 
 #if defined(PRO_DE_SERIALIZE)
@@ -411,10 +412,8 @@
   *reply_len = len;
 #endif 
   
-  if (rv == 0)
-    return true;
+  return true;
 
-  return false;
 }
 
 int BHQueryTopicAddress(const void *remote, const int remote_len, const void *topic, const int topic_len, void **reply, int *reply_len, const int timeout_ms)
@@ -499,6 +498,8 @@
     rv = EBUS_RES_BUSY;
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
+    
+    return false;
   }
 	
 #if defined(PRO_DE_SERIALIZE)
@@ -565,10 +566,8 @@
   
 #endif 
   
-  if (rv == 0)
-    return true;
+  return true;
 
-  return false;
 }
 
 int BHQueryProcs(const void *remote, const int remote_len, const void *query, const int query_len, void **reply, int *reply_len, const int timeout_ms)
@@ -646,6 +645,8 @@
     rv = EBUS_RES_BUSY;
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
+    
+    return false;
   }
   
 #if defined(PRO_DE_SERIALIZE)
@@ -730,10 +731,7 @@
   }
 #endif 
 
-	if (rv == 0)
-    return true;
-
-  return false;
+  return true;
 
 }
 
@@ -860,6 +858,8 @@
     rv = EBUS_RES_BUSY;
     memset(errString, 0x00, sizeof(errString));
     strncpy(errString, bus_strerror(rv), sizeof(errString));
+    
+    return false;
   }
 
 #if defined(PRO_DE_SERIALIZE)
@@ -879,10 +879,7 @@
   *reply_len = len;
 #endif 
   
-  if (rv == 0)
-    return true;
-
-  return false;
+  return true;
 
 }
 
@@ -1515,13 +1512,26 @@
         memcpy(*proc_id, rr.proc_id.c_str(), *proc_id_len);
       }
 
-      memset(buf_temp, 0x00, sizeof(buf_temp));
-      memcpy(buf_temp, buf, size);
-      rr.data = buf_temp;
+      topics_buf = (char *)malloc(size);
+      if (topics_buf == NULL) {
+        
+        rv = EBUS_NO_MEM;
+        memset(errString, 0x00, sizeof(errString));
+        strncpy(errString, bus_strerror(rv), sizeof(errString));
+        
+        logger->error("in BHRequest: Out of memory!\n");
+        
+        pthread_mutex_unlock(&mutex);
+
+        return false;
+      }
+      memset(topics_buf, 0x00, size);
+      
+      memcpy(topics_buf, buf, size);
+      rr.data = topics_buf;
       
       free(buf);
-      
-      printf("BHRequest finished_7\n");
+      free(topics_buf);
     }
     
     pthread_mutex_unlock(&mutex);
@@ -1533,16 +1543,18 @@
     strncpy(errString, bus_strerror(rv), sizeof(errString));
   }
 
-#if defined(PRO_DE_SERIALIZE)   
-  ::bhome_msg::MsgRequestTopicReply mrt; 
-  mrt.mutable_errmsg()->set_errcode(::bhome_msg::ErrorCode(rv));
-  mrt.mutable_errmsg()->set_errstring(errString);
-  mrt.set_data(rr.data.data());
-  *reply_len = mrt.ByteSizeLong();
-  *reply = malloc(*reply_len);
-  mrt.SerializePartialToArray(*reply, *reply_len);
+#if defined(PRO_DE_SERIALIZE) 
+  if (rv == 0) {
+    ::bhome_msg::MsgRequestTopicReply mrt; 
+    mrt.mutable_errmsg()->set_errcode(::bhome_msg::ErrorCode(rv));
+    mrt.mutable_errmsg()->set_errstring(errString);
+    mrt.set_data(rr.data.data());
+    *reply_len = mrt.ByteSizeLong();
+    *reply = malloc(*reply_len);
+    mrt.SerializePartialToArray(*reply, *reply_len);
+  }
 #else 
-  if (rv > 0) {
+  if (rv == 0) {
     min = strlen(errString) + 1;
     buf = malloc(min);
     memcpy(buf, errString, strlen(errString));

--
Gitblit v1.8.0