From 6243fa9711d16ca2cb0173ca152e98074069203d Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Tue, 1 Oct 2019 13:05:08 +0000
Subject: [PATCH] Some more cleanups and memleak fixes.

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4265
---
 src/cpu/core_dyn_x86/dyn_fpu.h        | 4 ++--
 src/cpu/core_dyn_x86/dyn_fpu_dh.h     | 4 ----
 src/hardware/serialport/libserial.cpp | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/cpu/core_dyn_x86/dyn_fpu.h b/src/cpu/core_dyn_x86/dyn_fpu.h
index 9d261c1a..6e1f31db 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu.h
@@ -98,7 +98,7 @@ static void dyn_fpu_esc0(){
 	if (decode.modrm.val >= 0xc0) { 
 		dyn_fpu_top();
 		Bitu group=(decode.modrm.val >> 3) & 7;
-		Bitu sub=(decode.modrm.val & 7);
+		//Bitu sub=(decode.modrm.val & 7);
 		switch (group){
 		case 0x00:		//FADD ST,STi /
 			gen_call_function((void*)&FPU_FADD,"%Drd%Drd",DREG(TMPB),DREG(EA));
@@ -424,7 +424,7 @@ static void dyn_fpu_esc3(){
 static void dyn_fpu_esc4(){
 	dyn_get_modrm();  
 	Bitu group=(decode.modrm.val >> 3) & 7;
-	Bitu sub=(decode.modrm.val & 7);
+	//Bitu sub=(decode.modrm.val & 7);
 	if (decode.modrm.val >= 0xc0) { 
 		dyn_fpu_top();
 		switch(group){
diff --git a/src/cpu/core_dyn_x86/dyn_fpu_dh.h b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
index 6899d5d8..b995cb06 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu_dh.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
@@ -298,8 +298,6 @@ static void dh_fpu_esc3(){
 
 static void dh_fpu_esc4(){
 	dyn_get_modrm();  
-	Bitu group=(decode.modrm.val >> 3) & 7;
-	Bitu sub=(decode.modrm.val & 7);
 	if (decode.modrm.val >= 0xc0) { 
 		cache_addb(0xdc);
 		cache_addb(decode.modrm.val);
@@ -356,8 +354,6 @@ static void dh_fpu_esc5(){
 
 static void dh_fpu_esc6(){
 	dyn_get_modrm();  
-	Bitu group=(decode.modrm.val >> 3) & 7;
-	Bitu sub=(decode.modrm.val & 7);
 	if (decode.modrm.val >= 0xc0) { 
 		cache_addb(0xde);
 		cache_addb(decode.modrm.val);
diff --git a/src/hardware/serialport/libserial.cpp b/src/hardware/serialport/libserial.cpp
index 3b0a4520..b7f524f2 100644
--- a/src/hardware/serialport/libserial.cpp
+++ b/src/hardware/serialport/libserial.cpp
@@ -289,6 +289,7 @@ bool SERIAL_open(const char* portname, COMPORT* port) {
 
 	size_t len = strlen(portname);
 	if(len > 240) {
+		free(cp);
 		///////////////////////////////////SetLastError(ERROR_BUFFER_OVERFLOW);
 		return false;
 	}