X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/87b28d31a1ab21d97e2b9589e2392fc7c6a31599..c0bab227ad7a8248b2cc34c2de695e121bd0c429:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 83b58247..70e09ada 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -127,8 +127,8 @@ static void *main_loop(void *targ) {
 	while(1)  {
 
 		// If there is a script file
-		if (script_file)
-		{
+		if (script_file) {
+			
 			if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
 				fclose(script_file);
 				script_file = NULL;
@@ -142,9 +142,10 @@ static void *main_loop(void *targ) {
 				
 				if (nl)
 					*nl = '\0';
-
-				if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
-					memset(cmd, 0, strlen(script_cmd_buf));
+				
+				int newlen = strlen(script_cmd_buf);
+				if ((cmd = (char*) malloc( newlen + 1)) != NULL) {
+					memset(cmd, 0x00, newlen);
 					strcpy(cmd, script_cmd_buf);
 					printf("%s\n", cmd);
 				}
@@ -166,24 +167,26 @@ static void *main_loop(void *targ) {
 				if (ret == 99) 
 					break;
 			}
-			free(cmd);
 		} else {
 			printf("\n");
 			break;
 		}
-	}
-  
-	write_history(".history");
-  
-	if (arg->usb_present == 1) {
-		rarg.run = 0;
-		pthread_join(reader_thread, NULL);
+		free(cmd);
 	}
 
 	if (script_file) {
 		fclose(script_file);
 		script_file = NULL;
 	}
+	
+	write_history(".history");
+
+	free(cmd);
+			
+	if (arg->usb_present == 1) {
+		rarg.run = 0;
+		pthread_join(reader_thread, NULL);
+	}
 
 	ExitGraphics();
 	pthread_exit(NULL);
@@ -277,6 +280,6 @@ int main(int argc, char* argv[]) {
   
 	// clean up mutex
 	pthread_mutex_destroy(&print_lock);
-  
+	
 	exit(0);
 }