X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fattributes.c;h=88832fd501f641ebcc041c1558fa3d214047c454;hb=5581c901aba8df3b31f6406d7fff09e26a9e7fc1;hp=2fdc11e2a1ad3744f8551a29c360b8a8cd769a5f;hpb=8f20801a82fe1382da0033996c08160a9f93a3da;p=pspp diff --git a/src/language/dictionary/attributes.c b/src/language/dictionary/attributes.c index 2fdc11e2a1..88832fd501 100644 --- a/src/language/dictionary/attributes.c +++ b/src/language/dictionary/attributes.c @@ -97,13 +97,8 @@ parse_attribute_name (struct lexer *lexer, const char *dict_encoding, if (lex_match (lexer, T_LBRACK)) { - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, NULL, 1, 65535)) goto error; - if (lex_integer (lexer) < 1 || lex_integer (lexer) > 65535) - { - msg (SE, _("Attribute array index must be between 1 and 65535.")); - goto error; - } *index = lex_integer (lexer); lex_get (lexer); if (!lex_force_match (lexer, T_RBRACK))