projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
APPLY DICTIONARY: Fix segmentation fault when setting value labels.
[pspp]
/
src
/
data
/
data-in.c
diff --git
a/src/data/data-in.c
b/src/data/data-in.c
index 5d4496cf9085de0d54509f224a89e0b0261935d1..ace167090c57b9f2f2fe97a4d4e96cd80405764d 100644
(file)
--- a/
src/data/data-in.c
+++ b/
src/data/data-in.c
@@
-919,7
+919,7
@@
parse_year (struct data_in *i, long *year, size_t max_digits)
else
*year += epoch_century + 100;
}
else
*year += epoch_century + 100;
}
- if (*year >= 1582
||
*year <= 19999)
+ if (*year >= 1582
&&
*year <= 19999)
return NULL;
return xasprintf (_("Year (%ld) must be between 1582 and 19999."), *year);
return NULL;
return xasprintf (_("Year (%ld) must be between 1582 and 19999."), *year);
@@
-1044,7
+1044,7
@@
parse_minute_second (struct data_in *i, double *time)
*cp++ = ss_get_byte (&i->input);
*cp = '\0';
*cp++ = ss_get_byte (&i->input);
*cp = '\0';
- *time += strtod (buf, NULL);
+ *time +=
c_
strtod (buf, NULL);
return NULL;
}
return NULL;
}