commit 326db754b79c550ef4444d1e0f5d29f5a82e1117
author George Burgess IV <gbiv@google.com> Fri Feb 10 02:49:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 02:49:30 2017 +0000
tree fe26e9aa7d7b93c7db7fe508ce65d62f73afebd5
parent 54c6f40c78f688d4f50f21e312970a517d3178e2
parent 369babf60a2aeb91e17f4e9429ea8f7bba02c323

Attempt to fix clang FORTIFY build breakage.
am: 369babf60a

Change-Id: I3e5bb87bf49ea9010364b88e227d0f4f02d40b43

sensor_hub/cros_ec_sensors.h

diff --git a/sensor_hub/cros_ec_sensors.h b/sensor_hub/cros_ec_sensors.h
index d28311d..61b3124 100644
--- a/sensor_hub/cros_ec_sensors.h
+++ b/sensor_hub/cros_ec_sensors.h
@@ -30,7 +30,11 @@
 #define IIO_MAX_BUFF_SIZE 4096
 #define INT32_CHAR_LEN 12
 
-#define IIO_MAX_DEVICE_NAME_LENGTH (strlen(IIO_DIR) + IIO_MAX_NAME_LENGTH)
+/*
+ * Use sizeof(...) - 1 instead of strlen because clang FORTIFY makes strlen
+ * non-constant.
+ */
+#define IIO_MAX_DEVICE_NAME_LENGTH (sizeof(IIO_DIR) - 1 + IIO_MAX_NAME_LENGTH)
 
 #define CROS_EC_MAX_SAMPLING_PERIOD ((1 << 16) - 2)