Pickle: handle invalid data on 64 bit systems....

base/pickle.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_PICKLE_H__
 #define BASE_PICKLE_H__
 #pragma once
 
 #include <string>
 
@@ skipping 162 matching lines @@
   const char* payload() const {
     return reinterpret_cast<const char*>(header_) + header_size_;
   }
 
   // Returns the address of the byte immediately following the currently valid
   // header + payload.
   char* end_of_payload() {
     return payload() + payload_size();
   }
   const char* end_of_payload() const {
-    return payload() + payload_size();
+    return header_ ? payload() + payload_size() : NULL;

[darin (slow to review), 2010/11/11 17:33:57]

what about the non-const version of end_of_payload?

[rvargas (doing something else), 2010/11/11 22:35:36]

The expectation for the non-const version is to have a valid header_ (it should
come from a different constructor). I could DCHECK that, but it will require
changing the signature and moving the method to the cc file. (As is, the process
will crash reading from 0 on payload_size(), so in practice we are CHECKing that
it is not null). Let me know if you prefer an explicit CHECK or DCHECK.

I added comments.

   }
 
   size_t capacity() const {
     return capacity_;
   }
 
   // Resizes the buffer for use when writing the specified amount of data. The
   // location that the data should be written at is returned, or NULL if there
   // was an error. Call EndWrite with the returned offset and the given length
   // to pad out for the next write.
@@ skipping 37 matching lines @@
   // Allocation size of payload (or -1 if allocation is const).
   size_t capacity_;
   size_t variable_buffer_offset_;  // IF non-zero, then offset to a buffer.
 
   FRIEND_TEST_ALL_PREFIXES(PickleTest, Resize);
   FRIEND_TEST_ALL_PREFIXES(PickleTest, FindNext);
   FRIEND_TEST_ALL_PREFIXES(PickleTest, IteratorHasRoom);
 };
 
 #endif  // BASE_PICKLE_H__