Address sanitizer fixes

diff --git a/debug.cpp b/debug.cpp
index 75160446e39dbfaa6d43b0b98fa70e6bb202a207..3d21cc1c8130ac4726a29f765895a1be524e06e2 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -1539,13 +1539,20 @@ static void dump_custom_regs(bool aga, bool ext)
                        addr1, custd[cnt1].name, v1, extra1,
                        addr2, custd[cnt2].name, v2, extra2);
                for (;;) {
+                       if (!custd[cnt1].name) {
+                               break;
+                       }
                        cnt1++;
-                       if (!(custd[cnt1].special & CD_NONE))
+                       if (!custd[cnt1].name || !(custd[cnt1].special & CD_NONE)) {
                                break;
+                       }
                }
                for (;;) {
+                       if (!custd[cnt2].name) {
+                               break;
+                       }
                        cnt2++;
-                       if (!(custd[cnt2].special & CD_NONE))
+                       if (!custd[cnt2].name || !(custd[cnt2].special & CD_NONE))
                                break;
                }
        }

diff --git a/disk.cpp b/disk.cpp
index 99f939969c2d99059b364ad754ff307450873fa0..8ed555575d40224b673a61aec721f61f39a20ae0 100644 (file)
--- a/disk.cpp
+++ b/disk.cpp
@@ -1400,9 +1400,11 @@ static int drive_insert (drive *drv, struct uae_prefs *p, int dnum, const TCHAR
                        _tcsncpy (currprefs.floppyslots[dnum].df, fname_in, 255);
                        currprefs.floppyslots[dnum].df[255] = 0;
                }
+               if (changed_prefs.floppyslots[dnum].df != fname_in) {
+                       _tcsncpy (changed_prefs.floppyslots[dnum].df, fname_in, 255);
+                       changed_prefs.floppyslots[dnum].df[255] = 0;
+               }
                currprefs.floppyslots[dnum].forcedwriteprotect = forcedwriteprotect;
-               _tcsncpy (changed_prefs.floppyslots[dnum].df, fname_in, 255);
-               changed_prefs.floppyslots[dnum].df[255] = 0;
                changed_prefs.floppyslots[dnum].forcedwriteprotect = forcedwriteprotect;
                if (drv->newname != fname_in) {
                        _tcscpy(drv->newname, fname_in);