projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buffer overflow reported by John Darrington.
[pspp]
/
src
/
language
/
dictionary
/
variable-display.c
diff --git
a/src/language/dictionary/variable-display.c
b/src/language/dictionary/variable-display.c
index 4d13514e93fc1ece9c6d32ad9a2ee0482ba45aaf..fa6eae467f152ac944e691c4a0e29f43776c8ce7 100644
(file)
--- a/
src/language/dictionary/variable-display.c
+++ b/
src/language/dictionary/variable-display.c
@@
-36,7
+36,7
@@
It affects nothing but GUIs
*/
int
It affects nothing but GUIs
*/
int
-cmd_variable_alignment (
void
)
+cmd_variable_alignment (
struct dataset *ds
)
{
do
{
{
do
{
@@
-46,7
+46,7
@@
cmd_variable_alignment (void)
size_t i;
enum alignment align;
size_t i;
enum alignment align;
- if (!parse_variables (d
efault_dict
, &v, &nv, PV_NONE))
+ if (!parse_variables (d
ataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
if ( lex_force_match('(') )
return CMD_FAILURE;
if ( lex_force_match('(') )
@@
-89,7
+89,7
@@
cmd_variable_alignment (void)
It affects nothing but GUIs
*/
int
It affects nothing but GUIs
*/
int
-cmd_variable_width (
void
)
+cmd_variable_width (
struct dataset *ds
)
{
do
{
{
do
{
@@
-97,7
+97,7
@@
cmd_variable_width (void)
size_t nv;
size_t i;
size_t nv;
size_t i;
- if (!parse_variables (d
efault_dict
, &v, &nv, PV_NONE))
+ if (!parse_variables (d
ataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
if ( lex_force_match('(') )
return CMD_FAILURE;
if ( lex_force_match('(') )
@@
-123,7
+123,7
@@
cmd_variable_width (void)
/* Set variables' measurement level */
int
/* Set variables' measurement level */
int
-cmd_variable_level (
void
)
+cmd_variable_level (
struct dataset *ds
)
{
do
{
{
do
{
@@
-132,7
+132,7
@@
cmd_variable_level (void)
enum measure level;
size_t i;
enum measure level;
size_t i;
- if (!parse_variables (d
efault_dict
, &v, &nv, PV_NONE))
+ if (!parse_variables (d
ataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
if ( lex_force_match('(') )
return CMD_FAILURE;
if ( lex_force_match('(') )