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

Fix [27]: calls to decode_context_enumerated() pass &uint32_t (#29)

Browse Source
This commit is contained in:
shuegr-personal
2020-01-15 21:50:15 -08:00
committed by Steve Karg
parent 7f5045ff3f
commit e0c2a452e2
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/access_rule.c
+6 -2
View File
@@ -88,14 +88,17 @@ int bacapp_decode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
{ {
int len; int len;
int apdu_len = 0; int apdu_len = 0;
uint32_t time_range_specifier = rule->time_range_specifier;
uint32_t location_specifier = rule->location_specifier;
if (decode_is_context_tag(&apdu[apdu_len], 0)) { if (decode_is_context_tag(&apdu[apdu_len], 0)) {
len = decode_context_enumerated( len = decode_context_enumerated(
&apdu[apdu_len], 0, &rule->time_range_specifier); &apdu[apdu_len], 0, &time_range_specifier);
if (len < 0) { if (len < 0) {
return -1; return -1;
} else { } else {
apdu_len += len; apdu_len += len;
rule->time_range_specifier = time_range_specifier;
} }
} else { } else {
return -1; return -1;
@@ -117,11 +120,12 @@ int bacapp_decode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
if (decode_is_context_tag(&apdu[apdu_len], 2)) { if (decode_is_context_tag(&apdu[apdu_len], 2)) {
len = decode_context_enumerated( len = decode_context_enumerated(
&apdu[apdu_len], 2, &rule->location_specifier); &apdu[apdu_len], 2, &location_specifier);
if (len < 0) { if (len < 0) {
return -1; return -1;
} else { } else {
apdu_len += len; apdu_len += len;
rule->location_specifier = location_specifier;
} }
} else { } else {
return -1; return -1;
src/bacnet/authentication_factor.c
+3 -1
View File
@@ -79,13 +79,15 @@ int bacapp_decode_authentication_factor(
{ {
int len; int len;
int apdu_len = 0; int apdu_len = 0;
uint32_t format_type = af->format_type;
if (decode_is_context_tag(&apdu[apdu_len], 0)) { if (decode_is_context_tag(&apdu[apdu_len], 0)) {
len = decode_context_enumerated(&apdu[apdu_len], 0, &af->format_type); len = decode_context_enumerated(&apdu[apdu_len], 0, &format_type);
if (len < 0) { if (len < 0) {
return -1; return -1;
} else { } else {
apdu_len += len; apdu_len += len;
af->format_type = format_type;
} }
} else { } else {
return -1; return -1;
src/bacnet/authentication_factor_format.c
+3 -1
View File
@@ -80,13 +80,15 @@ int bacapp_decode_authentication_factor_format(
{ {
int len; int len;
int apdu_len = 0; int apdu_len = 0;
uint32_t format_type = aff->format_type;
if (decode_is_context_tag(&apdu[apdu_len], 0)) { if (decode_is_context_tag(&apdu[apdu_len], 0)) {
len = decode_context_enumerated(&apdu[apdu_len], 0, &aff->format_type); len = decode_context_enumerated(&apdu[apdu_len], 0, &format_type);
if (len < 0) { if (len < 0) {
return -1; return -1;
} else { } else {
apdu_len += len; apdu_len += len;
aff->format_type = format_type;
} }
} else { } else {
return -1; return -1;
src/bacnet/credential_authentication_factor.c
+3 -1
View File
@@ -73,13 +73,15 @@ int bacapp_decode_credential_authentication_factor(
{ {
int len; int len;
int apdu_len = 0; int apdu_len = 0;
uint32_t disable = caf->disable;
if (decode_is_context_tag(&apdu[apdu_len], 0)) { if (decode_is_context_tag(&apdu[apdu_len], 0)) {
len = decode_context_enumerated(&apdu[apdu_len], 0, &caf->disable); len = decode_context_enumerated(&apdu[apdu_len], 0, &disable);
if (len < 0) { if (len < 0) {
return -1; return -1;
} else { } else {
apdu_len += len; apdu_len += len;
caf->disable = disable;
} }
} else { } else {
return -1; return -1;