From f0591385d26feb21a98d0971a8ebb2223f2ed20a Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 11 Jul 2014 10:37:34 +0300 Subject: [PATCH] android: Fix usage of PATH_MAX PATH_MAX already contains the terminating null so there's no need to +1 to it. --- android/android-tester.c | 4 ++-- android/ipc-tester.c | 4 ++-- android/system-emulator.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/android-tester.c b/android/android-tester.c index ff296759f..168d48f2e 100644 --- a/android/android-tester.c +++ b/android/android-tester.c @@ -147,7 +147,7 @@ struct hh_cb_data { int size; }; -static char exec_dir[PATH_MAX + 1]; +static char exec_dir[PATH_MAX]; static gint scheduled_cbacks_num = 0; @@ -604,7 +604,7 @@ static void test_post_teardown(const void *test_data) static void bluetoothd_start(int hci_index) { - char prg_name[PATH_MAX + 1]; + char prg_name[PATH_MAX]; char index[8]; char *prg_argv[5]; diff --git a/android/ipc-tester.c b/android/ipc-tester.c index 99cc31f4f..5ca236a2f 100644 --- a/android/ipc-tester.c +++ b/android/ipc-tester.c @@ -81,7 +81,7 @@ struct regmod_msg { #define CONNECT_TIMEOUT (5 * 1000) #define SERVICE_NAME "bluetoothd" -static char exec_dir[PATH_MAX + 1]; +static char exec_dir[PATH_MAX]; static int cmd_sk = -1; static int notif_sk = -1; @@ -218,7 +218,7 @@ static void test_post_teardown(const void *data) static void bluetoothd_start(int hci_index) { - char prg_name[PATH_MAX + 1]; + char prg_name[PATH_MAX]; char index[8]; char *prg_argv[4]; diff --git a/android/system-emulator.c b/android/system-emulator.c index 4d41fceb1..4adc109e3 100644 --- a/android/system-emulator.c +++ b/android/system-emulator.c @@ -42,7 +42,7 @@ #include "monitor/mainloop.h" -static char exec_dir[PATH_MAX + 1]; +static char exec_dir[PATH_MAX]; static pid_t daemon_pid = -1; static pid_t snoop_pid = -1; @@ -82,7 +82,7 @@ static void run_bluetoothd(char *prg_name) static void ctl_start(void) { - char prg_name[PATH_MAX + 1]; + char prg_name[PATH_MAX]; pid_t pid; snprintf(prg_name, sizeof(prg_name), "%s/%s", exec_dir, "bluetoothd"); @@ -110,7 +110,7 @@ static void ctl_start(void) static void snoop_start(void) { - char prg_name[PATH_MAX + 1]; + char prg_name[PATH_MAX]; char *prg_argv[3]; char *prg_envp[1]; pid_t pid; -- 2.47.3