projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(cmd_file_handle) Fix msg() bug found by -Wformat.
[pspp]
/
src
/
var-display.c
diff --git
a/src/var-display.c
b/src/var-display.c
index 73c0c0a8059a1e11d3149c1b0bf1f0a652aa5320..8243ac626b039d9600717a52a15dff01055a5b00 100644
(file)
--- a/
src/var-display.c
+++ b/
src/var-display.c
@@
-56,11
+56,19
@@
cmd_variable_alignment (void)
align = ALIGN_RIGHT;
else if ( lex_match_id("CENTER"))
align = ALIGN_CENTRE;
align = ALIGN_RIGHT;
else if ( lex_match_id("CENTER"))
align = ALIGN_CENTRE;
- else
- return CMD_FAILURE;
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
lex_force_match(')');
}
lex_force_match(')');
}
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
for( i = 0 ; i < nv ; ++i )
v[i]->alignment = align;
for( i = 0 ; i < nv ; ++i )
v[i]->alignment = align;
@@
-134,12
+142,20
@@
cmd_variable_level (void)
level = MEASURE_ORDINAL;
else if ( lex_match_id("NOMINAL"))
level = MEASURE_NOMINAL;
level = MEASURE_ORDINAL;
else if ( lex_match_id("NOMINAL"))
level = MEASURE_NOMINAL;
- else
- return CMD_FAILURE;
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
lex_force_match(')');
}
lex_force_match(')');
}
-
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
+
for( i = 0 ; i < nv ; ++i )
v[i]->measure = level ;
for( i = 0 ; i < nv ; ++i )
v[i]->measure = level ;