# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1633691040 -10800
# Node ID 22e8ee2df9ac423ad759f34f3ca86f22d1299f69
# Parent  58c4018426da2e5ae863742d83ccd138967dd244
Check for RSID validity, too.

diff -r 58c4018426da -r 22e8ee2df9ac sidinfo.c
--- a/sidinfo.c	Tue Mar 23 17:05:24 2021 +0200
+++ b/sidinfo.c	Fri Oct 08 14:04:00 2021 +0300
@@ -814,7 +814,12 @@
     switch (item->cmd)
     {
         case  0: PRS(filename, FALSE); break;
-        case  1: PRS(psid->magic, FALSE); break;
+        case  1:
+            snprintf(tmp, sizeof(tmp), "%s%s",
+                psid->magic,
+                psid->isInvalidRSID ? " (INVALID RSID!)" : "");
+            PRS(tmp, FALSE);
+            break;
         case  2:
             snprintf(tmp, sizeof(tmp), "%d.%d", (psid->version & 0xff), (psid->version >> 8));
             PRS(tmp, FALSE);
diff -r 58c4018426da -r 22e8ee2df9ac sidlib.c
--- a/sidlib.c	Tue Mar 23 17:05:24 2021 +0200
+++ b/sidlib.c	Fri Oct 08 14:04:00 2021 +0300
@@ -171,7 +171,16 @@
         goto exit;
     }
 
-    psid->isRSID = psid->magic[0] == 'R';
+    if ((psid->isRSID = psid->magic[0] == 'R'))
+    {
+        if (psid->version < 2 ||
+            psid->loadAddress != 0 ||
+            psid->playAddress != 0 ||
+            psid->speed != 0)
+        {
+            psid->isInvalidRSID = TRUE;
+        }
+    }
 
     if (!sidlib_fread_str(ctx, chconv, &psid->sidName, SIDLIB_PSID_STR_LEN) ||
         !sidlib_fread_str(ctx, chconv, &psid->sidAuthor, SIDLIB_PSID_STR_LEN) ||
diff -r 58c4018426da -r 22e8ee2df9ac sidlib.h
--- a/sidlib.h	Tue Mar 23 17:05:24 2021 +0200
+++ b/sidlib.h	Fri Oct 08 14:04:00 2021 +0300
@@ -140,7 +140,7 @@
     uint8_t  sid2Addr, sid3Addr;
 
     // Extra data
-    BOOL isRSID;
+    BOOL isRSID, isInvalidRSID;
     size_t dataSize;     // Total size of data - header
     th_md5hash_t hash;   // Songlength database hash