diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 23:52:24 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 23:52:24 +0000 |
| commit | 26d2f47eba267fc034ae77d0ca1fefdc7cb86135 (patch) | |
| tree | b74e28bcd8f16e914b88935bf4ca710bddc64586 /base/pickle.cc | |
| parent | 08173b245a9fbe6381a805cc5987d434a641d96e (diff) | |
| download | chromium_src-26d2f47eba267fc034ae77d0ca1fefdc7cb86135.zip chromium_src-26d2f47eba267fc034ae77d0ca1fefdc7cb86135.tar.gz chromium_src-26d2f47eba267fc034ae77d0ca1fefdc7cb86135.tar.bz2 | |
Don't allow dragging browser actions between regular and incognito windows.
This fixes a crash.
Also small fix to Pickle::ReadBytes to fix up the iterator if it is NULL.
BUG=39340
Review URL: http://codereview.chromium.org/1542007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pickle.cc')
| -rw-r--r-- | base/pickle.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/pickle.cc b/base/pickle.cc index 4fa206e..06a3be1 100644 --- a/base/pickle.cc +++ b/base/pickle.cc @@ -250,6 +250,8 @@ bool Pickle::ReadBytes(void** iter, const char** data, int length) const { DCHECK(iter); DCHECK(data); *data = 0; + if (!*iter) + *iter = const_cast<char*>(payload()); if (!IteratorHasRoomFor(*iter, length)) return false; |