projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix double-free bug.
[pspp-builds.git]
/
src
/
lexer.c
diff --git
a/src/lexer.c
b/src/lexer.c
index e4b6aaee308901a2ec7bb44f052aa6195b7050bb..ff93e0d9f42f9aa27520e4434f50377de7a8145e 100644
(file)
--- a/
src/lexer.c
+++ b/
src/lexer.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "lexer.h"
#include <config.h>
#include "lexer.h"
@@
-48,10
+48,10
@@
int token;
double tokval;
/* T_ID: the identifier. */
double tokval;
/* T_ID: the identifier. */
-char tokid[
9
];
+char tokid[
LONG_NAME_LEN + 1
];
/* T_ID, T_STRING: token string value.
/* T_ID, T_STRING: token string value.
- For T_ID, this is not truncated
to 8 characters
as is tokid. */
+ For T_ID, this is not truncated as is tokid. */
struct string tokstr;
\f
/* Static variables. */
struct string tokstr;
\f
/* Static variables. */
@@
-116,8
+116,7
@@
restore_token (void)
assert (put_token != 0);
token = put_token;
ds_replace (&tokstr, ds_c_str (&put_tokstr));
assert (put_token != 0);
token = put_token;
ds_replace (&tokstr, ds_c_str (&put_tokstr));
- strncpy (tokid, ds_c_str (&put_tokstr), 8);
- tokid[8] = 0;
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
tokval = put_tokval;
put_token = 0;
}
tokval = put_tokval;
put_token = 0;
}
@@
-354,14
+353,14
@@
lex_get (void)
}
/* Copy id to tokstr. */
}
/* Copy id to tokstr. */
- ds_putc (&tokstr,
toupper ((unsigned char) *prog++)
);
+ ds_putc (&tokstr,
*prog++
);
while (CHAR_IS_IDN (*prog))
while (CHAR_IS_IDN (*prog))
- ds_putc (&tokstr,
toupper ((unsigned char) *prog++)
);
+ ds_putc (&tokstr,
*prog++
);
- /* Copy tokstr to tokid, truncating it to 8 characters. */
- strncpy (tokid, ds_c_str (&tokstr), 8);
- tokid[8] = 0;
+ /* Copy tokstr to tokid, possibly truncating it.*/
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
+ /* Determine token type. */
token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
break;
token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
break;
@@
-387,11
+386,18
@@
void
lex_error (const char *message, ...)
{
char *token_rep;
lex_error (const char *message, ...)
{
char *token_rep;
+ char where[128];
token_rep = lex_token_representation ();
token_rep = lex_token_representation ();
- if (token_rep[0] == 0)
- msg (SE, _("Syntax error at end of file."));
- else if (message)
+ if (token == T_STOP)
+ strcpy (where, "end of file");
+ else if (token == '.')
+ strcpy (where, "end of command");
+ else
+ snprintf (where, sizeof where, "`%s'", token_rep);
+ free (token_rep);
+
+ if (message)
{
char buf[1024];
va_list args;
{
char buf[1024];
va_list args;
@@
-400,12
+406,10
@@
lex_error (const char *message, ...)
vsnprintf (buf, 1024, message, args);
va_end (args);
vsnprintf (buf, 1024, message, args);
va_end (args);
- msg (SE, _("Syntax error %s at
`%s'."), buf, token_rep
);
+ msg (SE, _("Syntax error %s at
%s."), buf, where
);
}
else
}
else
- msg (SE, _("Syntax error at `%s'."), token_rep);
-
- free (token_rep);
+ msg (SE, _("Syntax error at %s."), where);
}
/* Checks that we're at end of command.
}
/* Checks that we're at end of command.
@@
-479,7
+483,8
@@
lex_match (int t)
}
/* If the current token is the identifier S, skips it and returns
}
/* If the current token is the identifier S, skips it and returns
- nonzero.
+ nonzero. The identifier may be abbreviated to its first three
+ letters.
Otherwise, returns zero. */
int
lex_match_id (const char *s)
Otherwise, returns zero. */
int
lex_match_id (const char *s)
@@
-539,7
+544,7
@@
lex_force_match (int t)
}
else
{
}
else
{
- lex_error (_("expecting
%s
"), lex_token_name (t));
+ lex_error (_("expecting
`%s'
"), lex_token_name (t));
return 0;
}
}
return 0;
}
}
@@
-603,7
+608,7
@@
lex_force_id (void)
/* Comparing identifiers. */
/* Keywords match if one of the following is true: KW and TOK are
/* Comparing identifiers. */
/* Keywords match if one of the following is true: KW and TOK are
- identical (
barring
differences in case), or TOK is at least 3
+ identical (
except for
differences in case), or TOK is at least 3
characters long and those characters are identical to KW. KW_LEN
is the length of KW, TOK_LEN is the length of TOK. */
int
characters long and those characters are identical to KW. KW_LEN
is the length of KW, TOK_LEN is the length of TOK. */
int
@@
-711,11
+716,11
@@
lex_put_back (int t)
void
lex_put_back_id (const char *id)
{
void
lex_put_back_id (const char *id)
{
+ assert (lex_id_to_token (id, strlen (id)) == T_ID);
save_token ();
token = T_ID;
ds_replace (&tokstr, id);
save_token ();
token = T_ID;
ds_replace (&tokstr, id);
- strncpy (tokid, ds_c_str (&tokstr), 8);
- tokid[8] = 0;
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
}
\f
/* Weird line processing functions. */
}
\f
/* Weird line processing functions. */
@@
-786,7
+791,7
@@
lex_preprocess_line (void)
int quote;
/* Remove C-style comments begun by slash-star and terminated by
int quote;
/* Remove C-style comments begun by slash-star and terminated by
- star-slash or newline. */
+
star-slash or newline. */
quote = comment = 0;
for (cp = ds_c_str (&getl_buf); *cp; )
{
quote = comment = 0;
for (cp = ds_c_str (&getl_buf); *cp; )
{