mirrors/Modest
1
0
Fork 0
mirror of https://github.com/lexborisov/Modest synced 2024-11-24 22:59:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed memory leak in case mycore_realloc failes

Browse Source
This commit is contained in:
frank 2018-03-26 15:04:53 +02:00
parent 76b1839599
commit d650d013af
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/modest/finder/pseudo_class.c
View File

@ -97,29 +97,34 @@ bool modest_finder_selector_sub_type_pseudo_class_function_contains(modest_finde
if(data == NULL) { if(data == NULL) {
return false; return false;
} }
mycss_selectors_entry_t *sel_entry = list->entries_list[i].entry; mycss_selectors_entry_t *sel_entry = list->entries_list[i].entry;
if(sel_entry->key->data){ if(sel_entry->key->data){
const char *str = sel_entry->key->data; const char *str = sel_entry->key->data;
int length = strlen(str) + 1; int length = strlen(str) + 1;
data = mycore_realloc(data, length); char *new_data = mycore_realloc(data, length);
if(data == NULL) { if(new_data == NULL) {
mycore_free(data);
return false; return false;
} }
snprintf(&data[0], length, "%s", str); snprintf(&new_data[0], length, "%s", str);
data = new_data;
} }
mycss_selectors_entry_t *next = sel_entry->next; mycss_selectors_entry_t *next = sel_entry->next;
while(next) { while(next) {
if(next->key->data) { if(next->key->data) {
int prev = strlen(data); int prev = strlen(data);
const char* whitespace = (prev > 0) ? " " : ""; const char *whitespace = (prev > 0) ? " " : "";
const char *str = next->key->data; const char *str = next->key->data;
int length = strlen(whitespace) + strlen(str) + 1; int length = strlen(whitespace) + strlen(str) + 1;
data = mycore_realloc(data, prev + length); char *new_data = mycore_realloc(data, prev + length);
if(data == NULL) { if(new_data == NULL) {
mycore_free(data);
return false; return false;
} }
snprintf(&data[prev], length, "%s%s", whitespace, str); snprintf(&new_data[prev], length, "%s%s", whitespace, str);
data = new_data;
} }
next = next->next; next = next->next;
} }
@ -128,9 +133,7 @@ bool modest_finder_selector_sub_type_pseudo_class_function_contains(modest_finde
mycore_free(data); mycore_free(data);
return true; return true;
} }
else { mycore_free(data);
mycore_free(data);
}
} }
return false; return false;