Implement SignedCertificateTimestamp::isolatedCopy

third_party/WebKit/Source/platform/network/ResourceResponse.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 
 #include "platform/network/ResourceResponse.h"
 
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 #include <memory>
 
 namespace blink {
 
+namespace {
+
+Vector<ResourceResponse::SignedCertificateTimestamp> isolatedCopy(const Vector<ResourceResponse::SignedCertificateTimestamp>& src)
+{
+    Vector<ResourceResponse::SignedCertificateTimestamp> result;
+    result.reserveCapacity(src.size());
+    for (const auto& timestamp : src) {
+        result.append(timestamp.isolatedCopy());
+    }
+    return result;
+}
+
+} // namespace
+
 ResourceResponse::SignedCertificateTimestamp::SignedCertificateTimestamp(
     const blink::WebURLResponse::SignedCertificateTimestamp& sct)
     : m_status(sct.status)
     , m_origin(sct.origin)
     , m_logDescription(sct.logDescription)
     , m_logId(sct.logId)
     , m_timestamp(sct.timestamp)
     , m_hashAlgorithm(sct.hashAlgorithm)
     , m_signatureAlgorithm(sct.signatureAlgorithm)
     , m_signatureData(sct.signatureData)
 {
 }
 
+ResourceResponse::SignedCertificateTimestamp ResourceResponse::SignedCertificateTimestamp::isolatedCopy() const
+{
+    return SignedCertificateTimestamp(
+        m_status.isolatedCopy(),
+        m_origin.isolatedCopy(),
+        m_logDescription.isolatedCopy(),
+        m_logId.isolatedCopy(),
+        m_timestamp,
+        m_hashAlgorithm.isolatedCopy(),
+        m_signatureAlgorithm.isolatedCopy(),
+        m_signatureData.isolatedCopy());
+}
+
 ResourceResponse::ResourceResponse()
     : m_expectedContentLength(0)
     , m_httpStatusCode(0)
     , m_lastModifiedDate(0)
     , m_wasCached(false)
     , m_connectionID(0)
     , m_connectionReused(false)
     , m_isNull(true)
     , m_haveParsedAgeHeader(false)
     , m_haveParsedDateHeader(false)
@@ skipping 74 matching lines @@
     m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
     m_securityStyle = data->m_securityStyle;
     m_securityDetails.protocol = data->m_securityDetails.protocol;
     m_securityDetails.cipher = data->m_securityDetails.cipher;
     m_securityDetails.keyExchange = data->m_securityDetails.keyExchange;
     m_securityDetails.mac = data->m_securityDetails.mac;
     m_securityDetails.certID = data->m_securityDetails.certID;
     m_securityDetails.numUnknownSCTs = data->m_securityDetails.numUnknownSCTs;
     m_securityDetails.numInvalidSCTs = data->m_securityDetails.numInvalidSCTs;
     m_securityDetails.numValidSCTs = data->m_securityDetails.numValidSCTs;
-    m_securityDetails.sctList = data->m_securityDetails.sctList;
+    m_securityDetails.sctList = isolatedCopy(data->m_securityDetails.sctList);

[hiroshige, 2016/07/11 10:09:45]

This isolatedCopy() is not necessary because this is called after crossing the
thread boundary and we can use |*this| and |*data| freely on the target thread.

[yhirano, 2016/07/12 05:14:42]

Thanks, done.

     m_httpVersion = data->m_httpVersion;
     m_appCacheID = data->m_appCacheID;
     m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
     m_multipartBoundary = data->m_multipartBoundary;
     m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY;
     m_wasNpnNegotiated = data->m_wasNpnNegotiated;
     m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable;
     m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
     m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
     m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequiredByServiceWorker;
@@ skipping 28 matching lines @@
     data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
     data->m_securityStyle = m_securityStyle;
     data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy();
     data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
     data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolatedCopy();
     data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
     data->m_securityDetails.certID = m_securityDetails.certID;
     data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs;
     data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs;
     data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs;
-    data->m_securityDetails.sctList = m_securityDetails.sctList;
+    data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList);
     data->m_httpVersion = m_httpVersion;
     data->m_appCacheID = m_appCacheID;
     data->m_appCacheManifestURL = m_appCacheManifestURL.copy();
     data->m_multipartBoundary = m_multipartBoundary;
     data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY;
     data->m_wasNpnNegotiated = m_wasNpnNegotiated;
     data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
     data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
     data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
     data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceWorker;
@@ skipping 384 matching lines @@
     if (a.httpHeaderFields() != b.httpHeaderFields())
         return false;
     if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTiming() == *b.resourceLoadTiming())
         return true;
     if (a.resourceLoadTiming() != b.resourceLoadTiming())
         return false;
     return true;
 }
 
 } // namespace blink