Skip to content

Commit

Permalink
apps/bttester: Fix compilation with GCC 13
Browse files Browse the repository at this point in the history
GCC 13 is complaining about zero elemen array that is not at the end
of structure.

Error: repos/apache-mynewt-nimble/apps/bttester/src/btp_gap.c:
     In function 'start_advertising':
repos/apache-mynewt-nimble/apps/bttester/src/btp_gap.c:467:29:
     error: array subscript 514 is outside the bounds of an interior
     zero-length array 'const uint8_t[0]' {aka 'const unsigned char[]'}
     [-Werror=zero-length-bounds]
  467 |     addr_type = cp->adv_data[cp->adv_data_len +
      |                 ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
  468 |                              cp->scan_rsp_len +
      |                              ~~~~~~~~~~~~~~~~~~
  469 |                              sizeof(duration)];
      |                              ~~~~~~~~~~~~~~~~~
In file included from repos/apache-mynewt-nimble/apps/bttester/src/btp/btp.h:31,
                 from repos/apache-mynewt-nimble/apps/bttester/src/btp_gap.c:36:
repos/apache-mynewt-nimble/apps/bttester/src/btp/btp_gap.h:138:13: note:
     while referencing 'adv_data'
  138 |     uint8_t adv_data[0];
      |             ^~~~~~~~
cc1: all warnings being treated as errors
  • Loading branch information
sjanc committed Oct 6, 2023
1 parent da4e2f0 commit 8618776
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
5 changes: 2 additions & 3 deletions apps/bttester/src/btp/btp_gap.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ struct btp_gap_set_bondable_rp {
struct btp_gap_start_advertising_cmd {
uint8_t adv_data_len;
uint8_t scan_rsp_len;
uint8_t adv_data[0];
uint8_t scan_rsp[0];
uint8_t adv_sr_data[];
/*
* This command is very unfortunate because it has two fields after variable
* data. Those needs to be handled explicitly by handler.
Expand Down Expand Up @@ -440,4 +439,4 @@ struct gap_periodic_transfer_recieved_ev {
uint8_t adv_phy;
uint16_t per_adv_itvl;
uint8_t adv_clk_accuracy;
} __packed;
} __packed;
16 changes: 8 additions & 8 deletions apps/bttester/src/btp_gap.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
}

/* currently ignored */
duration = get_le32(cp->adv_data + cp->adv_data_len + cp->scan_rsp_len);
duration = get_le32(cp->adv_sr_data + cp->adv_data_len + cp->scan_rsp_len);
(void)duration;
addr_type = cp->adv_data[cp->adv_data_len +
addr_type = cp->adv_sr_data[cp->adv_data_len +
cp->scan_rsp_len +
sizeof(duration)];

Expand All @@ -474,9 +474,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_FAILED;
}

ad[adv_len].type = cp->scan_rsp[i++];
ad[adv_len].data_len = cp->scan_rsp[i++];
ad[adv_len].data = &cp->scan_rsp[i];
ad[adv_len].type = cp->adv_sr_data[i++];
ad[adv_len].data_len = cp->adv_sr_data[i++];
ad[adv_len].data = &cp->adv_sr_data[i];
i += ad[adv_len].data_len;
}

Expand All @@ -486,9 +486,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_FAILED;
}

sd[sd_len].type = cp->scan_rsp[i++];
sd[sd_len].data_len = cp->scan_rsp[i++];
sd[sd_len].data = &cp->scan_rsp[i];
sd[sd_len].type = cp->adv_sr_data[i++];
sd[sd_len].data_len = cp->adv_sr_data[i++];
sd[sd_len].data = &cp->adv_sr_data[i];
i += sd[sd_len].data_len;
}

Expand Down

0 comments on commit 8618776

Please sign in to comment.