projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buffer overflow which could occur if the matrix reader encounters a badly formed...
[pspp]
/
src
/
language
/
stats
/
t-test-parser.c
diff --git
a/src/language/stats/t-test-parser.c
b/src/language/stats/t-test-parser.c
index 9a0043aa45761db7771a25a96a2f7db02b046e39..26fc7ba56cb7307fc37c32b226fdbc12550c8cb0 100644
(file)
--- a/
src/language/stats/t-test-parser.c
+++ b/
src/language/stats/t-test-parser.c
@@
-47,7
+47,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
size_t n_v1 = 0;
const struct variable **v2 = NULL;
size_t n_v2 = 0;
size_t n_v1 = 0;
const struct variable **v2 = NULL;
size_t n_v2 = 0;
-
+
size_t n_pairs = 0;
vp *pairs = NULL;
size_t n_pairs = 0;
vp *pairs = NULL;
@@
-94,7
+94,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
if (NULL == (gvar = parse_variable (lexer, dict)))
goto parse_failed;
if (NULL == (gvar = parse_variable (lexer, dict)))
goto parse_failed;
-
+
if (lex_match (lexer, T_LPAREN))
{
if (lex_match (lexer, T_LPAREN))
{
@@
-180,7
+180,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
n_pairs = n_v1;
else
n_pairs = n_v1 * n_v2;
n_pairs = n_v1;
else
n_pairs = n_v1 * n_v2;
-
+
pairs = xcalloc (n_pairs, sizeof *pairs);
if ( with)
pairs = xcalloc (n_pairs, sizeof *pairs);
if ( with)
@@
-193,7
+193,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
vp *pair = &pairs[i];
(*pair)[0] = v1[i];
(*pair)[1] = v2[i];
vp *pair = &pairs[i];
(*pair)[0] = v1[i];
(*pair)[1] = v2[i];
- }
+ }
}
else
{
}
else
{
@@
-286,7
+286,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
goto parse_failed;
}
}
goto parse_failed;
}
}
- else
+ else
{
lex_error (lexer, NULL);
goto parse_failed;
{
lex_error (lexer, NULL);
goto parse_failed;