diff options
author | Larry Hastings <larry@hastings.org> | 2015-03-30 08:50:00 (GMT) |
---|---|---|
committer | Larry Hastings <larry@hastings.org> | 2015-03-30 08:50:00 (GMT) |
commit | 09dab7a87eaa7115eeaf73016d65f2f835e25986 (patch) | |
tree | 04a83c1cfce64d3418a245feae7fee445e510949 /Python/marshal.c | |
parent | 736240399e469a4134dac32a340feca5395baa28 (diff) | |
parent | 45cff0c0e6c4a31ed3b5b88ee803320862fbd43a (diff) | |
download | cpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.zip cpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.tar.gz cpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.tar.bz2 |
Merge 3.5.0a3 release engineering changes back into trunk.
Diffstat (limited to 'Python/marshal.c')
-rw-r--r-- | Python/marshal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/marshal.c b/Python/marshal.c index 3472882..f89cd04 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -1486,7 +1486,7 @@ static off_t getfilesize(FILE *fp) { struct _Py_stat_struct st; - if (_Py_fstat(fileno(fp), &st) != 0) + if (_Py_fstat_noraise(fileno(fp), &st) != 0) return -1; #if SIZEOF_OFF_T == 4 else if (st.st_size >= INT_MAX) |