Commit Diff


commit - 973daf6a1332bd41acdc0ab684df44716ad83230
commit + 80049c18df8cc925bd657da6673d4b3e82721a8b
blob - 91d9e74de7611dff9de61b9b1dbb1ba9b642f07d
blob + cd792694a80c21a597816e533adeabc69ffbd3fa
--- thingsctl/thingsctl.c	
+++ thingsctl/thingsctl.c	
@@ -124,11 +124,13 @@ main(int argc, char *argv[])
 	case SHOW_PKTS:
 		imsg_compose(ibuf, IMSG_SHOW_PKTS, 0, 0, -1,
 		    res->thg_name, strlen(res->thg_name));
+		free(res->thg_name);
 		break;
 	case KILL_CLT:
 		imsg_compose(ibuf, IMSG_KILL_CLT, 0, 0, -1,
 		    res->clt_name, strlen(res->clt_name));
 		printf("kill request for client \"%s\" sent\n", res->clt_name);
+		free(res->clt_name);
 		done = 1;
 		break;
 	case LOG_DEBUG:
blob - 6b6642494e8b7ed4230bd63a7c0b6810b9123037
blob + 461c998b8152602c28e8b2c8f0e8d0b0b43feb06
--- thingsd/things.c	
+++ thingsd/things.c	
@@ -164,8 +164,9 @@ thgs_dispatch_main(int fd, short event, void *bula)
 				if (strncmp(thg->name, imsg.data,
 				    strlen(imsg.data)) == 0) {
 					if ((ctl_pkt->name =
-					    strdup(imsg.data)) == NULL)
-						break;
+					    strndup(imsg.data,
+					    strlen(imsg.data))) == NULL)
+						continue;
 					ctl_pkt->exists = true;
 					ctl_pkt->cpid = imsg.hdr.pid;
 					tchk = false;
@@ -200,8 +201,11 @@ thgs_dispatch_main(int fd, short event, void *bula)
 			log_setverbose(verbose);
 			break;
 		case IMSG_CTL_END:
-			ctl_pkt->exists = false;
-			ctl_pkt->cpid = -1;
+			if (ctl_pkt->exists) {
+				free(ctl_pkt->name);
+				ctl_pkt->exists = false;
+				ctl_pkt->cpid = -1;
+			}
 			break;
 		default:
 			log_debug("%s: error handling imsg %d", __func__,