Fix 'cowl_release_all' not releasing all operands if one is NULL

sisinflab-swot · Sep 4, 2024 · 74666a2 · 74666a2
1 parent 709e106
commit 74666a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/include/cowl_impl.h b/include/cowl_impl.h
@@ -138,7 +138,7 @@ COWL_RETAINED
 CowlAnyEntity *cowl_entity_from_string_impl(CowlObjectType type, UString string);
 
 COWL_API
-void cowl_release_all_impl(CowlAny **objects);
+void cowl_release_all_impl(CowlAny **objects, size_t count);
 
 COWL_API
 CowlAny **cowl_get_fields(CowlAny *object, unsigned *count);

diff --git a/include/cowl_object.h b/include/cowl_object.h
@@ -320,8 +320,9 @@ bool cowl_iterate_primitives(CowlAny *object, CowlPrimitiveFlags flags, CowlIter
  */
 #define cowl_release_all(...)                                                                      \
     do {                                                                                           \
-        CowlAny *p_cowl_release_all_##__LINE__[] = { __VA_ARGS__, NULL };                          \
-        cowl_release_all_impl(p_cowl_release_all_##__LINE__);                                      \
+        CowlAny *p_cowl_release_all_##__LINE__[] = { __VA_ARGS__ };                                \
+        cowl_release_all_impl(p_cowl_release_all_##__LINE__,                                       \
+                              ulib_array_count(p_cowl_release_all_##__LINE__));                    \
     } while (0)
 
 /// @}

diff --git a/src/cowl_object.c b/src/cowl_object.c
@@ -475,9 +475,9 @@ CowlAny *cowl_get_impl_uint(CowlObjectType type, CowlAny *fields[], ulib_uint va
     return obj;
 }
 
-void cowl_release_all_impl(CowlAny **objects) {
-    while (*objects) {
-        cowl_release(*(objects++));
+void cowl_release_all_impl(CowlAny **objects, size_t count) {
+    while (count--) {
+        cowl_release(objects[count]);
     }
 }