Skip to content

Fix argument count checks and fix hex buffer dump formatter handling of signed char in BACnet property value shell commands #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skarg merged 2 commits into from
Apr 24, 2026
Merged

Fix argument count checks and fix hex buffer dump formatter handling of signed char in BACnet property value shell commands #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd02a3e
Fix argument count checks and fix hex buffer dump formatter handling …
skarg Apr 23, 2026
471ccfc
Merge remote-tracking branch 'origin/default' into bugfix/bacnet-shel…
skarg Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions zephyr/subsys/bacnet_shell/bacnet_shell_property.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ int bacnet_shell_object_type_instance_parse(
{
uint32_t found_index = 0;

if (argc < 1) {
if (argc < 2) {
shell_help(sh);
return -EINVAL;
}
Expand All @@ -58,7 +58,7 @@ int bacnet_shell_object_type_instance_parse(
if (object_instance) {
*object_instance = Device_Object_Instance_Number();
}
} else if (argc > 1) {
} else if (argc > 2) {
if (!bacnet_string_to_uint32(argv[2], &found_index)) {
shell_error(
sh,
Expand Down Expand Up @@ -312,14 +312,20 @@ static int cmd_json_print_hex_dump(
const char *suffix,
const char *append)
{
char str[(buffer_length * 2) + 1];
size_t str_size = ((size_t)buffer_length * 2U) + 1U;
char str[str_size];
int i, s, slen;

s = 0;
for (i = 0; i < buffer_length; i++) {
slen = sprintf(&str[s], "%02x", buffer[i]);
unsigned byte = (unsigned)(unsigned char)buffer[i];
slen = sprintf(&str[s], "%02x", byte);
if (slen != 2) {
break;
}
s += slen;
}
str[s] = '\0';
cmd_json_print_key_value(sh, prefix, key, str, suffix, append);

return 0;
Expand Down Expand Up @@ -569,6 +575,7 @@ static int cmd_value(const struct shell *sh, size_t argc, char **argv)
bool skip_print = false;
bool print_all_properties = false;
char property_name[80] = "";
size_t application_data_len = 0;

if ((argc == 2) || (argc == 3)) {
err = bacnet_shell_object_type_instance_parse(
Expand Down Expand Up @@ -658,8 +665,10 @@ static int cmd_value(const struct shell *sh, size_t argc, char **argv)
if (apdu_len) {
bacnet_shell_write_property_parameter_init(&wpdata, &rpdata, 0);
wpdata.priority = priority;
wpdata.application_data_len = apdu_len;
memcpy(&wpdata.application_data, apdu, apdu_len);
application_data_len =
min(apdu_len, sizeof(wpdata.application_data));
wpdata.application_data_len = application_data_len;
memcpy(&wpdata.application_data, apdu, application_data_len);
status = Device_Write_Property(&wpdata);
if (status) {
cmd_json_print_property_value_tag(
Expand Down
Loading