minor cleanup

awslabs · Jul 31, 2024 · 413555b · 413555b
1 parent 6af581f
commit 413555b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/include/aws/sdkutils/private/endpoints_types_impl.h b/include/aws/sdkutils/private/endpoints_types_impl.h
@@ -96,8 +96,8 @@ struct aws_endpoints_value {
         double number;
         struct aws_array_list array;
     } v;
-    /* TODO: ref count? */
-    bool is_shallow;
+    /* Value is a reference to another value, no need to clean it up. */
+    bool is_ref;
 };
 
 struct aws_endpoints_parameter {

diff --git a/source/endpoints_rule_engine.c b/source/endpoints_rule_engine.c
@@ -189,7 +189,7 @@ static int s_init_top_level_scope(
                 case AWS_ENDPOINTS_PARAMETER_BOOLEAN:
                 case AWS_ENDPOINTS_PARAMETER_STRING_ARRAY:
                     val->value = value->default_value;
-                    val->value.is_shallow = true;
+                    val->value.is_ref = true;
                     break;
                     break;
                 default:
@@ -312,12 +312,12 @@ static int s_resolve_expr(
                 size_t len = aws_array_list_length(&expr->e.array);
                 aws_array_list_init_dynamic(&out_value->v.array, allocator, len, sizeof(struct aws_endpoints_value));
                 for (size_t i = 0; i < len; ++i) {
-                    struct aws_endpoints_expr elem;
-                    aws_array_list_get_at(&expr->e.array, &elem, i);
+                    struct aws_endpoints_expr expr_elem;
+                    aws_array_list_get_at(&expr->e.array, &expr_elem, i);
                     struct aws_endpoints_value val;
-                    if (s_resolve_expr(allocator, &elem, scope, &val)) {
-                        AWS_LOGF_ERROR(AWS_LS_SDKUTILS_ENDPOINTS_RESOLVE, "Failed to array element.");
-                        /* todo: cleanup */
+                    if (s_resolve_expr(allocator, &expr_elem, scope, &val)) {
+                        AWS_LOGF_ERROR(AWS_LS_SDKUTILS_ENDPOINTS_RESOLVE, "Failed to resolve array element.");
+                        aws_endpoints_value_clean_up(out_value);
                         goto on_error;
                     }
                     aws_array_list_set_at(&out_value->v.array, &val, i);
@@ -338,7 +338,7 @@ static int s_resolve_expr(
                 struct aws_endpoints_scope_value *aws_endpoints_scope_value = element->value;
 
                 *out_value = aws_endpoints_scope_value->value;
-                out_value->is_shallow = true;
+                out_value->is_ref = true;
             }
             break;
         }
@@ -481,7 +481,7 @@ int aws_endpoints_path_through_array(
     }
 
     *out_value = *val;
-    out_value->is_shallow = true;
+    out_value->is_ref = true;
 
     return AWS_OP_SUCCESS;
 
@@ -756,7 +756,7 @@ int aws_endpoints_request_context_add_string_array(
 
     for (size_t i = 0; i < len; ++i) {
         struct aws_endpoints_value elem = {
-            .is_shallow = false,
+            .is_ref = false,
             .type = AWS_ENDPOINTS_VALUE_STRING,
             .v.owning_cursor_object = aws_endpoints_owning_cursor_from_cursor(allocator, values[i])};
 

diff --git a/source/endpoints_ruleset.c b/source/endpoints_ruleset.c
@@ -476,7 +476,7 @@ static int s_on_parameter_key(
                 aws_json_value_get_string(element, &cur);
 
                 struct aws_endpoints_value val = {
-                    .is_shallow = false,
+                    .is_ref = false,
                     .type = AWS_ENDPOINTS_VALUE_STRING,
                     .v.owning_cursor_string = aws_endpoints_non_owning_cursor_create(cur)};
 

diff --git a/source/endpoints_types_impl.c b/source/endpoints_types_impl.c
@@ -205,7 +205,7 @@ void aws_endpoints_value_clean_up_cb(void *value);
 void aws_endpoints_value_clean_up(struct aws_endpoints_value *aws_endpoints_value) {
     AWS_PRECONDITION(aws_endpoints_value);
 
-    if (aws_endpoints_value->is_shallow) {
+    if (aws_endpoints_value->is_ref) {
         goto on_done;
     }
 
@@ -236,7 +236,7 @@ int aws_endpoints_deep_copy_parameter_value(
     struct aws_endpoints_value *to) {
 
     to->type = from->type;
-    to->is_shallow = false;
+    to->is_ref = false;
 
     if (to->type == AWS_ENDPOINTS_VALUE_STRING) {
         to->v.owning_cursor_string =
@@ -251,7 +251,10 @@ int aws_endpoints_deep_copy_parameter_value(
             aws_array_list_get_at(&from->v.array, &val, i);
 
             struct aws_endpoints_value to_val;
-            aws_endpoints_deep_copy_parameter_value(allocator, &val, &to_val);
+            if (aws_endpoints_deep_copy_parameter_value(allocator, &val, &to_val)) {
+                AWS_LOGF_ERROR(AWS_LS_SDKUTILS_ENDPOINTS_RESOLVE, "Unexpected array element type.");
+                goto on_error;
+            }
 
             aws_array_list_set_at(&to->v.array, &to_val, i);
         }
@@ -261,4 +264,8 @@ int aws_endpoints_deep_copy_parameter_value(
     }
 
     return AWS_OP_SUCCESS;
+
+on_error:
+    aws_endpoints_value_clean_up(to);
+    return AWS_OP_ERR;
 }