X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ad5bc8cc8c0a6573d6b2c7bc58bf94f7ab66ad4c..bdf387c7ef7d9c2c30c06a1c26583e1326504a94:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index 0bd8ff9d..14674016 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -104,7 +104,6 @@ static void *uart_receiver(void *targ) { txcmd_pending = false; } } - pthread_exit(NULL); return NULL; } @@ -115,7 +114,6 @@ static void *main_loop(void *targ) { char *cmd = NULL; pthread_t reader_thread; - if (arg->usb_present == 1) { rarg.run = 1; pthread_create(&reader_thread, NULL, &uart_receiver, &rarg); @@ -168,9 +166,10 @@ static void *main_loop(void *targ) { // this one should pick up all non-null cmd... // why is there a if (cmd) { - - while(cmd[strlen(cmd) - 1] == ' ') - cmd[strlen(cmd) - 1] = 0x00; + if (strlen(cmd) > 0) { + while(cmd[strlen(cmd) - 1] == ' ') + cmd[strlen(cmd) - 1] = 0x00; + } if (cmd[0] != 0x00) { int ret = CommandReceived(cmd); @@ -248,8 +247,7 @@ int main(int argc, char* argv[]) { pthread_t main_loop_threat; - - sp = uart_open(argv[1]); + sp = uart_open(argv[1]); if (sp == INVALID_SERIAL_PORT) { printf("ERROR: invalid serial port\n"); marg.usb_present = 0;