From 965a08c5a11bf523436b1b5130f4633016a0f1a6 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 26 Mar 2022 11:22:39 -0500 Subject: [PATCH] Bugfix: Increasing strings by too much. The *_increase_by() methods already include the ".used" length. The previous code is also adding the ".used" length resulting in an increase of ".used" * 2. --- level_1/fl_fss/c/fss/basic.c | 2 +- level_1/fl_fss/c/fss/basic_list.c | 4 ++-- level_1/fl_fss/c/fss/embedded_list.c | 4 ++-- level_1/fl_fss/c/fss/extended_list.c | 4 ++-- level_1/fl_fss/c/private-fss.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/level_1/fl_fss/c/fss/basic.c b/level_1/fl_fss/c/fss/basic.c index 3eb7591..ec38918 100644 --- a/level_1/fl_fss/c/fss/basic.c +++ b/level_1/fl_fss/c/fss/basic.c @@ -181,7 +181,7 @@ extern "C" { } // Ensure that there is room for the potential terminating newline. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 1, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 1, destination); if (F_status_is_error(status)) return status; const f_array_length_t destination_used = destination->used; diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c index 770d784..0617ff1 100644 --- a/level_1/fl_fss/c/fss/basic_list.c +++ b/level_1/fl_fss/c/fss/basic_list.c @@ -585,7 +585,7 @@ extern "C" { } // Ensure that there is room for a slash delimit, the object open character, and the end of line character. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 3, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 3, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; @@ -799,7 +799,7 @@ extern "C" { } // Ensure that there is room for a slash delimit and possibly the end of content character. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 2, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 2, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c index e6b9efe..fd66083 100644 --- a/level_1/fl_fss/c/fss/embedded_list.c +++ b/level_1/fl_fss/c/fss/embedded_list.c @@ -1001,7 +1001,7 @@ extern "C" { } // Ensure that there is room for a slash delimit, the object open character, and the end of line character. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 3, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 3, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; @@ -1237,7 +1237,7 @@ extern "C" { } // Ensure that there is room for a slash delimit and possibly the end of content characters. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 3, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 3, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; diff --git a/level_1/fl_fss/c/fss/extended_list.c b/level_1/fl_fss/c/fss/extended_list.c index 3cb33a1..6c93dc8 100644 --- a/level_1/fl_fss/c/fss/extended_list.c +++ b/level_1/fl_fss/c/fss/extended_list.c @@ -548,7 +548,7 @@ extern "C" { } // Ensure that there is room for a slash delimit, the object open character, and the end of line character. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 3, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 3, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; @@ -784,7 +784,7 @@ extern "C" { } // Ensure that there is room for a slash delimit and possibly the end of content characters. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 3, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 3, destination); if (F_status_is_error(status)) return status; const f_array_length_t used_start = destination->used; diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index 79c0a42..7da2ef0 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -856,7 +856,7 @@ extern "C" { } // Ensure that there is room for the potential start and stop quotes, a potential delimit at start, and the potential object open character. - status = f_string_dynamic_increase_by(destination->used + (range->stop - range->start) + 4, destination); + status = f_string_dynamic_increase_by((range->stop - range->start) + 4, destination); if (F_status_is_error(status)) return status; const f_array_length_t input_start = range->start; -- 1.8.3.1