From c39f12691cb7e0190dedcc62eee809599e6fa393 Mon Sep 17 00:00:00 2001 From: waltje Date: Sun, 25 Feb 2018 04:19:34 -0500 Subject: [PATCH] Fixed some warnings and crashes (from upstream.) --- src/cdrom/cdrom.c | 2 +- src/scsi/scsi_x54x.c | 4 ++-- src/win/win_devconf.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c index 1040ee0..ea7f9d0 100644 --- a/src/cdrom/cdrom.c +++ b/src/cdrom/cdrom.c @@ -1945,7 +1945,7 @@ cdrom_readtoc_fallback: b[6] = (MMC_PROFILE_DVD_ROM >> 8) & 0xff; b[7] = MMC_PROFILE_DVD_ROM & 0xff; ret = 1; - } else if (len <= CD_MAX_SECTORS) { + } else { b[6] = (MMC_PROFILE_CD_ROM >> 8) & 0xff; b[7] = MMC_PROFILE_CD_ROM & 0xff; ret = 0; diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c index 0d5b525..64a20e5 100644 --- a/src/scsi/scsi_x54x.c +++ b/src/scsi/scsi_x54x.c @@ -12,7 +12,7 @@ * * These controllers were designed for various buses. * - * Version: @(#)scsi_x54x.c 1.0.2 2018/02/21 + * Version: @(#)scsi_x54x.c 1.0.3 2018/02/24 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -1398,7 +1398,7 @@ x54x_in(uint16_t port, void *priv) else { dev->Geometry++; switch(dev->Geometry & 3) { - case 0: ret = 'A'; break; + case 0: default: ret = 'A'; break; case 1: ret = 'D'; break; case 2: ret = 'A'; break; case 3: ret = 'P'; break; diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index d89c18f..bb6f2d3 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -102,7 +102,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) val_int = config_get_int((char *)config_device->name, (char *)config->name, config->default_int); c = 0; - while (selection->description[0]) + while (selection->description && selection->description[0]) { mbstowcs(lptsTemp, selection->description, strlen(selection->description) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp); @@ -153,7 +153,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) val_int = config_get_hex16((char *)config_device->name, (char *)config->name, config->default_int); c = 0; - while (selection->description[0]) + while (selection->description && selection->description[0]) { mbstowcs(lptsTemp, selection->description, strlen(selection->description) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp); @@ -170,7 +170,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) val_int = config_get_hex20((char *)config_device->name, (char *)config->name, config->default_int); c = 0; - while (selection->description[0]) + while (selection->description && selection->description[0]) { mbstowcs(lptsTemp, selection->description, strlen(selection->description) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp); @@ -423,14 +423,14 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) file_filter[0] = 0; c = 0; - while (config->file_filter[c].description[0]) + while (config->file_filter[c].description && config->file_filter[c].description[0]) { if (c > 0) strcat(file_filter, "|"); strcat(file_filter, config->file_filter[c].description); strcat(file_filter, " ("); d = 0; - while (config->file_filter[c].extensions[d][0]) + while (config->file_filter[c].extensions[d] && config->file_filter[c].extensions[d][0]) { if (d > 0) strcat(file_filter, ";"); @@ -440,7 +440,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) } strcat(file_filter, ")|"); d = 0; - while (config->file_filter[c].extensions[d][0]) + while (config->file_filter[c].extensions[d] && config->file_filter[c].extensions[d][0]) { if (d > 0) strcat(file_filter, ";");