Malloc and strdup may fail. Check return value and handle the situation.

Author: BsAtHome

src/hal/user_comps/gs2_vfd.c

@@ -554,6 +554,8 @@ int main(int argc, char **argv)
                     goto out_noclose;
                 }
                 device = strdup(optarg);
+                if(!device)
+                    device  = "/dev/strdup/error_out_of_memory";
                 break;
             case 'g':
                 debug = 1;

src/hal/utils/halcmd_completion.c

@@ -541,6 +541,8 @@ static char *loadrt_generator(const char *text, int state) {
         if(startswith(ent->d_name, "rtapi.")) continue;
         if(strncmp(text, ent->d_name, len) != 0) continue;
         result = strdup(ent->d_name);
+        if(!result)
+            return NULL;
         result[strlen(result) - strlen(MODULE_EXT)] = 0;
         return result;
     }

src/hal/utils/halrmt.c

@@ -3395,6 +3395,10 @@ void *readClient(void *arg)
 
 //  res = 1;
   context = (connectionRecType *) malloc(sizeof(connectionRecType));
+  if(NULL == context) {
+    perror("readClient():malloc");
+    abort();  // There is no "clean" way. Ensure we make some noise.
+  }
   context->cliSock = client_sockfd;
   context->linked = 0;
   context->echo = 1;

src/libnml/linklist/linklist.cc

@@ -234,6 +234,10 @@ int LinkedList::store_at_head(void *_data, size_t _size, int _copy)
 
     if (_copy) {
 	last_data_stored = malloc(_size);
+        if(!last_data_stored) {
+            perror("LinkedList::store_at_head()");
+            return -1;
+        }
 	memcpy(last_data_stored, _data, _size);
 	last_size_stored = _size;
 	new_head = new LinkedListNode(last_data_stored, _size);
@@ -316,6 +320,10 @@ int LinkedList::store_at_tail(void *_data, size_t _size, int _copy)
 
     if (_copy) {
 	last_data_stored = malloc(_size);
+        if(!last_data_stored) {
+            perror("LinkedList::store_at_tail()");
+            return -1;
+        }
 	memcpy(last_data_stored, _data, _size);
 	last_size_stored = _size;
 	new_tail = new LinkedListNode(last_data_stored, _size);
@@ -419,6 +427,10 @@ int LinkedList::store_after_current_node(void *_data, size_t _size,
 
     if (_copy) {
 	last_data_stored = malloc(_size);
+        if(!last_data_stored) {
+            perror("LinkedList::store_after_current_node()");
+            return -1;
+        }
 	memcpy(last_data_stored, _data, _size);
 	last_size_stored = _size;
 	new_node = new LinkedListNode(last_data_stored, _size);
@@ -539,6 +551,10 @@ int LinkedList::store_before_current_node(void *_data, size_t _size,
 
     if (_copy) {
 	last_data_stored = malloc(_size);
+        if(!last_data_stored) {
+            perror("LinkedList::store_before_current_node()");
+            return -1;
+        }
 	memcpy(last_data_stored, _data, _size);
 	last_size_stored = _size;
 	new_node = new LinkedListNode(last_data_stored, _size);

src/libnml/os_intf/_sem.c

@@ -128,6 +128,10 @@ rcs_sem_t *rcs_sem_open(key_t name, int oflag, /* int mode */ ...)
        so we need to allocate space that users will free later with
        rcs_sem_close */
     retval = (rcs_sem_t *) malloc(sizeof(rcs_sem_t));
+    if(!retval) {
+        rcs_print_error("rcs_sem_open: %s\n", strerror(errno));
+        return NULL;
+    }
     *retval = semid;
     return retval;
 }