From a1bb2402cb6edc4b46f6bf2bc3ed2773bb213919 Mon Sep 17 00:00:00 2001 From: Nate Clark Date: Fri, 16 Jun 2017 16:44:57 -0400 Subject: [PATCH] udev-builtin-blkid: Use _cleanup_blkid_free_probe_ to free probe (#6108) Use the _cleanup_blkid_free_probe_ to guarantee that the blkid_probe will be freed when builtin_blkid exits. --- src/udev/udev-builtin-blkid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 63194036206..4171bbd3ce5 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -30,6 +30,7 @@ #include "sd-id128.h" #include "alloc-util.h" +#include "blkid-util.h" #include "efivars.h" #include "fd-util.h" #include "gpt.h" @@ -225,7 +226,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t int64_t offset = 0; bool noraid = false; _cleanup_close_ int fd = -1; - blkid_probe pr; + _cleanup_blkid_free_probe_ blkid_probe pr = NULL; const char *data; const char *name; const char *prtype = NULL; @@ -321,7 +322,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t if (is_gpt) find_gpt_root(dev, pr, test); - blkid_free_probe(pr); out: if (err < 0) return EXIT_FAILURE; -- 2.47.3