From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Jul 2015 01:24:08 +0000 (+0200)
Subject: resolve: fix two minor memory leaks
X-Git-Tag: v223~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F667%2Fhead;p=thirdparty%2Fsystemd.git

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 50f1e641a93cacfc693b0c3d300bee5df0c8c460.
---

diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 859b3f73399..9c12205ab8d 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -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;
                 }