From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 9 May 2009 07:07:51 +0000 (+0800)
Subject: Merge commit 'origin/stable'
X-Git-Tag: v0.7.3~129
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;hp=67daf2c66795b057d6e9d227eded2a3a9486e4f4;p=pspp-builds.git

Merge commit 'origin/stable'
---

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 5c64b948..5fa77541 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -43,12 +43,12 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
   char **v;
   size_t nv;
 
-  /* Format spec for variables to create.  f.type==-1 if default is to
-     be used. */
-  struct fmt_spec f;
-
   do
     {
+      /* Format spec for variables to create.  f.type==-1 if default is to
+	 be used. */
+      struct fmt_spec f;
+
       if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NONE))
 	return CMD_FAILURE;
 
@@ -57,6 +57,10 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	{
 	  if (!parse_format_specifier (lexer, &f))
 	    goto fail;
+
+	  if ( ! fmt_check_output (&f))
+	    goto fail;
+
 	  if (fmt_is_string (f.type))
 	    {
               char str[FMT_STRING_LEN_MAX + 1];