summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 14:55:55 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 14:55:55 +0000
commitc799ccc53a45cb514170f00c3d4dd2e2a435394f (patch)
tree656160346389c8cc7d6c516813efa21b84a45313
parentfd3238e0dc9f1947b211b41f0e37698620e43caf (diff)
downloadchromium_src-c799ccc53a45cb514170f00c3d4dd2e2a435394f.zip
chromium_src-c799ccc53a45cb514170f00c3d4dd2e2a435394f.tar.gz
chromium_src-c799ccc53a45cb514170f00c3d4dd2e2a435394f.tar.bz2
Small fix to r45696
(Patch from Ningxin Hu) http://codereview.chromium.org/2097003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48037 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--AUTHORS1
-rw-r--r--chrome/browser/renderer_host/render_sandbox_host_linux.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 8ac18c0..59a22ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,3 +75,4 @@ Novell Inc.
Ryan Sleevi <ryan.sleevi@gmail.com>
Satoshi Matsuzaki <satoshi.matsuzaki@gmail.com>
Benjamin Jemlich <pcgod99@gmail.com>
+Ningxin Hu <ningxin.hu@intel.com>
diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
index cf51b0f..453f0c7 100644
--- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc
+++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
@@ -171,7 +171,7 @@ class SandboxIPCProcess {
const char* characters = NULL;
if (characters_bytes > 0) {
const uint32_t kMaxCharactersBytes = 1 << 10;
- if (characters_bytes % 1 == 0 || // We expect UTF-16.
+ if (characters_bytes % 2 == 0 || // We expect UTF-16.
characters_bytes > kMaxCharactersBytes ||
!pickle.ReadBytes(&iter, &characters, characters_bytes))
return;