Merge pull request #75 from AO-StreetArt/dev

Dev
AO-StreetArt · Jun 30, 2017 · 0c2a1d2 · 0c2a1d2
2 parents 1383f0e + 1b4d025
commit 0c2a1d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/aossl/logging/logging.cpp b/aossl/logging/logging.cpp
@@ -303,7 +303,9 @@ void LoggingCategory::debug(const char * msg)
   }
   else
   {
-    int_category->debug(name + "::" + msg);
+    if (msg) {
+      int_category->debug(name + "::" + msg);
+    }
   }
 }
 
@@ -315,7 +317,9 @@ void LoggingCategory::error(const char * msg)
   }
   else
   {
-    int_category->error(name + "::" + msg);
+    if (msg) {
+      int_category->error(name + "::" + msg);
+    }
   }
 }
 
@@ -327,7 +331,9 @@ void LoggingCategory::info(const char * msg)
   }
   else
   {
-    int_category->info(name + "::" + msg);
+    if (msg) {
+      int_category->info(name + "::" + msg);
+    }
   }
 }
 

diff --git a/aossl/zmq/zmqio.cpp b/aossl/zmq/zmqio.cpp
@@ -88,8 +88,10 @@ char * Zmqi::crecv() {
   zmqi->recv (request);
 
   // Take the data out of the message
-  rcv_cstr = new char [request->size()];
-  std::memcpy(rcv_cstr, request->data(), request->size());
+  if (request->size() > 0) {
+    rcv_cstr = new char [request->size()];
+    std::memcpy(rcv_cstr, request->data(), request->size());
+  }
 
   started = true;