Added test for array options on RP and RPM to all object properties that are not arrays.

2009-11-05 15:39:46 +00:00
parent 2c2fbdeeef
commit edc7c6c577
36 changed files with 278 additions and 66 deletions
@@ -364,7 +364,6 @@ int Binary_Output_Encode_Property_APDU(
                    apdu_len = -1;
                }
            }
-
            break;
        case PROP_RELINQUISH_DEFAULT:
            present_value = RELINQUISH_DEFAULT;
@@ -386,6 +385,14 @@ int Binary_Output_Encode_Property_APDU(
            apdu_len = -1;
            break;
    }
+    /*  only array properties can have array options */
+    if ((apdu_len >= 0) &&
+        (property != PROP_PRIORITY_ARRAY) &&
+        (array_index != BACNET_ARRAY_ALL)) {
+        *error_class = ERROR_CLASS_PROPERTY;
+        *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
+        apdu_len = -1;
+    }

    return apdu_len;
 }