From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
Date: Sun, 3 Jun 2018 21:24:54 +0000 (+0200)
Subject: gui: fixed crash when entering data for user defined currency variable
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=5a93cdb04472d819f60ac49e3bf1e6b88298769a;p=pspp

gui: fixed crash when entering data for user defined currency variable

psppire crashed when data is entered for a variable of type
user defined currency. The bug description is:

https://savannah.gnu.org/bugs/index.php?54036

which was first reported by Larissa Setzer. The reason was
that currency format was not handled as number. This patch
fixes this bug.
---

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 3f1f9e7075..d06d0f4276 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -113,7 +113,7 @@ data_in (struct substring input, const char *input_encoding,
     }
 
   cat = fmt_get_category (format);
-  if (cat & (FMT_CAT_BASIC | FMT_CAT_HEXADECIMAL
+  if (cat & (FMT_CAT_BASIC | FMT_CAT_HEXADECIMAL | FMT_CAT_CUSTOM
              | FMT_CAT_DATE | FMT_CAT_TIME | FMT_CAT_DATE_COMPONENT))
     {
       /* We're going to parse these into numbers.  For this purpose we want to