add allocation error handling

bin/mbus-serial-scan-secondary.c

@@ -25,7 +25,7 @@ static int debug = 0;
 int
 main(int argc, char **argv)
 {
-    char *device, *addr_mask;
+    char *device, *addr_mask = NULL;
     int baudrate = 9600;
     mbus_handle *handle = NULL;
     mbus_frame *frame = NULL, reply;
@@ -95,28 +95,38 @@ main(int argc, char **argv)
         mbus_register_send_event(&mbus_dump_send_event);
         mbus_register_recv_event(&mbus_dump_recv_event);
     }
+    
+    if (addr_mask == NULL)
+    {
+        fprintf(stderr, "Failed to allocate address mask.\n");
+        return 1;
+    }
  
     if (strlen(addr_mask) != 16)
     {
         fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n");
+        free(addr_mask);
         return 1;
     }
 
     if ((handle = mbus_context_serial(device)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
+        free(addr_mask);
         return 1;
     }
 
     if (mbus_connect(handle) == -1)
     {
         printf("Failed to setup connection to M-bus gateway\n");
+        free(addr_mask);
         return 1;
     }
 
     if (mbus_serial_set_baudrate(handle, baudrate) == -1)
     {
         fprintf(stderr, "Failed to set baud rate.\n");
+        free(addr_mask);
         return 1;
     }
 
@@ -126,6 +136,7 @@ main(int argc, char **argv)
     if (frame == NULL)
     {
         fprintf(stderr, "Failed to allocate mbus frame.\n");
+        free(addr_mask);
         return 1;
     }
 

bin/mbus-serial-select-secondary.c

@@ -26,7 +26,7 @@ main(int argc, char **argv)
 {
     mbus_handle *handle;
     mbus_frame reply;
-    char *device, *addr;
+    char *device, *addr = NULL;
     int ret, baudrate = 9600;
 
     if (argc == 3)
@@ -46,6 +46,12 @@ main(int argc, char **argv)
         fprintf(stderr, "    optional flag -b for selecting baudrate\n");
         return 0;
     }
+    
+    if (addr == NULL)
+    {
+        fprintf(stderr, "Failed to allocate address.\n");
+        return 1;
+    }
  
     if (strlen(addr) != 16)
     {

bin/mbus-tcp-scan-secondary.c

@@ -25,7 +25,7 @@ static int debug = 0;
 int
 main(int argc, char **argv)
 {
-    char *host, *addr_mask;
+    char *host, *addr_mask = NULL;
     int port;
     mbus_handle *handle = NULL;
     mbus_frame *frame = NULL, reply;
@@ -50,6 +50,12 @@ main(int argc, char **argv)
     {
         addr_mask = strdup("FFFFFFFFFFFFFFFF");
     }
+    
+    if (addr_mask == NULL)
+    {
+        fprintf(stderr, "Failed to allocate address mask.\n");
+        return 1;
+    }
 
     if (strlen(addr_mask) != 16)
     {
@@ -97,8 +103,7 @@ main(int argc, char **argv)
 
     if (mbus_send_frame(handle, frame) == -1)
     {
-        fprintf(stderr, "Failed to send SND_NKE #2.\n");
-        mbus_frame_free(frame);
+        free(addr_mask);
         return 1;
     }
 

bin/mbus-tcp-select-secondary.c

@@ -26,7 +26,7 @@ main(int argc, char **argv)
 {
     mbus_handle *handle;
     mbus_frame reply;
-    char *host, *addr;
+    char *host, *addr = NULL;
     int port, ret;
 
     if (argc != 4)
@@ -37,9 +37,14 @@ main(int argc, char **argv)
  
     host = argv[1];   
     port = atoi(argv[2]);
-    addr = strdup(argv[3]);
+    
+    if ((addr = strdup(argv[3])) == NULL)
+    {
+        fprintf(stderr, "Failed to allocate address.\n");
+        return 1;
+    }
 
-    if (strlen(argv[3]) != 16)
+    if (strlen(addr) != 16)
     {
         printf("Misformatted secondary address. Must be 16 character HEX number.\n");
         return 1;