merge post-1.3.0 fixes

git-svn-id: svn://busybox.net/trunk/busybox@17084 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 0 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 661e26f19..b3e8c478c 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1708,10 +1708,13 @@ int mount_main(int argc, char **argv)
 
                         // Mount this thing.
 
+                        // NFS mounts want this to be xrealloc-able
+                        mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
                         if (singlemount(mtcur, 1)) {
                                 /* Count number of failed mounts */
                                 rc++;
                         }
+                        free(mtcur->mnt_opts);
                 }
         }
         if (ENABLE_FEATURE_CLEAN_UP) endmntent(fstab);