summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorДилян Палаузов <git-dpa@aegee.org>2019-07-07 15:43:10 +0000
committerMilan Crha <mcrha@redhat.com>2019-07-08 16:07:12 +0200
commit07fed7217ad916e676ba058f979c9a0fdba14563 (patch)
tree5b65d7a5e1b60f6a05fe0e8d31142f1c52a483fc
parent3df5204698fea00e245d6d588922e55fbfa7775e (diff)
downloadevolution-data-server-07fed7217ad916e676ba058f979c9a0fdba14563.tar.gz
M!20 - camel-search-sql-sexp.c:func_and() memory leak
When string->len == 4, the value of string->str was leaked. Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/20
-rw-r--r--src/camel/camel-search-sql-sexp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/camel/camel-search-sql-sexp.c b/src/camel/camel-search-sql-sexp.c
index cf886e755..feaab11ca 100644
--- a/src/camel/camel-search-sql-sexp.c
+++ b/src/camel/camel-search-sql-sexp.c
@@ -100,11 +100,9 @@ func_and (CamelSExp *f,
g_string_append (string, " )");
r = camel_sexp_result_new (f, CAMEL_SEXP_RES_STRING);
- if (strlen (string->str) == 4)
- r->value.string = g_strdup ("");
- else
- r->value.string = string->str;
- g_string_free (string, FALSE);
+ if (string->len == 4)
+ g_string_set_size (string, 0);
+ r->value.string = g_string_free (string, FALSE);
return r;
}