From 371be858d74fe5562a403af75e596d7bd0042905 Mon Sep 17 00:00:00 2001
From: Sami Kerola
Date: Fri, 12 Jul 2019 21:56:52 +0100
Subject: libmount: fix potential null pointer dereference

This is false positive warning, but lets silence it so that if and when
warnings crop up they are easy to notice and take seriously.

libmount/src/optstr.c:354:29: warning: potential null pointer dereference
[-Wnull-dereference]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 libmount/src/optstr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index c0f438fe2..49fc9cc40 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -351,7 +351,9 @@ int mnt_optstr_deduplicate_option(char **optstr, const char *name)
 			end = ol.end;
 			opt = end && *end ? end + 1 : NULL;
 		}
-	} while (rc == 0 && opt && *opt);
+		if (opt == NULL)
+			break;
+	} while (rc == 0 && *opt);
 
 	return rc < 0 ? rc : begin ? 0 : 1;
 }
-- 
cgit v1.2.3-55-g7522