Merge "property_get: do argument checking."
diff --git a/include/cutils/properties.h b/include/cutils/properties.h
index 7e4ed93..228b73e 100644
--- a/include/cutils/properties.h
+++ b/include/cutils/properties.h
@@ -17,6 +17,8 @@
#ifndef __CUTILS_PROPERTIES_H
#define __CUTILS_PROPERTIES_H
+#include <sys/cdefs.h>
+#include <stddef.h>
#include <sys/system_properties.h>
#ifdef __cplusplus
@@ -48,6 +50,23 @@
int property_list(void (*propfn)(const char *key, const char *value, void *cookie), void *cookie);
+#if defined(__BIONIC_FORTIFY)
+
+extern int __property_get_real(const char *, char *, const char *)
+ __asm__(__USER_LABEL_PREFIX__ "property_get");
+extern void __property_get_too_small_error()
+ __attribute__((__error__("property_get() called with too small of a buffer")));
+
+__BIONIC_FORTIFY_INLINE
+int property_get(const char *key, char *value, const char *default_value) {
+ size_t bos = __bos(value);
+ if (bos < PROPERTY_VALUE_MAX) {
+ __property_get_too_small_error();
+ }
+ return __property_get_real(key, value, default_value);
+}
+
+#endif
#ifdef HAVE_SYSTEM_PROPERTY_SERVER
/*