Fixed two issues found with valgrind: Since runtime parameters are revoved by

the destructor, the main parameters must be removed after deleting device object.
This commit is contained in:
Volker Ruppert 2020-11-08 09:58:15 +00:00
parent 691461df4d
commit 0c24af112d
2 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2017 The Bochs Project // Copyright (C) 2001-2020 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -118,6 +118,7 @@ void CDECL libparallel_LTX_plugin_fini(void)
{ {
char port[10]; char port[10];
delete theParallelDevice;
bx_list_c *menu = (bx_list_c*)SIM->get_param("ports.parallel"); bx_list_c *menu = (bx_list_c*)SIM->get_param("ports.parallel");
for (int i=0; i<BX_N_PARALLEL_PORTS; i++) { for (int i=0; i<BX_N_PARALLEL_PORTS; i++) {
sprintf(port, "parport%d", i+1); sprintf(port, "parport%d", i+1);
@ -125,7 +126,6 @@ void CDECL libparallel_LTX_plugin_fini(void)
sprintf(port, "%d", i+1); sprintf(port, "%d", i+1);
menu->remove(port); menu->remove(port);
} }
delete theParallelDevice;
} }
// the device object // the device object

View File

@ -200,10 +200,10 @@ int CDECL libes1370_LTX_plugin_init(plugin_t *plugin, plugintype_t type)
void CDECL libes1370_LTX_plugin_fini(void) void CDECL libes1370_LTX_plugin_fini(void)
{ {
delete theES1370Device;
SIM->unregister_addon_option("es1370"); SIM->unregister_addon_option("es1370");
bx_list_c *menu = (bx_list_c*)SIM->get_param("sound"); bx_list_c *menu = (bx_list_c*)SIM->get_param("sound");
menu->remove("es1370"); menu->remove("es1370");
delete theES1370Device;
} }
// the device object // the device object