libmount: fix mnt_optstr_remove_option_at()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/shlibs/mount/src/optstr.c b/shlibs/mount/src/optstr.c
index 5e54465896da5fea1d267b63734e3f5c42dccd5d..c5c7c221a37742673f3af8a4eeac700175b27ab2 100644 (file)
--- a/shlibs/mount/src/optstr.c
+++ b/shlibs/mount/src/optstr.c
@@ -297,7 +297,7 @@ int mnt_optstr_get_option(char *optstr, const char *name,
  */
 int mnt_optstr_remove_option_at(char **optstr, char *begin, char *end)
 {
-       size_t sz = strlen(end);
+       size_t sz;
 
        if (!optstr || !begin || !end)
                return -EINVAL;
@@ -305,6 +305,8 @@ int mnt_optstr_remove_option_at(char **optstr, char *begin, char *end)
        if ((begin == *optstr || *(begin - 1) == ',') && *end == ',')
                end++;
 
+       sz = strlen(end);
+
        memmove(begin, end, sz + 1);
        if (!*begin && *(begin - 1) == ',')
                *(begin - 1) = '\0';