From: Kevin Day <thekevinday@gmail.com>
Date: Tue, 16 Jun 2020 03:08:16 +0000 (-0500)
Subject: Bugfix: invalid memory management in fll_fss_snatch_apart() and fll_fss_snatch_mash_a... 
X-Git-Tag: 0.5.0~155
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=e12d0f57ce23744c5f4dcdd2d44e68a5d11a9e0a;p=fll

Bugfix: invalid memory management in fll_fss_snatch_apart() and fll_fss_snatch_mash_apart().

Not sure what I was doing, but the logic is just plain wrong.
---

diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c
index f5f4bea..54c755c 100644
--- a/level_2/fll_fss/c/fss.c
+++ b/level_2/fll_fss/c/fss.c
@@ -70,10 +70,10 @@ extern "C" {
         if (F_status_is_error(status)) return status;
         if (status == F_equal_to_not) continue;
 
-        if (values[j]->used + contents.array[i].used > f_string_length_size) return F_status_set_error(F_buffer_too_large);
+        if (values[j]->used + contents.used > values[j]->size) {
+          if (values[j]->used + contents.used > f_array_length_size) return F_status_set_error(F_buffer_too_large);
 
-        if (values[j]->used + contents.array[i].used > values[j]->used) {
-          f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + contents.array[i].used);
+          f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + contents.used);
           if (F_status_is_error(status)) return status;
         }
 
@@ -192,15 +192,19 @@ extern "C" {
         if (F_status_is_error(status)) return status;
         if (status == F_equal_to_not) continue;
 
-        if (values[j]->used + f_fss_default_allocation_step > f_string_length_size) {
-          if (values[j]->used + 1 > f_string_length_size) return F_status_set_error(F_buffer_too_large);
+        if (values[j]->used + 1 > values[j]->size) {
+          if (values[j]->used + f_fss_default_allocation_step > f_array_length_size) {
+            if (values[j]->used + 1 > f_array_length_size) {
+              return F_status_set_error(F_buffer_too_large);
+            }
 
-          f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + 1);
-          if (F_status_is_error(status)) return status;
-        }
-        else if (values[j]->used + 1 > values[j]->used) {
-          f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
-          if (F_status_is_error(status)) return status;
+            f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + 1);
+            if (F_status_is_error(status)) return status;
+          }
+          else {
+            f_macro_string_dynamics_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
+            if (F_status_is_error(status)) return status;
+          }
         }
 
         for (k = 0; k < contents.array[i].used; k++) {