X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_info.c;h=fe65acac9062a0625edf680db6509a2ffe1b042d;hb=dd86fdf1b4d99437b9aa19934e02230c090cc1d5;hp=d0d9db5b456dcfe992076a097c5225fc43a7cf44;hpb=657d850f957a2dd703e3aab2d7cde4b0f9711c15;p=rrdtool.git

diff --git a/src/rrd_info.c b/src/rrd_info.c
index d0d9db5..fe65aca 100644
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -99,17 +99,15 @@ info_t   *rrd_info_r(
 {
     unsigned int i, ii = 0;
     rrd_t     rrd;
-    info_t   *data, *cd;
+    info_t   *data = NULL, *cd;
     infoval   info;
     rrd_file_t *rrd_file;
     enum cf_en current_cf;
     enum dst_en current_ds;
 
     rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
-    if (rrd_file == NULL) {
-        return (NULL);
-    }
-    close(rrd_file->fd);
+    if (rrd_file == NULL)
+        goto err_free;
 
     info.u_str = filename;
     cd = info_push(NULL, sprintf_alloc("filename"), RD_I_STR, info);
@@ -306,8 +304,9 @@ info_t   *rrd_info_r(
             }
         }
     }
-    rrd_free(&rrd);
+
     rrd_close(rrd_file);
+  err_free:
+    rrd_free(&rrd);
     return (data);
-
 }