From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 28 Sep 2013 22:22:43 +0000 (-0400)
Subject: findmnt: always allocate memory for cell value
X-Git-Tag: v2.24-rc2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=203c945a15378ed63c9f9219a3c9c56ce238031d;p=thirdparty%2Futil-linux.git

findmnt: always allocate memory for cell value

Since b3386c83fe77, findmnt's output uses TT_FL_FREEDATA, which causes
a crash here when string literal is returned instead of a heap address.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 8861b09bd3..91cc9350e0 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -469,7 +469,7 @@ static char *get_vfs_attr(struct libmnt_fs *fs, int sizetype)
 		break;
 	case COL_USEPERC:
 		if (buf.f_blocks == 0)
-			return "-";
+			return xstrdup("-");
 
 		xasprintf(&sizestr, "%.0f%%",
 				(double)(buf.f_blocks - buf.f_bfree) /