projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pc+-file-reader, sys-file-reader: Fix misuses of zero as null pointer.
[pspp]
/
src
/
data
/
pc+-file-reader.c
diff --git
a/src/data/pc+-file-reader.c
b/src/data/pc+-file-reader.c
index 4d08f27465407bff935163af10525bea0237e653..cc80cd723b1d142876967f4225c949a715b6aa04 100644
(file)
--- a/
src/data/pc+-file-reader.c
+++ b/
src/data/pc+-file-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-2000, 2006-2007, 2009-201
5
Free Software Foundation, Inc.
+ Copyright (C) 1997-2000, 2006-2007, 2009-201
6
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-221,13
+221,13
@@
pcp_open (struct file_handle *fh)
/* Fetch file size. */
if (fstat (fileno (r->file), &s))
{
/* Fetch file size. */
if (fstat (fileno (r->file), &s))
{
- pcp_error (
ME
, 0, _("%s: stat failed (%s)."),
+ pcp_error (
r
, 0, _("%s: stat failed (%s)."),
fh_get_file_name (r->fh), strerror (errno));
goto error;
}
if (s.st_size > UINT_MAX)
{
fh_get_file_name (r->fh), strerror (errno));
goto error;
}
if (s.st_size > UINT_MAX)
{
- pcp_error (
ME
, 0, _("%s: file too large."), fh_get_file_name (r->fh));
+ pcp_error (
r
, 0, _("%s: file too large."), fh_get_file_name (r->fh));
goto error;
}
r->file_size = s.st_size;
goto error;
}
r->file_size = s.st_size;
@@
-641,8
+641,9
@@
read_value_labels (struct pcp_reader *r, struct pcp_var_record *var,
uint8_t len;
if (var->n_val_labs >= allocated_val_labs)
uint8_t len;
if (var->n_val_labs >= allocated_val_labs)
- var->val_labs = x2nrealloc (var->val_labs, &allocated_val_labs,
- sizeof *var->val_labs);
+ var->val_labs = pool_2nrealloc (r->pool, var->val_labs,
+ &allocated_val_labs,
+ sizeof *var->val_labs);
vl = &var->val_labs[var->n_val_labs];
if (!read_bytes (r, vl->value, sizeof vl->value)
vl = &var->val_labs[var->n_val_labs];
if (!read_bytes (r, vl->value, sizeof vl->value)