Fix segfault upon alloc failure

2 files changed, 3 insertions, 2 deletions

diff --git a/src/ippusbxd.c b/src/ippusbxd.c
index 3203206..d2d065a 100644
--- a/src/ippusbxd.c
+++ b/src/ippusbxd.c
@@ -40,11 +40,11 @@ static void *service_connection(void *arg_void)
 			struct http_packet_t *pkt;
 			pkt = tcp_packet_get(arg->tcp, client_msg);
 			if (pkt == NULL) {
-				NOTE("Got null packet from tcp");
 				if (arg->tcp->is_closed) {
 					NOTE("Client closed connection\n");
+					goto cleanup_subconn;
 				}
-				goto cleanup_subconn;
+				ERR_AND_EXIT("Got null packet from tcp");
 			}
 			if (usb == NULL) {
 				usb = usb_conn_aquire(arg->usb_sock, 1);
diff --git a/src/tcp.c b/src/tcp.c
index de79210..a51971b 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -106,6 +106,7 @@ struct http_packet_t *tcp_packet_get(struct tcp_conn_t *tcp,
 		ssize_t gotten_size = recv(tcp->sd, subbuffer, want_size, 0);
 		if (gotten_size < 0) {
 			int errno_saved = errno;
+			// TODO: checkfor timeout
 			ERR("recv failed with err %d:%s", errno_saved,
 				strerror(errno_saved));
 			goto error;