diff --git a/android/hardware/hardware.c b/android/hardware/hardware.c
index 4bd5eba..3a45fe1 100644
--- a/android/hardware/hardware.c
+++ b/android/hardware/hardware.c
@@ -100,12 +100,12 @@
                            const struct hw_module_t **module)
 {
     char path[PATH_MAX];
-    char name[PATH_MAX];
+    char name[PATH_MAX/2];
 
     if (inst)
-        snprintf(name, PATH_MAX, "%s.%s", class_id, inst);
+        snprintf(name, sizeof(name), "%s.%s", class_id, inst);
     else
-        snprintf(name, PATH_MAX, "%s", class_id);
+        snprintf(name, sizeof(name), "%s", class_id);
 
     /*
      * Here we rely on the fact that calling dlopen multiple times on
diff --git a/android/ipc-tester.c b/android/ipc-tester.c
index 1aa17d2..3b7f13a 100644
--- a/android/ipc-tester.c
+++ b/android/ipc-tester.c
@@ -218,7 +218,7 @@
 
 static void bluetoothd_start(int hci_index)
 {
-	char prg_name[PATH_MAX];
+	char prg_name[PATH_MAX + 11];
 	char index[8];
 	char *prg_argv[4];
 
diff --git a/android/tester-main.c b/android/tester-main.c
index e9b1353..8d9add9 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -253,7 +253,7 @@
 
 static void bluetoothd_start(int hci_index)
 {
-	char prg_name[PATH_MAX + 1];
+	char prg_name[PATH_MAX + 1 + 11];
 	char index[8];
 	char *prg_argv[5];