diff --git a/init/property_service.c b/init/property_service.c
index 79ff6c0..846a0a3 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -272,7 +272,7 @@
     return 0;
 }
 
-int property_get(const char *name, char value[PROP_VALUE_MAX])
+int __property_get(const char *name, char *value)
 {
     return __system_property_get(name, value);
 }
diff --git a/init/property_service.h b/init/property_service.h
index b08c118..46cbd8f 100644
--- a/init/property_service.h
+++ b/init/property_service.h
@@ -26,9 +26,25 @@
 extern void load_persist_props(void);
 extern void start_property_service(void);
 void get_property_workspace(int *fd, int *sz);
-extern int property_get(const char *name, char value[PROP_VALUE_MAX]);
+extern int __property_get(const char *name, char *value);
 extern int property_set(const char *name, const char *value);
 extern int properties_inited();
 int get_property_set_fd(void);
 
+extern void __property_get_size_error()
+    __attribute__((__error__("property_get called with too small buffer")));
+
+static inline
+__attribute__ ((always_inline))
+__attribute__ ((gnu_inline))
+__attribute__ ((artificial))
+int property_get(const char *name, char *value)
+{
+    size_t value_len = __builtin_object_size(value, 0);
+    if (value_len != PROP_VALUE_MAX)
+        __property_get_size_error();
+
+    return __property_get(name, value);
+}
+
 #endif	/* _INIT_PROPERTY_H */