Fixes a double-free issue in CloseProxmark: (#617)

- CloseProxmark now clears global state.

- CloseProxmark now checks for a non-null serial_port before calling uart_close, to avoid unintentional double-free'ing serial_port.

- main now calls CloseProxmark once.

diff --git a/client/comms.c b/client/comms.c
index eeaff79cda8857082a16d4e261c442f347018e8f..be0cfd103ba610c4b35e225bf28cf96949b739b2 100644 (file)
--- a/client/comms.c
+++ b/client/comms.c
@@ -334,13 +334,21 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 void CloseProxmark(void) {
        conn.run = false;
        pthread_join(USB_communication_thread, NULL);
 void CloseProxmark(void) {
        conn.run = false;
        pthread_join(USB_communication_thread, NULL);

-       uart_close(sp);
+
+       if (sp) {
+               uart_close(sp);
+       }
+

 #ifdef __linux__
        // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
        if (serial_port_name) {
                unlink(serial_port_name);
        }
 #endif
 #ifdef __linux__
        // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
        if (serial_port_name) {
                unlink(serial_port_name);
        }
 #endif

+
+       // Clean up our state
+       sp = NULL;
+       serial_port_name = NULL;

 }
 
 
 }
 
 

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 40c466130f03f645f2e69d6d76f4000b2c688346..6fb066e8a5dbdaf5e4b7c8bbda22eafd6f6c27b5 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -131,10 +131,6 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
        }
 
        write_history(".history");
        }
 
        write_history(".history");

-
-       if (usb_present) {
-               CloseProxmark();
-       }

        
        if (script_file) {
                fclose(script_file);
        
        if (script_file) {
                fclose(script_file);