Hardening the 'url::Origin' implementation.

content/public/common/common_param_traits.cc

 // Copyright (c) 2012 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.
 
 #include "content/public/common/common_param_traits.h"
 
 #include <string>
 
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_state.h"
@@ skipping 33 matching lines @@
     *p = GURL();
     return false;
   }
   return true;
 }
 
 void ParamTraits<GURL>::Log(const GURL& p, std::string* l) {
   l->append(p.spec());
 }
 
-void ParamTraits<url::Origin>::Write(Message* m,
-                                          const url::Origin& p) {
-  m->WriteString(p.string());
+void ParamTraits<url::Origin>::Write(Message* m, const url::Origin& p) {
+  WriteParam(m, p.scheme());
+  WriteParam(m, p.host());
+  WriteParam(m, p.port());

[Ryan Sleevi, 2015/05/22 20:43:35]

DANGER: If p.port()'s signature were to hypothetically change, we'd end up in a
mismatch between ReadParam() and WriteParam that wouldn't be obvious (because
line 65 is explicit)

I'm not sure what the normal IPC idiom is - maybe it doesn't care (e.g. line
81), but that strikes me as a danger

[Mike West, 2015/05/28 07:24:29]

My impression is that this is safe; if we update the signature of `url::Origin`,
we need to update the IPC param traits as well. +tsepez@, who will have a more
canonical opinion.

[Ryan Sleevi, 2015/05/28 07:33:21]

You didn't add tsepez, fyi

 }
 
 bool ParamTraits<url::Origin>::Read(const Message* m,
                                     PickleIterator* iter,
                                     url::Origin* p) {
-  std::string s;
-  if (!iter->ReadString(&s)) {
+  std::string scheme;
+  std::string host;
+  unsigned short port;

[Ryan Sleevi, 2015/05/22 20:43:35]

DANGER: This isn't explicitly sized, but it would seem like for IPC, it should
be. (e.g. line 88)

[Mike West, 2015/05/28 07:24:29]

Following HostPortPair's lead, and converting this to a `uint16`.

+  if (!ReadParam(m, iter, &scheme) || !ReadParam(m, iter, &host) ||
+      !ReadParam(m, iter, &port)) {
     *p = url::Origin();
     return false;
   }
-  *p = url::Origin(s);
+  *p = url::Origin(scheme, host, port);
   return true;
 }
 
 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) {
-  l->append(p.string());
+  l->append(p.serialize());
 }
 
 void ParamTraits<net::HostPortPair>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.host());
   WriteParam(m, p.port());
 }
 
 bool ParamTraits<net::HostPortPair>::Read(const Message* m,
                                           PickleIterator* iter,
                                           param_type* r) {
@@ skipping 71 matching lines @@
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC