X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=a16b4ccbe901a4c5a0644baa566d41d906360fd1;hp=015baa1d888a57c903767722668b11c73e74042a;hb=79800db98a985bcd601e8a892aed76d96548a51b;hpb=ea562985b5eff536feea022b074122b21c3610ea

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 015baa1d88..a16b4ccbe9 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -3006,8 +3006,10 @@ static bool gdb_handle_vrun_packet(struct connection *connection, const char *pa
 	free(next_hex_encoded_field(&parse, ';'));
 
 	char *cmdline = next_hex_encoded_field(&parse, ';');
-	char *arg;
-	while (cmdline && (arg = next_hex_encoded_field(&parse, ';')) != NULL) {
+	while (cmdline) {
+		char *arg = next_hex_encoded_field(&parse, ';');
+		if (!arg)
+			break;
 		char *new_cmdline = alloc_printf("%s %s", cmdline, arg);
 		free(cmdline);
 		free(arg);
@@ -3549,7 +3551,7 @@ static int gdb_target_start(struct target *target, const char *port)
 		struct target_list *head;
 		struct target *curr;
 		head = target->head;
-		while (head != (struct target_list *)NULL) {
+		while (head) {
 			curr = head->target;
 			if (curr != target)
 				curr->gdb_service = gdb_service;