Fix potential segfault in MSGQPubSocket::connect (emmertex#45)

pasteur90 · May 20, 2020 · c1a6d75 · c1a6d75
1 parent 67fae6a
commit c1a6d75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/messaging/impl_msgq.cc b/messaging/impl_msgq.cc
@@ -143,7 +143,11 @@ int MSGQPubSocket::connect(Context *context, std::string endpoint){
   assert(context);
 
   q = new msgq_queue_t;
-  msgq_new_queue(q, endpoint.c_str(), DEFAULT_SEGMENT_SIZE);
+  int r = msgq_new_queue(q, endpoint.c_str(), DEFAULT_SEGMENT_SIZE);
+  if (r != 0){
+    return r;
+  }
+
   msgq_init_publisher(q);
 
   return 0;

diff --git a/messaging/msgq.cc b/messaging/msgq.cc
@@ -90,8 +90,10 @@ int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size){
   auto fd = open(full_path, O_RDWR | O_CREAT, 0777);
   delete[] full_path;
 
-  if (fd < 0)
+  if (fd < 0) {
+    std::cout << "Warning, could not open: " << full_path << std::endl;
     return -1;
+  }
 
   int rc = ftruncate(fd, size + sizeof(msgq_header_t));
   if (rc < 0)