properly close the serial line on error

rscada · Feb 5, 2016 · 3d015fb · 3d015fb
1 parent 47f9f1b
commit 3d015fb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
@@ -115,13 +115,17 @@ main(int argc, char **argv)
     if (mbus_connect(handle) == -1)
     {
         fprintf(stderr,"Failed to setup connection to M-bus gateway\n");
+        mbus_disconnect(handle);
+        mbus_context_free(handle);
         free(addr_mask);
         return 1;
     }
 
     if (mbus_serial_set_baudrate(handle, baudrate) == -1)
     {
         fprintf(stderr, "Failed to set baud rate.\n");
+        mbus_disconnect(handle);
+        mbus_context_free(handle);
         free(addr_mask);
         return 1;
     }
@@ -132,6 +136,8 @@ main(int argc, char **argv)
     if (frame == NULL)
     {
         fprintf(stderr, "Failed to allocate mbus frame.\n");
+        mbus_disconnect(handle);
+        mbus_context_free(handle);
         free(addr_mask);
         return 1;
     }