diff options
| author | dim <dim@FreeBSD.org> | 2015-08-12 20:16:13 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-08-12 20:16:13 +0000 |
| commit | a83dfa76512c701e26ed4be2b780506a15072e65 (patch) | |
| tree | f77ee2f9842cea4c41cce72c931c7a681ad3a4e6 | |
| parent | 7dae5ce3714095f9a7aeab4a6912750cffcdf5ec (diff) | |
| download | FreeBSD-src-a83dfa76512c701e26ed4be2b780506a15072e65.zip FreeBSD-src-a83dfa76512c701e26ed4be2b780506a15072e65.tar.gz | |
In gcc's libcpp, stop using the INTTYPE_MAXIMUM() macro, which relies on
undefined behavior. The code used this macro to avoid problems on some
broken systems which define SSIZE_MAX incorrectly, but this is not
needed on FreeBSD, obviously.
MFC after: 3 days
| -rw-r--r-- | contrib/gcclibs/libcpp/files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gcclibs/libcpp/files.c b/contrib/gcclibs/libcpp/files.c index 366d30a..95cda0e 100644 --- a/contrib/gcclibs/libcpp/files.c +++ b/contrib/gcclibs/libcpp/files.c @@ -567,7 +567,7 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file) SSIZE_MAX to be much smaller than the actual range of the type. Use INTTYPE_MAXIMUM unconditionally to ensure this does not bite us. */ - if (file->st.st_size > INTTYPE_MAXIMUM (ssize_t)) + if (file->st.st_size > SSIZE_MAX) { cpp_error (pfile, CPP_DL_ERROR, "%s is too large", file->path); return false; @@ -581,7 +581,7 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file) file->path); return false; } - else if (offset > INTTYPE_MAXIMUM (ssize_t) || (ssize_t)offset > size) + else if (offset > SSIZE_MAX || (ssize_t)offset > size) { cpp_error (pfile, CPP_DL_ERROR, "current position of %s is too large", file->path); |
