X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;fp=src%2Finput%2Fcsv.c;h=66cf4bb3c2445af3ad9c8c3c1be36e2d658b03d4;hb=cd11e33c5de58edb0340fd9f25115aa4509f4767;hp=1c4a5d7f16c8f7e18e063554a23ebccdb564c8f6;hpb=d999f2b61e96882aed01fd58cbf45e773b855009;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index 1c4a5d7f..66cf4bb3 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -756,7 +756,20 @@ static void strip_comment(char *buf, const GString *prefix)
  */
 static char **split_line(char *buf, struct context *inc)
 {
-	return g_strsplit(buf, inc->delimiter->str, 0);
+	char **fields, *f;
+	size_t l;
+
+	fields = g_strsplit(buf, inc->delimiter->str, 0);
+	if (!fields)
+		return NULL;
+
+	l = g_strv_length(fields);
+	while (l--) {
+		f = fields[l];
+		g_strchomp(f);
+	}
+
+	return fields;
 }
 
 /**