callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M!29 - evolution-csv-importer.c:parseLine: skip calls to strlen+g_strdup

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/merge_requests/29
This commit is contained in:
Дилян Палаузов
2019-07-09 07:19:05 +00:00
committed by Milan Crha
parent acc53a6169
commit e4325936d3
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/addressbook/importers/evolution-csv-importer.c
View File

@ -657,15 +657,9 @@ parseLine (CSVImporter *gci,
ii++; ii++;
g_string_free (value, TRUE); g_string_free (value, TRUE);
} }
if (strlen (home_street->str) != 0) home_address->street = g_string_free (home_street, !home_street->len);
home_address->street = g_strdup (home_street->str); work_address->street = g_string_free (work_street, !work_street->len);
if (strlen (work_street->str) != 0) other_address->street = g_string_free (other_street, !other_street->len);
work_address->street = g_strdup (work_street->str);
if (strlen (other_street->str) != 0)
other_address->street = g_strdup (other_street->str);
g_string_free (home_street, TRUE);
g_string_free (work_street, TRUE);
g_string_free (other_street, TRUE);
if (home_address->locality || home_address->country || if (home_address->locality || home_address->country ||
home_address->code || home_address->region || home_address->street) home_address->code || home_address->region || home_address->street)