diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-05-09 14:37:44 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2019-05-13 20:23:38 +0300 |
| commit | 3775d077acab5d057eb4b12eb0271f647a036753 (patch) | |
| tree | c53bc2f1112c33294e1b2d4dd2bd68a59750f6a0 /android | |
| parent | 23fbc19d5de3042248b05d73d1093d41058b3694 (diff) | |
| download | bluez-3775d077acab5d057eb4b12eb0271f647a036753.tar.gz | |
android/avrcp-lib: Fix unaligned struct access
android/avrcp-lib.c: In function ‘get_element_attributes’:
android/avrcp-lib.c:967:24: error: taking address of packed member of ‘struct get_element_attributes_req’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
967 | if (!parse_attributes(* (&req->attrs), params_len - sizeof(*req),
| ^~~~~~~~~~~~~~~
Diffstat (limited to 'android')
| -rw-r--r-- | android/avrcp-lib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c index 2c874952c..21d01955d 100644 --- a/android/avrcp-lib.c +++ b/android/avrcp-lib.c @@ -927,14 +927,15 @@ static ssize_t get_play_status(struct avrcp *session, uint8_t transaction, player->user_data); } -static bool parse_attributes(uint32_t *params, uint16_t params_len, - uint8_t number, uint32_t *attrs) +static bool parse_attributes(struct get_element_attributes_req *req, + uint16_t params_len, uint8_t number, + uint32_t *attrs) { int i; for (i = 0; i < number && params_len >= sizeof(*attrs); i++, params_len -= sizeof(*attrs)) { - attrs[i] = be32_to_cpu(params[i]); + attrs[i] = be32_to_cpu(req->attrs[i]); if (attrs[i] == AVRCP_MEDIA_ATTRIBUTE_ILLEGAL || attrs[i] > AVRCP_MEDIA_ATTRIBUTE_LAST) @@ -964,7 +965,7 @@ static ssize_t get_element_attributes(struct avrcp *session, if (!params || params_len < sizeof(*req)) return -EINVAL; - if (!parse_attributes(req->attrs, params_len - sizeof(*req), + if (!parse_attributes(req, params_len - sizeof(*req), req->number, attrs)) return -EINVAL; |