From fa82ee22a8bb59696f327605f6a92cf4c6dffb7e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 19 Jan 2024 17:55:04 +0600
Subject: [PATCH] Function minor fixes

---
 source/libublsettings.c | 45 ++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/source/libublsettings.c b/source/libublsettings.c
index 9c417d6..46979d0 100644
--- a/source/libublsettings.c
+++ b/source/libublsettings.c
@@ -515,22 +515,24 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
 }
 
 char **yon_char_parsed_rip(char **char_string, int *size, int item_to_delete){
-    char **new_char_parsed=NULL;
-    new_char_parsed=malloc(sizeof(char*)*((*size)-1));
-    int flag = 0;
-    for (int i=0;i < (*size);i++){
-        if (i==item_to_delete) {
-            flag = 1;
-        }
-        if (flag == 0) {
-            new_char_parsed[i]=yon_char_new(char_string[i]);
-        }
-        else if (flag == 1 && i!=item_to_delete) {
-            new_char_parsed[i-1]=yon_char_new(char_string[i]);
+    if (char_string&&size>0&&size>item_to_delete&&item_to_delete>0){
+        char **new_char_parsed=NULL;
+        new_char_parsed=malloc(sizeof(char*)*((*size)-1));
+        int flag = 0;
+        for (int i=0;i < (*size);i++){
+            if (i==item_to_delete) {
+                flag = 1;
+            }
+            if (flag == 0) {
+                new_char_parsed[i]=yon_char_new(char_string[i]);
+            }
+            else if (flag == 1 && i!=item_to_delete) {
+                new_char_parsed[i-1]=yon_char_new(char_string[i]);
+            }
         }
-    }
-    (*size)=(*size)-1;
-    return new_char_parsed;
+        (*size)=(*size)-1;
+        return new_char_parsed;
+    } else return NULL;
 }
 
 int yon_char_parsed_check_exist(char **parameters, int size, char *param){
@@ -593,10 +595,12 @@ config_str yon_char_parsed_new (int *size, ...){
 }
 
 void yon_char_parsed_free(config_str source, int size){
-    for (int i=0;i<size;i++){
-        free(source[i]);
+    if (source&&size>0){
+        for (int i=0;i<size;i++){
+            free(source[i]);
+        }
+        free(source);
     }
-    free(source);
 }
 
 config_str yon_char_parsed_copy(config_str to_copy, int size){
@@ -725,8 +729,11 @@ dictionary *yon_char_parsed_convert_copy_to_dictionary(config_str parsed, int si
 char *yon_char_parsed_to_string(config_str parsed, int size, char *divider_replace){
     if (parsed && size>0){
         char *final_string = "";
+        char *temp;
         for (int i=0;i<size;i++){
-            yon_char_unite(final_string,yon_char_is_empty(final_string)?"":divider_replace,parsed[i],NULL);
+            temp = yon_char_unite(final_string,yon_char_is_empty(final_string)?"":divider_replace,parsed[i],NULL);
+            if (!yon_char_is_empty(final_string)) free(final_string);
+            final_string=temp;
         }
         if (!yon_char_is_empty(final_string)){
             return final_string;