commit 6bc62a368da0a434a4e01f7bcb3273bd52a07568
author Matthew Xie <mattx@google.com> Sun Feb 23 22:34:33 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 23 22:34:33 2014 +0000
tree 5ad3af9fd7cf60c38779174f9a818b7e9a38c682
parent 13a01401b8caaa28c407fe21726adc020cfb6169
parent 5e08d1ec92555e2cb3d80f1a9a3c746c76ed3e5d

Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"

stack/hcic/hcicmds.c

diff --git a/stack/hcic/hcicmds.c b/stack/hcic/hcicmds.c
index 21222bd..a530d2a 100644
--- a/stack/hcic/hcicmds.c
+++ b/stack/hcic/hcicmds.c
@@ -1364,6 +1364,7 @@
         return (FALSE);
 
     pp = (UINT8 *)(p + 1);
+    memset(pp, 0, HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CHANGE_NAME);
 
     p->len    = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CHANGE_NAME;
     p->offset = 0;

udrv/ulinux/uipc.c

diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index ff99f0e..28706de 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -213,7 +213,7 @@
     struct sockaddr_un remote;
     struct pollfd pfd;
     int fd;
-    int len = sizeof(struct sockaddr_un);
+    socklen_t len = sizeof(struct sockaddr_un);
 
     BTIF_TRACE_EVENT1("accept fd %d", sfd);