fix dbCaGetLink to fail when reading scalars from empty arrays

2020-06-29 22:23:21 +02:00
parent 473790124b
commit 0a1fb25e6b
1 changed files with 7 additions and 1 deletions
@@ -410,9 +410,15 @@ long dbCaGetLink(struct link *plink, short dbrType, void *pdest,
        goto done;
    }
    newType = dbDBRoldToDBFnew[pca->dbrType];
-    if (!nelements || *nelements == 1) {
+    if (!nelements) {
        long (*fConvert)(const void *from, void *to, struct dbAddr *paddr);

+        if (pca->usedelements < 1) {
+            pca->sevr = INVALID_ALARM;
+            pca->stat = LINK_ALARM;
+            status = -1;
+            goto done;
+        }
        fConvert = dbFastGetConvertRoutine[newType][dbrType];
        assert(pca->pgetNative);
        status = fConvert(pca->pgetNative, pdest, 0);