Merge branch 'searchdir_leak-406' of git://git.zytor.com/users/sha0/syslinux into...

Pull a change that fixes a resource leak from Shao Miller,

* 'searchdir_leak-406' of git://git.zytor.com/users/sha0/syslinux:
  fs: Fix searchdir resource leak

diff --git a/extlinux/main.c b/extlinux/main.c
index f0d8e11..dbf538a 100644 (file)
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -1236,9 +1236,7 @@ int modify_existing_adv(const char *path)
     if (devfd < 0)
        return 1;
 
-    if (opt.reset_adv)
-       syslinux_reset_adv(syslinux_adv);
-    else if (ext_read_adv(path, devfd, &filename) < 0) {
+    if (ext_read_adv(path, devfd, &filename) < 0) {
        close(devfd);
        return 1;
     }