projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Fully verify multiple response set names.
[pspp]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 2ad146e88025699879c4aa536252bd8f3bd0ddf6..dbc61345a85869eda4c0d1eb7f0f0aa04fe4c9ce 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-1831,10
+1831,9
@@
decode_mrsets (struct sfm_reader *r, struct dictionary *dict)
size_t i;
name = recode_string ("UTF-8", r->encoding, s->name, -1);
size_t i;
name = recode_string ("UTF-8", r->encoding, s->name, -1);
- if (
name[0] != '$'
)
+ if (
!mrset_is_valid_name (name, dict_get_encoding (dict), false)
)
{
{
- sys_warn (r, -1, _("Multiple response set name `%s' does not begin "
- "with `$'."),
+ sys_warn (r, -1, _("Invalid multiple response set name `%s'."),
name);
free (name);
continue;
name);
free (name);
continue;