Merge branch 'svn/trunk'

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){

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);

src/dos/dos_execute.cpp

@@ -315,6 +315,7 @@ bool DOS_Execute(char * name,PhysPt block_pt,Bit8u flags) {
 		envseg=block.exec.envseg;
 		if (!MakeEnv(name,&envseg)) {
 			DOS_CloseFile(fhandle);
+			delete [] loadbuf;
 			return false;
 		}
 		/* Get Memory */		

src/gui/sdlmain.cpp

@@ -1866,11 +1866,11 @@ extern void DEBUG_ShutDown(Section * /*sec*/);
 #endif
 
 void restart_program(std::vector<std::string> & parameters) {
-	char** newargs = new char* [parameters.size()+1];
+	char** newargs = new char* [parameters.size() + 1];
 	// parameter 0 is the executable path
 	// contents of the vector follow
 	// last one is NULL
-	for(Bitu i = 0; i < parameters.size(); i++) newargs[i]=(char*)parameters[i].c_str();
+	for(Bitu i = 0; i < parameters.size(); i++) newargs[i] = (char*)parameters[i].c_str();
 	newargs[parameters.size()] = NULL;
 	SDL_CloseAudio();
 	SDL_Delay(50);
@@ -1892,7 +1892,7 @@ void restart_program(std::vector<std::string> & parameters) {
 #endif
 		E_Exit("Restarting failed");
 	}
-	free(newargs);
+	delete [] newargs;
 }
 void Restart(bool pressed) { // mapper handler
 	restart_program(control->startup_params);

src/hardware/ipx.cpp

@@ -1072,7 +1072,7 @@ Bitu IPX_ESRHandler(void) {
 			CALLBACK_RunRealFar(RealSeg(ESRList->getESRAddr()),
 								RealOff(ESRList->getESRAddr()));
 		}
-		delete ESRList;
+		delete ESRList; //Destructor updates this pointer to the next value or NULL
 	}	// while
 
 	IO_WriteB(0xa0,0x63);	//EOI11

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;
 	}

src/shell/shell.cpp

@@ -134,7 +134,10 @@ AutoexecObject::~AutoexecObject(){
 			if ((strncasecmp(buf2,"set ",4) == 0) && (strlen(buf2) > 4)){
 				char* after_set = buf2 + 4;//move to variable that is being set
 				char* test = strpbrk(after_set,"=");
-				if (!test) continue;
+				if (!test) {
+					delete [] buf2;
+					continue;
+				}
 				*test = 0;
 				stringset = true;
 				//If the shell is running/exists update the environment

src/shell/shell_misc.cpp

@@ -368,7 +368,7 @@ void DOS_Shell::InputCommand(char * line) {
 
 	// remove current command from history if it's there
 	if (current_hist) {
-		current_hist=false;
+		// current_hist=false;
 		l_history.pop_front();
 	}