Merge pull request kanjitalk755#196 from schinkelg/master

Small leaks / bug fixes
markrwilliams · Mar 30, 2024 · 293ef33 · 293ef33
2 parents 979523b + 076390e
commit 293ef33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BasiliskII/src/Unix/Linux/etherhelpertool.c b/BasiliskII/src/Unix/Linux/etherhelpertool.c
@@ -135,7 +135,7 @@ static int main_loop(int sd, int use_bpf)
 
 	outgoing = malloc(blen);
 	if (outgoing == NULL) {
-		free(outgoing);
+		free(incoming);
 		fprintf(stderr, 
 			"%s: malloc() failed.\n",
 			exec_name);

diff --git a/BasiliskII/src/Unix/video_x.cpp b/BasiliskII/src/Unix/video_x.cpp
@@ -2356,10 +2356,10 @@ static void update_display_dynamic(int ticker, driver_window *drv)
 	y2s = sm_uptd[ticker % 8];
 	y2a = 8;
 	for (i = 0; i < 6; i++) {
+		max_box = sm_no_boxes[i];
 		if (ticker % (2 << i))
 			break;
 	}
-	max_box = sm_no_boxes[i];
 
 	if (y2a) {
 		for (y1=0; y1<16; y1++) {