From: Greg Hackmann <ghackmann@google.com>
Date: Tue, 25 Jun 2013 01:05:10 +0000 (-0700)
Subject: Revert "bionic: store property names as variable-length strings"
X-Git-Tag: android-x86-4.4-r1~116
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=982463d99b56a53d6b560a12fe19ed4c7675b425;p=android-x86%2Fbionic.git

Revert "bionic: store property names as variable-length strings"

This reverts commit 492ce95d9f6149137cb5b63c55cf2b3cdbe51e5e.
---

diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c
index 481e6ae45..f9671c636 100644
--- a/libc/bionic/system_properties.c
+++ b/libc/bionic/system_properties.c
@@ -66,9 +66,9 @@ struct prop_area {
 typedef struct prop_area prop_area;
 
 struct prop_info {
+    char name[PROP_NAME_MAX];
     unsigned volatile serial;
     char value[PROP_VALUE_MAX];
-    char name[0];
 };
 
 typedef struct prop_info prop_info;
@@ -92,6 +92,7 @@ typedef struct prop_info prop_info;
 
 typedef volatile uint32_t prop_off_t;
 struct prop_bt {
+    char name[PROP_NAME_MAX];
     uint8_t namelen;
     uint8_t reserved[3];
 
@@ -101,8 +102,6 @@ struct prop_bt {
     prop_off_t right;
 
     prop_off_t children;
-
-    char name[0];
 };
 
 typedef struct prop_bt prop_bt;
@@ -278,7 +277,7 @@ static void *new_prop_obj(size_t size, prop_off_t *off)
 static prop_bt *new_prop_bt(const char *name, uint8_t namelen, prop_off_t *off)
 {
     prop_off_t off_tmp;
-    prop_bt *bt = new_prop_obj(sizeof(prop_bt) + namelen + 1, &off_tmp);
+    prop_bt *bt = new_prop_obj(sizeof(prop_bt), &off_tmp);
     if (bt) {
         memcpy(bt->name, name, namelen);
         bt->name[namelen] = '\0';
@@ -294,7 +293,7 @@ static prop_info *new_prop_info(const char *name, uint8_t namelen,
         const char *value, uint8_t valuelen, prop_off_t *off)
 {
     prop_off_t off_tmp;
-    prop_info *info = new_prop_obj(sizeof(prop_info) + namelen + 1, &off_tmp);
+    prop_info *info = new_prop_obj(sizeof(prop_info), &off_tmp);
     if (info) {
         memcpy(info->name, name, namelen);
         info->name[namelen] = '\0';