Commit 9eb24cf5 authored by thakis@chromium.org's avatar thakis@chromium.org

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
parent 140e8951
......@@ -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_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment