From c668e3531ee98f67f4d35fb8dbe08a6f0a1e0442 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Apr 16 2021 22:14:03 +0000
Subject: Apply patch autofs-5.1.7-fix-dead-code-in-mnts_add_mount.patch


patch_name: autofs-5.1.7-fix-dead-code-in-mnts_add_mount.patch
present_in_specfile: true

---

diff --git a/CHANGELOG b/CHANGELOG
index fe24ee5..43c907f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@
 - fix flags check in umount_multi().
 - dont try umount after stat() ENOENT fail.
 - remove redundant assignment in master_add_amd_mount_section_mounts().
+- fix dead code in mnts_add_mount().
 
 xx/xx/2018 autofs-5.1.5
 - fix flag file permission.
diff --git a/lib/mounts.c b/lib/mounts.c
index 4dea106..1e299f8 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -1205,13 +1205,13 @@ struct mnt_list *mnts_add_mount(struct autofs_point *ap,
 	if (*name == '/') {
 		mp = strdup(name);
 		if (!mp)
-			goto fail;
+			return NULL;
 	} else {
 		int len = ap->len + strlen(name) + 2;
 
 		mp = malloc(len);
 		if (!mp)
-			goto fail;
+			return NULL;
 		strcpy(mp, ap->path);
 		strcat(mp, "/");
 		strcat(mp, name);
@@ -1228,10 +1228,6 @@ struct mnt_list *mnts_add_mount(struct autofs_point *ap,
 	free(mp);
 
 	return this;
-fail:
-	if (mp)
-		free(mp);
-	return NULL;
 }
 
 void mnts_remove_mount(const char *mp, unsigned int flags)