projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fixed a use after free error when manipulating datasets."
[pspp]
/
src
/
data
/
data-in.c
diff --git
a/src/data/data-in.c
b/src/data/data-in.c
index 1588400e694ac88c1c556f1e1d9bef8965f1f676..33eeb111384971179087e368c3bff10005ce8b54 100644
(file)
--- a/
src/data/data-in.c
+++ b/
src/data/data-in.c
@@
-172,7
+172,7
@@
data_in_msg (struct substring input, const char *input_encoding,
output, width, output_encoding);
if (error != NULL)
{
output, width, output_encoding);
if (error != NULL)
{
- msg (SW,_("Data is not valid as format %s: %s"),
+ msg (SW,
_("Data is not valid as format %s: %s"),
fmt_name (format), error);
free (error);
return false;
fmt_name (format), error);
free (error);
return false;
@@
-699,7
+699,7
@@
parse_A (struct data_in *i)
{
/* This is equivalent to buf_copy_rpad, except that we posibly
do a character set recoding in the middle. */
{
/* This is equivalent to buf_copy_rpad, except that we posibly
do a character set recoding in the middle. */
- uint8_t *dst =
value_str_rw (i->output, i->width)
;
+ uint8_t *dst =
i->output->s
;
size_t dst_size = i->width;
const char *src = ss_data (i->input);
size_t src_size = ss_length (i->input);
size_t dst_size = i->width;
const char *src = ss_data (i->input);
size_t src_size = ss_length (i->input);
@@
-716,7
+716,7
@@
parse_A (struct data_in *i)
static char *
parse_AHEX (struct data_in *i)
{
static char *
parse_AHEX (struct data_in *i)
{
- uint8_t *s =
value_str_rw (i->output, i->width)
;
+ uint8_t *s =
i->output->s
;
size_t j;
for (j = 0; ; j++)
size_t j;
for (j = 0; ; j++)
@@
-1246,7
+1246,7
@@
static void
default_result (struct data_in *i)
{
if (fmt_is_string (i->format))
default_result (struct data_in *i)
{
if (fmt_is_string (i->format))
- memset (
value_str_rw (i->output, i->width)
, ' ', i->width);
+ memset (
i->output->s
, ' ', i->width);
else
i->output->f = settings_get_blanks ();
}
else
i->output->f = settings_get_blanks ();
}