diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/avrcp.c | 7 | ||||
-rw-r--r-- | android/system-emulator.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/android/avrcp.c b/android/avrcp.c index 8c3e25a95..f4b138bab 100644 --- a/android/avrcp.c +++ b/android/avrcp.c @@ -515,12 +515,17 @@ static sdp_record_t *avrcp_ct_record(void) return record; } +static void queue_free(void *data, void *user_data) +{ + g_free(data); +} + static void avrcp_device_free(void *data) { struct avrcp_device *dev = data; if (dev->queue) { - g_queue_foreach(dev->queue, (GFunc) g_free, NULL); + g_queue_foreach(dev->queue, queue_free, NULL); g_queue_free(dev->queue); } diff --git a/android/system-emulator.c b/android/system-emulator.c index 61fb4967e..1545dcea1 100644 --- a/android/system-emulator.c +++ b/android/system-emulator.c @@ -86,7 +86,7 @@ static void run_bluetoothd(char *prg_name) static void ctl_start(void) { - char prg_name[PATH_MAX]; + char prg_name[PATH_MAX + 11]; pid_t pid; snprintf(prg_name, sizeof(prg_name), "%s/%s", exec_dir, "bluetoothd"); @@ -114,7 +114,7 @@ static void ctl_start(void) static void snoop_start(void) { - char prg_name[PATH_MAX]; + char prg_name[PATH_MAX + 17]; char *prg_argv[3]; char *prg_envp[1]; pid_t pid; |