X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-parser.c;h=a3a438b70fc63a909f474569f24a36dd35741fcb;hb=e591f2e6af157c2573e988ae4f5c5eb8027282fb;hp=dfc04be44c52b2cfc5f09a2b2dfc9432018ca10d;hpb=389b447a91e26f255e79c4fd8520d99931809ed0;p=pspp-builds.git

diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c
index dfc04be4..a3a438b7 100644
--- a/src/language/data-io/data-parser.c
+++ b/src/language/data-io/data-parser.c
@@ -480,7 +480,8 @@ cut_field (const struct data_parser *parser, struct dfm_reader *reader,
       /* Regular field. */
       ss_get_chars (&p, ss_cspan (p, ds_ss (&parser->any_sep)), field);
       *last_column = dfm_column_start (reader);
-      if (!ss_ltrim (&p, parser->soft_seps) || ss_is_empty (p))
+      if (!ss_ltrim (&p, parser->soft_seps) || ss_is_empty (p)
+          || ss_find_char (parser->hard_seps, p.string[0]) != SIZE_MAX)
         {
           /* Advance past a trailing hard separator,
              regardless of whether one actually existed.  If