resolve: fix two minor memory leaks

strv_extend() already strdup()s internally, no need to to this twice.
(Also, was missing OOM check...).

Use strv_consume() when we already have a string allocated whose
ownership we want to pass to the strv.

This fixes 50f1e641a9.
This commit is contained in:
Lennart Poettering
2015-07-23 03:26:01 +02:00
parent 6aafa9483d
commit 2c1fb4f712
+2 -2
View File
@@ -533,7 +533,7 @@ static char *format_types(Bitmap *types) {
BITMAP_FOREACH(type, types, i) {
if (dns_type_to_string(type)) {
r = strv_extend(&strv, strdup(dns_type_to_string(type)));
r = strv_extend(&strv, dns_type_to_string(type));
if (r < 0)
return NULL;
} else {
@@ -543,7 +543,7 @@ static char *format_types(Bitmap *types) {
if (r < 0)
return NULL;
r = strv_extend(&strv, t);
r = strv_consume(&strv, t);
if (r < 0)
return NULL;
}