From 9ec8d6d9dc03791f6ab1e3ad108c8d705d355696 Mon Sep 17 00:00:00 2001
From: Ren Kararou <ren@kararou.space>
Date: Sat, 25 Jan 2025 20:20:37 -0600
Subject: fix memory leak in main loop; fix memory leak in handlers.c

---
 src/handlers.c |  6 ++++++
 src/main.c     | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/handlers.c b/src/handlers.c
index 1d4d92c..d42382e 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -442,6 +442,7 @@ void *write_req_resp(void *args) {
 				if (rcv >= 4) {
 					nbd_tftp_packet_data data = nbd_tftp_de_data(rxb, rcv);
 					if (data.opcode == 5) {
+						free(data.data);
 						goto cleanup;
 					}
 					syslog(
@@ -465,22 +466,27 @@ void *write_req_resp(void *args) {
 								);
 								argptr->err = 5;
 								senderror(s, argptr);
+								free(data.data);
 								goto cleanup;
 							}
 							if (fwrite(data.data, 1, data.datalen, fp) < data.datalen) {
 								syslog(LOG_ERR, "filewrite failed for %s: %s", fname, strerror(errno));
 								argptr->err = 0;
 								senderror(s, argptr);
+								free(data.data);
 								goto clean_socket;
 							}
 						}
+						free(data.data);
 						break;
 					}
 					if (data.block_num == (bnum - 1)) {
 						rxon = 0;
 						vcount++;
+						free(data.data);
 						break;
 					}
+					free(data.data);
 				}
 				if (++rxcount > 30) {
 					syslog(LOG_ERR, "retry count exceeded");
diff --git a/src/main.c b/src/main.c
index fc5835b..7114cc7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -279,12 +279,7 @@ int main(int argc, char **argv) {
 			}
 		}
 		//TODO: use std threads
-		pthread_t *_thread = malloc(sizeof(pthread_t));
-		if (_thread == NULL) {
-			syslog(LOG_CRIT, "unable to allocate memory: %s", strerror(errno));
-			free(args);
-			continue;
-		}
+		pthread_t _thread;
 		void *(*func)(void *);
 		switch (oc) {
 			case RRQ:
@@ -300,15 +295,12 @@ int main(int argc, char **argv) {
 		//TODO: use std threads
 		int e;
 		syslog(LOG_ERR, "spawning thread for %s", inet_ntoa(caddr.sin_addr));
-//		void *lol = func((void *)args);
-//		free(lol);
-		if ((e = pthread_create(_thread, 0, func, (void *)args)) != 0) {
+		if ((e = pthread_create(&_thread, 0, func, (void *)args)) != 0) {
 			syslog(
 				LOG_CRIT,
 				"unable to spawn thread: %s",
 				strerror(e)
 			);
-			free(_thread);
 			free(args);
 		}
 	}
-- 
cgit 1.4.1-2-gfad0