summaryrefslogtreecommitdiffstats
path: root/contrib/gcclibs/libcpp/files.c
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-07 18:07:27 -0300
committerRenato Botelho <renato@netgate.com>2015-10-07 18:07:27 -0300
commit945ed01c4bae06169f63978e43029c04d4abd731 (patch)
tree5cd3ae372187bd25416aeec230f31242c3729be7 /contrib/gcclibs/libcpp/files.c
parent8aae621ec1e941b8f27411df1bace42778e61b99 (diff)
parent36b47c3278c31b909b37616c58ccf4f148a9e47c (diff)
downloadFreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.zip
FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'contrib/gcclibs/libcpp/files.c')
-rw-r--r--contrib/gcclibs/libcpp/files.c4
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);
OpenPOWER on IntegriCloud