Avoid segfaults when processing invalid props file

diff --git a/band.c b/band.c
index a8f0809e157f2cd56a4cd4d599e967b56d919010..de1712ec1d8761bf4dbb946a081de241d4c7f1be 100644 (file)
--- a/band.c
+++ b/band.c
@@ -503,6 +503,7 @@ void bandSaveState() {
 
 void bandRestoreState() {
     char* value;
+    int v;
     int b;
     int stack;
     char name[128];
@@ -513,13 +514,26 @@ void bandRestoreState() {
         value=getProperty(name);
         if(value) strcpy(bands[b].title,value);
 
-        sprintf(name,"band.%d.entries",b);
-        value=getProperty(name);
-        if(value) bands[b].bandstack->entries=atoi(value);
+       // The number of entries is a compile-time constant,
+        // which changes when compiling piHPSDR with different
+       // options (e.g. with and without SOAPYSDR)
+       // Therefore this number cannot be "restored" from a props file
+
+        //sprintf(name,"band.%d.entries",b);
+        //lue=getProperty(name);
+        //if(value) bands[b].bandstack->entries=atoi(value);
 
         sprintf(name,"band.%d.current",b);
         value=getProperty(name);
-        if(value) bands[b].bandstack->current_entry=atoi(value);
+        if(value) {
+         //
+         // Since the number of bandstack entries is a compile-time constant,
+         // we cannot allow "current" to exceed the number of available slots
+         //
+         v=atoi(value);
+         if (v >= bands[b].bandstack->entries) v=0;
+         bands[b].bandstack->current_entry=v;
+       }
 
         sprintf(name,"band.%d.preamp",b);
         value=getProperty(name);