Merge Dirk's emptyArrayCrashFix branch into 3.15

2020-03-20 13:28:34 -05:00
parent a9034bb586 e48cdb48ac
commit 5b7f896312
1 changed files with 5 additions and 0 deletions
@@ -907,6 +907,11 @@ long dbGet(DBADDR *paddr, short dbrType,
        } else {
            DBADDR localAddr = *paddr; /* Structure copy */

+            if (pfl->no_elements < 1) {
+                status = S_db_badField;
+                goto done;
+            }
+
            localAddr.field_type = pfl->field_type;
            localAddr.field_size = pfl->field_size;
            localAddr.no_elements = pfl->no_elements;