X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2c29cba82ac4bdb2b16ec4d16c7fc293cd1850dd..ca98f30c537739386bc2707f154cd9f58b693b4f:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 83b58247..0fa55425 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);
 				}
@@ -153,6 +154,8 @@ static void *main_loop(void *targ) {
 			cmd = readline(PROXPROMPT);
 		}
 		
+		// this one should pick up all non-null cmd...
+		// why is there a 
 		if (cmd) {
 
 			while(cmd[strlen(cmd) - 1] == ' ')
@@ -167,23 +170,27 @@ static void *main_loop(void *targ) {
 					break;
 			}
 			free(cmd);
+			cmd = 0;
 		} else {
 			printf("\n");
 			break;
 		}
 	}
-  
-	write_history(".history");
-  
-	if (arg->usb_present == 1) {
-		rarg.run = 0;
-		pthread_join(reader_thread, NULL);
-	}
 
 	if (script_file) {
 		fclose(script_file);
 		script_file = NULL;
 	}
+	
+	write_history(".history");
+
+	free(cmd);
+	cmd = 0;
+			
+	if (arg->usb_present == 1) {
+		rarg.run = 0;
+		pthread_join(reader_thread, NULL);
+	}
 
 	ExitGraphics();
 	pthread_exit(NULL);
@@ -277,6 +284,6 @@ int main(int argc, char* argv[]) {
   
 	// clean up mutex
 	pthread_mutex_destroy(&print_lock);
-  
+	
 	exit(0);
 }