Fix uecho_object_setpropertymap()

Author: cybergarage

src/uecho/object.c

@@ -360,7 +360,6 @@ bool uecho_propertymap_codetoformat2(uEchoPropertyCode prop_code, int* prop_map_
 bool uecho_object_setpropertymap(uEchoObject* obj, uEchoPropertyCode map_code, uEchoPropertyCode* prop_codes, size_t props_code_size)
 {
   byte prop_map_data[uEchoPropertyMapFormatMaxSize];
-  uEchoPropertyCode* prop_map;
   uEchoPropertyCode prop_code;
   int prop_map_row, prop_map_bit;
   size_t n;
@@ -369,25 +368,24 @@ bool uecho_object_setpropertymap(uEchoObject* obj, uEchoPropertyCode map_code, u
     return false;
 
   prop_map_data[0] = (byte)props_code_size;
-  prop_map = prop_map_data + 1;
 
   // Description Format 1
 
   if (props_code_size <= uEchoPropertyMapFormat1MaxSize) {
-    memcpy(prop_map, prop_codes, props_code_size);
+    memcpy((prop_map_data +1), prop_codes, props_code_size);
     uecho_propertylist_set(obj->properties, map_code, uEchoPropertyAttrRead, prop_map_data, (props_code_size + 1));
     return true;
   }
 
   // Description Format 2
 
-  memset(prop_map, 0, uEchoPropertyMapFormatMaxSize);
+  memset((prop_map_data +1), 0, uEchoPropertyMapFormat2MapSize);
   for (n = 0; n < props_code_size; n++) {
     prop_code = prop_codes[n];
     if (!uecho_propertymap_codetoformat2(prop_code, &prop_map_row, &prop_map_bit)) {
       continue;
     }
-    prop_map[prop_map_row] |= ((0x01 << prop_map_bit) & 0x0F);
+    prop_map_data[prop_map_row] |= ((0x01 << prop_map_bit) & 0x0F);
   }
 
   uecho_propertylist_setdata(obj->properties, map_code, prop_map_data, uEchoPropertyMapFormat2Size);

test/PropertyMapTest.cpp

@@ -45,20 +45,20 @@ BOOST_AUTO_TEST_CASE(PropertyMap)
     for (int j = 0; j < sizeof(prop_codes) / sizeof(prop_codes[0]); j++) {
       uEchoPropertyCode prop_code = prop_codes[i];
 
-      size_t expectedPropMapCount = 0;
+      size_t expected_prop_map_count = 0;
       for (uEchoProperty* prop = uecho_object_getproperties(obj); prop; prop = uecho_property_next(prop)) {
         switch (prop_code) {
         case uEchoObjectGetPropertyMap: {
           if (uecho_property_isreadable(prop))
-            expectedPropMapCount++;
+            expected_prop_map_count++;
         } break;
         case uEchoObjectSetPropertyMap: {
           if (uecho_property_iswritable(prop))
-            expectedPropMapCount++;
+            expected_prop_map_count++;
         } break;
         case uEchoObjectAnnoPropertyMap: {
           if (uecho_property_isannounceable(prop))
-            expectedPropMapCount++;
+            expected_prop_map_count++;
         } break;
         }
       }
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(PropertyMap)
 
       size_t prop_map_count = 0;
       uecho_property_getpropertymapcount(prop, &prop_map_count);
-      BOOST_CHECK_EQUAL(prop_map_count, expectedPropMapCount);
+      BOOST_CHECK_EQUAL(prop_map_count, expected_prop_map_count);
 
       uEchoPropertyCode* prop_map_codes = (uEchoPropertyCode*)malloc(prop_map_count);
       BOOST_CHECK(uecho_property_getpropertymapcodes(prop, prop_map_codes, prop_map_count));