From 8a2c0876754baa2085bce94d6778b5d2f4aee937 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 1 Jul 2015 15:00:06 -0500 Subject: Fix segfault with "mount -o ro,remount". Or any call to comma_scan where 'opt' appears as the last item in 'optlist'. --- lib/getmountlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/getmountlist.c b/lib/getmountlist.c index 30fb9a35..4fec41b7 100644 --- a/lib/getmountlist.c +++ b/lib/getmountlist.c @@ -78,7 +78,7 @@ int comma_scan(char *optlist, char *opt, int clean) no = 2*(*s == 'n' && s[1] == 'o'); if (optlen == len-no && !strncmp(opt, s+no, optlen)) { got = !no; - if (clean) memmove(s, optlist, strlen(optlist)+1); + if (clean && optlist) memmove(s, optlist, strlen(optlist)+1); } } -- cgit v1.2.3