diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 03:20:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 03:20:09 +0000 |
| commit | 9eb24cf5d1bc44da2d5318fb6794630264ee93cc (patch) | |
| tree | 9f485df212e73e8c2d586b0d707098dd46c8e86c /sandbox | |
| parent | 140e8951216c525d87e28488d2d5c0a21eb561a5 (diff) | |
| download | chromium_src-9eb24cf5d1bc44da2d5318fb6794630264ee93cc.zip chromium_src-9eb24cf5d1bc44da2d5318fb6794630264ee93cc.tar.gz chromium_src-9eb24cf5d1bc44da2d5318fb6794630264ee93cc.tar.bz2 | |
Remove inline definition of SIZE_MAX in header.
suid_unsafe_environment_variables.h is included both in C and C++ and is
a little clunky. Clean things up a bit.
BUG=233330
Review URL: https://codereview.chromium.org/14328030
Patch from Julien Tinnes <jln@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/suid/common/suid_unsafe_environment_variables.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sandbox/linux/suid/common/suid_unsafe_environment_variables.h b/sandbox/linux/suid/common/suid_unsafe_environment_variables.h index ee4db76..1132a7a7 100644 --- a/sandbox/linux/suid/common/suid_unsafe_environment_variables.h +++ b/sandbox/linux/suid/common/suid_unsafe_environment_variables.h @@ -16,11 +16,7 @@ #ifndef SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_ #define SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_ -#if defined(__cplusplus) -#include <limits> -#define SIZE_MAX std::numeric_limits<size_t>::max() -#endif - +#include <stdint.h> #include <stdlib.h> // malloc #include <string.h> // memcpy @@ -56,8 +52,9 @@ static const char* kSUIDUnsafeEnvironmentVariables[] = { // name for a given environment variable. static inline char* SandboxSavedEnvironmentVariable(const char* envvar) { const size_t envvar_len = strlen(envvar); + const size_t kMaxSizeT = (size_t) -1; - if (envvar_len > SIZE_MAX - 1 -8) + if (envvar_len > kMaxSizeT - 1 -8) return NULL; const size_t saved_envvarlen = envvar_len + 1 /* NUL terminator */ + @@ -73,8 +70,4 @@ static inline char* SandboxSavedEnvironmentVariable(const char* envvar) { return saved_envvar; } -#if defined(__cplusplus) -#undef SIZE_MAX -#endif - #endif // SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_ |