diff options
| author | Gustavo F. Padovan <gustavo@padovan.org> | 2010-06-05 07:14:30 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2010-06-08 14:25:36 +0800 |
| commit | e272c8c69b748abb0a58f57e7c13c9a35b5eb0c3 (patch) | |
| tree | 2015245c397acca0762aac41a946173aa63d57dd /tools/sdptool.c | |
| parent | f982f8fc5189163b77a0a75268ca82e98c814478 (diff) | |
| download | bluez-e272c8c69b748abb0a58f57e7c13c9a35b5eb0c3.tar.gz | |
sdptool: Fix 2 possible NULL dereference
Issues found by smatch static check:
http://smatch.sourceforge.net/
Diffstat (limited to 'tools/sdptool.c')
| -rw-r--r-- | tools/sdptool.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tools/sdptool.c b/tools/sdptool.c index 6fb2e90b2..89a497ad1 100644 --- a/tools/sdptool.c +++ b/tools/sdptool.c @@ -513,14 +513,16 @@ static void sdp_data_printf(sdp_data_t *sdpdata, struct attrib_context *context, */ static void print_tree_attr_func(void *value, void *userData) { - sdp_data_t *sdpdata = NULL; + sdp_data_t *sdpdata = value; uint16_t attrId; struct service_context *service = (struct service_context *) userData; struct attrib_context context; struct attrib_def *attrDef = NULL; int i; - sdpdata = (sdp_data_t *)value; + if (!sdpdata) + return; + attrId = sdpdata->attrId; /* Search amongst the generic attributes */ for (i = 0; i < attrib_max; i++) @@ -549,10 +551,7 @@ static void print_tree_attr_func(void *value, void *userData) context.attrib = attrDef; context.member_index = 0; /* Parse attribute members */ - if (sdpdata) - sdp_data_printf(sdpdata, &context, 2); - else - printf(" NULL value\n"); + sdp_data_printf(sdpdata, &context, 2); /* Update service */ service->service = context.service; } @@ -723,6 +722,9 @@ static void print_raw_attr_func(void *value, void *userData) struct attrib_def *def = NULL; int i; + if (!data) + return; + /* Search amongst the generic attributes */ for (i = 0; i < attrib_max; i++) if (attrib_names[i].num == data->attrId) { @@ -735,10 +737,7 @@ static void print_raw_attr_func(void *value, void *userData) else printf("\tAttribute 0x%04x\n", data->attrId); - if (data) - print_raw_data(data, 2); - else - printf(" NULL value\n"); + print_raw_data(data, 2); } static void print_raw_attr(sdp_record_t *rec) |