dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BACnet object text off-by-one.

Browse Source
This commit is contained in:
Steve Karg
2022-09-16 08:42:07 -05:00
parent d77881147e
commit 196ac2b0fd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacapp.c
+2 -2
View File
@@ -2034,11 +2034,11 @@ int bacapp_snprintf_value(
} }
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
if (value->type.Enumerated < BACNET_OBJECT_TYPE_LAST) { if (value->type.Enumerated <= BACNET_OBJECT_TYPE_LAST) {
ret_val = snprintf(str, str_len, "%s", ret_val = snprintf(str, str_len, "%s",
bactext_object_type_name( bactext_object_type_name(
value->type.Enumerated)); value->type.Enumerated));
} else if (value->type.Enumerated < } else if (value->type.Enumerated <=
BACNET_OBJECT_TYPE_RESERVED_MAX) { BACNET_OBJECT_TYPE_RESERVED_MAX) {
ret_val = snprintf(str, str_len, "reserved %lu", ret_val = snprintf(str, str_len, "reserved %lu",
(unsigned long)value->type.Enumerated); (unsigned long)value->type.Enumerated);
src/bacnet/bactext.c
+3 -2
View File
@@ -245,8 +245,9 @@ INDTEXT_DATA bacnet_object_type_names[] = { { OBJECT_ANALOG_INPUT,
const char *bactext_object_type_name(unsigned index) const char *bactext_object_type_name(unsigned index)
{ {
return indtext_by_index_split_default(bacnet_object_type_names, index, 128, return indtext_by_index_split_default(bacnet_object_type_names, index,
ASHRAE_Reserved_String, Vendor_Proprietary_String); OBJECT_PROPRIETARY_MIN, ASHRAE_Reserved_String,
Vendor_Proprietary_String);
} }
bool bactext_object_type_index(const char *search_name, unsigned *found_index) bool bactext_object_type_index(const char *search_name, unsigned *found_index)