X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=3c75bdaa2f524b32d380c42cec7f4e81ba78da58;hb=0e47c219fc5c509f277c9a44f2d29362fff88193;hp=6a9d1120e0cf30e44396ef32628f830f1cec85c0;hpb=70721db6d7ba0d4f3ac5c17f2cedac056065ad8a;p=elogind.git

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 6a9d1120e..3c75bdaa2 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -66,7 +66,7 @@ static void set_str(char *to, const char *from, size_t count)
 
 	/* strip trailing whitespace */
 	len = strnlen(from, count);
-	while (isspace(from[len-1]))
+	while (len && isspace(from[len-1]))
 		len--;
 
 	/* strip leading whitespace */
@@ -156,6 +156,7 @@ int main(int argc, char *argv[])
 
 print:
 	set_str(name, vid->label, sizeof(vid->label));
+	replace_untrusted_chars(name);
 
 	switch (print) {
 	case PRINT_EXPORT: