File autofs-5.1.3-revert-fix-argc-off-by-one-in-moun... of Package autofs

Overview Repositories Revisions Requests Users Attributes Meta

File autofs-5.1.3-revert-fix-argc-off-by-one-in-mount_aut.patch of Package autofs (Revision f6eff0b725cd9f700f9d73be8ee45db0)

Currently displaying revision f6eff0b725cd9f700f9d73be8ee45db0 , Show latest

From 837bae9a218dbcbbed96195c709ee8fd26b9822b Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Tue, 3 Oct 2017 10:21:15 +0800
Subject: [PATCH] autofs-5.1.3 - revert fix argc off by one in mount_autofs.c

Commit 6a44f715cf to fix an off by one error in the arguments calculation
when mounting an autofs submount actually introduced an off by one error
instead of fixing one.

Revert the change.

Signed-off-by: Ian Kent <raven@themaw.net>
Acked-by: David Disseldorp <ddiss@suse.de>
---
 CHANGELOG              | 1 +
 modules/mount_autofs.c | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

Index: autofs-5.1.3/modules/mount_autofs.c
===================================================================
--- autofs-5.1.3.orig/modules/mount_autofs.c
+++ autofs-5.1.3/modules/mount_autofs.c
@@ -181,11 +181,11 @@ int mount_mount(struct autofs_point *ap,
 
 	if (options) {
 		char *t = options;
-		while ((t = strchr(t, ',')) != NULL) {
+		do {
 			argc++;
 			if (*t == ',')
 				t++;
-		}
+		} while ((t = strchr(t, ',')) != NULL);
 	}
 	argv = (const char **) alloca((argc + 1) * sizeof(char *));
 
@@ -213,13 +213,13 @@ int mount_mount(struct autofs_point *ap,
 
 	if (options) {
 		p = options;
-		while ((p = strchr(p, ',')) != NULL) {
+		do {
 			if (*p == ',') {
 				*p = '\0';
 				p++;
 			}
 			argv[argc++] = p;
-		}
+		} while ((p = strchr(p, ',')) != NULL);
 	}
 	argv[argc] = NULL;

Places

File autofs-5.1.3-revert-fix-argc-off-by-one-in-mount_aut.patch of Package autofs (Revision f6eff0b725cd9f700f9d73be8ee45db0)

Places