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

Fixed Who-Has object instance by checking for valid instance. (#922)

Browse Source
This commit is contained in:
Steve Karg
2025-02-20 17:29:39 -06:00
committed by GitHub
parent 08f152b4ac
commit 7a5190f295
9 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/blinkt/device.c
+6 -1
View File
@@ -1018,9 +1018,14 @@ bool Device_Object_Name_Copy(
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
apps/piface/device.c
+6 -1
View File
@@ -970,9 +970,14 @@ bool Device_Object_Name_Copy(
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
ports/at91sam7s/device.c
+6 -1
View File
@@ -738,9 +738,14 @@ bool Device_Object_Name_Copy(BACNET_OBJECT_TYPE object_type,
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
ports/bdk-atxx4-mstp/device.c
+6 -2
View File
@@ -717,10 +717,14 @@ bool Device_Object_Name_Copy(BACNET_OBJECT_TYPE object_type,
struct my_object_functions *pObject = NULL; struct my_object_functions *pObject = NULL;
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); if (pObject != NULL) {
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
ports/stm32f10x/device.c
+6 -1
View File
@@ -654,9 +654,14 @@ bool Device_Object_Name_Copy(BACNET_OBJECT_TYPE object_type,
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
ports/stm32f4xx/device.c
+6 -1
View File
@@ -684,9 +684,14 @@ bool Device_Object_Name_Copy(BACNET_OBJECT_TYPE object_type,
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
ports/xplained/device.c
+6 -1
View File
@@ -583,9 +583,14 @@ bool Device_Object_Name_Copy(BACNET_OBJECT_TYPE object_type,
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
src/bacnet/basic/object/client/device-client.c
+6 -1
View File
@@ -898,9 +898,14 @@ bool Device_Object_Name_Copy(
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }
src/bacnet/basic/object/device.c
+6 -1
View File
@@ -1259,9 +1259,14 @@ bool Device_Object_Name_Copy(
bool found = false; bool found = false;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_Name != NULL)) { if (pObject != NULL) {
if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(object_instance)) {
if (pObject->Object_Name) {
found = pObject->Object_Name(object_instance, object_name); found = pObject->Object_Name(object_instance, object_name);
} }
}
}
return found; return found;
} }