summaryrefslogtreecommitdiffstats
path: root/base/pickle.cc
diff options
context:
space:
mode:
authorbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 19:47:19 +0000
committerbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 19:47:19 +0000
commit6d81b488e8cc5e10eaeca0a4ee4819dc3f469a24 (patch)
treee628aa40ac26d26a6a9a46374001be983e7a7f41 /base/pickle.cc
parentf19572134235f4cceb76e85e1c064ba668bbd3bd (diff)
downloadchromium_src-6d81b488e8cc5e10eaeca0a4ee4819dc3f469a24.zip
chromium_src-6d81b488e8cc5e10eaeca0a4ee4819dc3f469a24.tar.gz
chromium_src-6d81b488e8cc5e10eaeca0a4ee4819dc3f469a24.tar.bz2
Propagate the remote socket address to URLRequest and to ViewHostMsg_FrameNavigate.
This will be used to run pre-classification checks for client-side phishing detection, and will also enable the socket address to be exposed via the webRequest extension API. This is adapted from the original patch by pmarks on http://codereview.chromium.org/6369003/ . BUG=51663 TEST=added socket address checks to various unittests Review URL: http://codereview.chromium.org/6488010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pickle.cc')
-rw-r--r--base/pickle.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/base/pickle.cc b/base/pickle.cc
index e7d5768..116d3f1 100644
--- a/base/pickle.cc
+++ b/base/pickle.cc
@@ -157,6 +157,20 @@ bool Pickle::ReadSize(void** iter, size_t* result) const {
return true;
}
+bool Pickle::ReadUInt16(void** iter, uint16* result) const {
+ DCHECK(iter);
+ if (!*iter)
+ *iter = const_cast<char*>(payload());
+
+ if (!IteratorHasRoomFor(*iter, sizeof(*result)))
+ return false;
+
+ memcpy(result, *iter, sizeof(*result));
+
+ UpdateIter(iter, sizeof(*result));
+ return true;
+}
+
bool Pickle::ReadUInt32(void** iter, uint32* result) const {
DCHECK(iter);
if (!*iter)