diff options
Diffstat (limited to 'stack/sdp/sdp_utils.c')
| -rw-r--r-- | stack/sdp/sdp_utils.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/stack/sdp/sdp_utils.c b/stack/sdp/sdp_utils.c index 3cf439706..5c8d73312 100644 --- a/stack/sdp/sdp_utils.c +++ b/stack/sdp/sdp_utils.c @@ -231,6 +231,8 @@ UINT8 *sdpu_build_attrib_seq (UINT8 *p_out, UINT16 *p_attr, UINT16 num_attrs) *******************************************************************************/ UINT8 *sdpu_build_attrib_entry (UINT8 *p_out, tSDP_ATTRIBUTE *p_attr) { + if(!p_out) + return p_out; /* First, store the attribute ID. Goes as a UINT */ UINT8_TO_BE_STREAM (p_out, (UINT_DESC_TYPE << 3) | SIZE_TWO_BYTES); UINT16_TO_BE_STREAM (p_out, p_attr->id); @@ -1026,11 +1028,12 @@ UINT8 *sdpu_build_partial_attrib_entry (UINT8 *p_out, tSDP_ATTRIBUTE *p_attr, UI attr_len = sdpu_get_attrib_entry_len(p_attr); len_to_copy = ((attr_len - *offset) < len) ? (attr_len - *offset): len; - - memcpy(p_out, &p_attr_buff[*offset], len_to_copy); - - p_out = &p_out[len_to_copy]; - *offset += len_to_copy; + if(p_out) + { + memcpy(p_out, &p_attr_buff[*offset], len_to_copy); + p_out = &p_out[len_to_copy]; + *offset += len_to_copy; + } GKI_freebuf(p_attr_buff); return p_out; |