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 53b702c4e8bb1ba851d4f767ef463b55d7d71ba1..ff93e0d9f42f9aa27520e4434f50377de7a8145e 100644
(file)
--- a/
src/lexer.c
+++ b/
src/lexer.c
@@
-116,7
+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));
- st
_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid
);
+ st
r_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)
);
tokval = put_tokval;
put_token = 0;
}
tokval = put_tokval;
put_token = 0;
}
@@
-358,7
+358,7
@@
lex_get (void)
ds_putc (&tokstr, *prog++);
/* Copy tokstr to tokid, possibly truncating it.*/
ds_putc (&tokstr, *prog++);
/* Copy tokstr to tokid, possibly truncating it.*/
- st
_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid
);
+ st
r_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)
);
/* Determine token type. */
token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
/* Determine token type. */
token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
@@
-720,7
+720,7
@@
lex_put_back_id (const char *id)
save_token ();
token = T_ID;
ds_replace (&tokstr, id);
save_token ();
token = T_ID;
ds_replace (&tokstr, id);
- st
_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid
);
+ st
r_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)
);
}
\f
/* Weird line processing functions. */
}
\f
/* Weird line processing functions. */