From 6ebbf94bccb74d4ae2d13e73f6c6e8023cdb37d8 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 19 Apr 2013 16:33:37 +0300 Subject: [PATCH] tools: Fix AVRCP parsing of GetFolderItems for folders and items Length of name is 2 bytes not 1 --- tools/parser/avrcp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/parser/avrcp.c b/tools/parser/avrcp.c index 84048822d..c8ecdc541 100644 --- a/tools/parser/avrcp.c +++ b/tools/parser/avrcp.c @@ -1748,8 +1748,8 @@ static const char *foldertype2str(uint8_t type) static void avrcp_folder_item_dump(int level, struct frame *frm, uint16_t len) { - uint8_t type, playable, namelen; - uint16_t charset; + uint8_t type, playable; + uint16_t charset, namelen; uint64_t uid; p_indent(level, frm); @@ -1781,8 +1781,8 @@ static void avrcp_folder_item_dump(int level, struct frame *frm, uint16_t len) p_indent(level, frm); - namelen = get_u8(frm); - printf("NameLength: 0x%02x (%u)\n", namelen, namelen); + namelen = get_u16(frm); + printf("NameLength: 0x%04x (%u)\n", namelen, namelen); p_indent(level, frm); @@ -1845,8 +1845,8 @@ static void avrcp_media_element_item_dump(int level, struct frame *frm, uint16_t len) { uint64_t uid; - uint16_t charset; - uint8_t type, namelen, count; + uint16_t charset, namelen; + uint8_t type, count; if (len < 14) { printf("PDU Malformed\n"); @@ -1869,8 +1869,8 @@ static void avrcp_media_element_item_dump(int level, struct frame *frm, p_indent(level, frm); - namelen = get_u8(frm); - printf("NameLength: 0x%02x (%u)\n", namelen, namelen); + namelen = get_u16(frm); + printf("NameLength: 0x%04x (%u)\n", namelen, namelen); p_indent(level, frm); -- 2.47.3