summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf/src
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 16:15:00 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 16:15:00 +0000
commit66a148c4dbff8c55c41d32c96280429dcaf5edc1 (patch)
tree85c9b7253b20ae66660288850bd7dae390786969 /third_party/protobuf/src
parent13021a6b8967c3ccb9792a7f4345707f43b94f7f (diff)
downloadchromium_src-66a148c4dbff8c55c41d32c96280429dcaf5edc1.zip
chromium_src-66a148c4dbff8c55c41d32c96280429dcaf5edc1.tar.gz
chromium_src-66a148c4dbff8c55c41d32c96280429dcaf5edc1.tar.bz2
protobuf: Fix a null/bool conversion.
BUG=none TEST=none TBR=agl Review URL: https://chromiumcodereview.appspot.com/10386158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/src')
-rw-r--r--third_party/protobuf/src/google/protobuf/io/coded_stream.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf/src/google/protobuf/io/coded_stream.cc b/third_party/protobuf/src/google/protobuf/io/coded_stream.cc
index 57d486f..402a3ad 100644
--- a/third_party/protobuf/src/google/protobuf/io/coded_stream.cc
+++ b/third_party/protobuf/src/google/protobuf/io/coded_stream.cc
@@ -452,7 +452,7 @@ bool CodedInputStream::ReadVarint64Fallback(uint64* value) {
// We have overrun the maximum size of a varint (10 bytes). The data
// must be corrupt.
- return NULL;
+ return false;
done:
Advance(ptr - buffer_);