aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btsdp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-09-20 12:04:52 -0700
committerGuy Harris <guy@alum.mit.edu>2015-09-20 19:06:36 +0000
commit821ebb81f1b7e9c5edb8b504e1c6272311137831 (patch)
tree213ec9ac42f545282f1ed3ee8e5621a9c0ec36b8 /epan/dissectors/packet-btsdp.c
parent8626bb4cbb4d9926f7b56663585d9ef66252f93f (diff)
Don't hand zero-length UUIDs to print_numeric_uuid().
It returns a null pointer if you do. Change-Id: I3bc934a576dba261d1e71767978e3789a892e728 Reviewed-on: https://code.wireshark.org/review/10590 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-btsdp.c')
-rw-r--r--epan/dissectors/packet-btsdp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 49597e1488..c29c38d1e9 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -1123,6 +1123,8 @@ get_specified_uuid(wmem_array_t *uuid_array)
p_uuid = (bluetooth_uuid_t *) wmem_array_index(uuid_array, i_uuid);
if (p_uuid->size == 16) /* CustomUUID (UUID128) is always ok */
break;
+ if (p_uuid->size == 0)
+ continue;
if (dissector_get_string_handle(bluetooth_uuid_table, print_numeric_uuid(p_uuid)))
break;
}