[UI][VM][Qt] Fix uncondition branch found by valgrind (but some points has not fixed...

diff --git a/source/src/qt/gui/csp_logger.cpp b/source/src/qt/gui/csp_logger.cpp
index 6aef839..35f3826 100644 (file)
--- a/source/src/qt/gui/csp_logger.cpp
+++ b/source/src/qt/gui/csp_logger.cpp
@@ -281,7 +281,7 @@ void CSP_Logger::debug_log(int level, int domain_num, char *strbuf)
                
                do {
                        if(p != NULL) {
-                               CSP_LoggerLine *tmps;
+                               CSP_LoggerLine *tmps = NULL;
                                tmps = new CSP_LoggerLine(linenum, level, domain_s, time_s, QString::fromUtf8(p));
                                if(log_onoff) {
                                        if(cons_log_level_n != 0) {
@@ -295,6 +295,7 @@ void CSP_Logger::debug_log(int level, int domain_num, char *strbuf)
                                                           tmps->get_element_syslog().toLocal8Bit().constData());
                                        }
 #endif
+                                       
                                }
                                {
                                        QMutexLocker locker(lock_mutex);
@@ -316,6 +317,7 @@ void CSP_Logger::debug_log(int level, int domain_num, char *strbuf)
                                                linenum++;
                                        }
                                }
+                               if(tmps != NULL) delete tmps;
                        }
 #if defined(Q_OS_WIN)
                        {

diff --git a/source/src/qt/gui/emu_thread_tmpl.cpp b/source/src/qt/gui/emu_thread_tmpl.cpp
index d743192..4d8c72f 100644 (file)
--- a/source/src/qt/gui/emu_thread_tmpl.cpp
+++ b/source/src/qt/gui/emu_thread_tmpl.cpp
@@ -74,6 +74,14 @@ EmuThreadClassBase::EmuThreadClassBase(META_MainWindow *rootWindow, USING_FLAGS
 EmuThreadClassBase::~EmuThreadClassBase() {
        delete drawCond;
        
+       key_up_code_fifo->release();
+       key_up_mod_fifo->release();
+       key_up_repeat_fifo->release();
+       
+       key_down_code_fifo->release();
+       key_down_mod_fifo->release();
+       key_down_repeat_fifo->release();
+       
        delete key_up_code_fifo;
        delete key_up_mod_fifo;
        delete key_up_repeat_fifo;

diff --git a/source/src/qt/gui/menu_flags_tmpl.cpp b/source/src/qt/gui/menu_flags_tmpl.cpp
index f64c093..8b9e010 100644 (file)
--- a/source/src/qt/gui/menu_flags_tmpl.cpp
+++ b/source/src/qt/gui/menu_flags_tmpl.cpp
@@ -4,6 +4,7 @@
 USING_FLAGS::USING_FLAGS(config_t *cfg)
 {
        p_osd = NULL;
+       p_emu = NULL;
        use_alt_f10_key = false;
        use_auto_key = use_auto_key_us = use_auto_key_caps = false;
        use_auto_key_no_caps = use_auto_key_release =

diff --git a/source/src/vm/disk.h b/source/src/vm/disk.h
index 2e1c270..fd3f836 100644 (file)
--- a/source/src/vm/disk.h
+++ b/source/src/vm/disk.h
@@ -128,6 +128,7 @@ public:
                drive_mfm = true;
                track_size = 0;
                static int num = 0;
+               is_special_disk = 0;
                drive_num = num++;
                set_device_name(_T("Floppy Disk Drive #%d"), drive_num + 1);
                type_sc3000 = type_smc70 = type_x1 = type_x1turbo = false;

diff --git a/source/src/vm/mc6809_base.cpp b/source/src/vm/mc6809_base.cpp
index 26cb4bc..e83dd3e 100644 (file)
--- a/source/src/vm/mc6809_base.cpp
+++ b/source/src/vm/mc6809_base.cpp
@@ -176,6 +176,8 @@ void MC6809_BASE::initialize()
        DEVICE::initialize();
        int_state = 0;
        busreq = false;
+       icount = 0;
+       extra_icount = 0;
 #ifdef USE_DEBUGGER
        d_mem_stored = d_mem;
        d_debugger->set_context_mem(d_mem);