From 60fdfcd04e7154d9d0175713ff4d44833660f2fc Mon Sep 17 00:00:00 2001
From: koby3101 <koby3101@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 1 Mar 2017 11:51:46 +0000
Subject: [PATCH] NC added/corrected validation and also parse Priority as
 array

---
 bacnet-stack/demo/object/nc.c | 46 ++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/bacnet-stack/demo/object/nc.c b/bacnet-stack/demo/object/nc.c
index bf3dacdc..b45c849f 100644
--- a/bacnet-stack/demo/object/nc.c
+++ b/bacnet-stack/demo/object/nc.c
@@ -392,9 +392,10 @@ bool Notification_Class_Write_Property(
     NOTIFICATION_CLASS_INFO *CurrentNotify;
     NOTIFICATION_CLASS_INFO TmpNotify;
     BACNET_APPLICATION_DATA_VALUE value;
+    uint8_t TmpPriority[MAX_BACNET_EVENT_TRANSITION];  /* BACnetARRAY[3] of Unsigned */
     bool status = false;
-    int iOffset = 0;
-    uint8_t idx = 0;
+    int iOffset;
+    uint8_t idx;
     int len = 0;
 
 
@@ -431,14 +432,50 @@ bool Notification_Class_Write_Property(
                 if (wp_data->array_index == 0) {
                     wp_data->error_class = ERROR_CLASS_PROPERTY;
                     wp_data->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
+                    status = false;
                 } else if (wp_data->array_index == BACNET_ARRAY_ALL) {
-                    /* FIXME: wite all array */
+                    iOffset = 0;
+                    for (idx = 0; idx < MAX_BACNET_EVENT_TRANSITION; idx++)
+                    {
+                        len =
+                            bacapp_decode_application_data(&wp_data->
+                            application_data[iOffset], wp_data->application_data_len,
+                            &value);
+                        if ((len == 0) ||
+                                (value.tag != BACNET_APPLICATION_TAG_UNSIGNED_INT))
+                        {
+                            /* Bad decode, wrong tag or following required parameter missing */
+                            wp_data->error_class = ERROR_CLASS_PROPERTY;
+                            wp_data->error_code = ERROR_CODE_INVALID_DATA_TYPE;
+                            status = false;
+                            break;
+                        }
+                        if (value.type.Unsigned_Int > 255) {
+                            wp_data->error_class = ERROR_CLASS_PROPERTY;
+                            wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+                            status = false;
+                            break;
+                        }
+						TmpPriority[idx] = (uint8_t) value.type.Unsigned_Int;
+                        iOffset += len;
+                    }
+                    if (status == true) {
+                        for (idx = 0; idx < MAX_BACNET_EVENT_TRANSITION; idx++)
+                            CurrentNotify->Priority[idx] = TmpPriority[idx];	
+                    }
                 } else if (wp_data->array_index <= 3) {
+                    if (value.type.Unsigned_Int > 255) {
+                        wp_data->error_class = ERROR_CLASS_PROPERTY;
+                        wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+                        status = false;
+                      }
+                      else
                     CurrentNotify->Priority[wp_data->array_index - 1] =
                         value.type.Unsigned_Int;
                 } else {
                     wp_data->error_class = ERROR_CLASS_PROPERTY;
                     wp_data->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
+                    status = false;
                 }
             }
             break;
@@ -462,7 +499,8 @@ bool Notification_Class_Write_Property(
         case PROP_RECIPIENT_LIST:
 
             memset(&TmpNotify, 0x00, sizeof(NOTIFICATION_CLASS_INFO));
-
+            idx = 0;
+            iOffset = 0;
             /* decode all packed */
             while (iOffset < wp_data->application_data_len) {
                 /* Decode Valid Days */