am b3cebcbc: am 020cccca: am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge: 8403c6d
* commit 'b3cebcbc353eab5b4920f1ccf69b69560b636e93':
diff --git a/btif/src/btif_sock_sdp.c b/btif/src/btif_sock_sdp.c
index afd99ce..b2fecdd 100644
--- a/btif/src/btif_sock_sdp.c
+++ b/btif/src/btif_sock_sdp.c
@@ -386,7 +386,7 @@
SDP_AddProfileDescriptorList(sdp_handle,
UUID_SERVCLASS_OBEX_OBJECT_PUSH,
- 0x0100);
+ 0x0101);
}
}
diff --git a/stack/gatt/gatt_sr.c b/stack/gatt/gatt_sr.c
index 2199794..eac00db 100755
--- a/stack/gatt/gatt_sr.c
+++ b/stack/gatt/gatt_sr.c
@@ -123,7 +123,7 @@
static BOOLEAN process_read_multi_rsp (tGATT_SR_CMD *p_cmd, tGATT_STATUS status,
tGATTS_RSP *p_msg, UINT16 mtu)
{
- tGATTS_RSP *p_rsp;
+ tGATTS_RSP *p_rsp = NULL;
UINT16 ii, total_len, len;
BT_HDR *p_buf = (BT_HDR *)GKI_getbuf((UINT16)sizeof(tGATTS_RSP));
UINT8 *p;