Title: [237377] trunk/Source/WebKit
- Revision
- 237377
- Author
- [email protected]
- Date
- 2018-10-24 02:10:24 -0700 (Wed, 24 Oct 2018)
Log Message
[WPE][GTK] Cleanups to the certificate encoder
https://bugs.webkit.org/show_bug.cgi?id=190865
Reviewed by Žan Doberšek.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<CertificateInfo>::encode):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (237376 => 237377)
--- trunk/Source/WebKit/ChangeLog 2018-10-24 09:05:05 UTC (rev 237376)
+++ trunk/Source/WebKit/ChangeLog 2018-10-24 09:10:24 UTC (rev 237377)
@@ -1,3 +1,13 @@
+2018-10-24 Claudio Saavedra <[email protected]>
+
+ [WPE][GTK] Cleanups to the certificate encoder
+ https://bugs.webkit.org/show_bug.cgi?id=190865
+
+ Reviewed by Žan Doberšek.
+
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<CertificateInfo>::encode):
+
2018-10-23 Ryan Haddad <[email protected]>
Unreviewed, rolling out r237261.
Modified: trunk/Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp (237376 => 237377)
--- trunk/Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp 2018-10-24 09:05:05 UTC (rev 237376)
+++ trunk/Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp 2018-10-24 09:10:24 UTC (rev 237377)
@@ -56,31 +56,28 @@
return;
}
- uint32_t chainLength = 0;
GTlsCertificate* certificate = certificateInfo.certificate();
- GByteArray* certificateData = 0;
- Vector<GByteArray*> certificatesDataList;
-
+ Vector<GRefPtr<GByteArray>> certificatesDataList;
do {
- g_object_get(G_OBJECT(certificate), "certificate", &certificateData, NULL);
+ GByteArray* certificateData = nullptr;
+ g_object_get(G_OBJECT(certificate), "certificate", &certificateData, nullptr);
if (!certificateData)
break;
certificatesDataList.append(certificateData);
- chainLength++;
certificate = g_tls_certificate_get_issuer(certificate);
} while (certificate);
- encoder << chainLength;
+ encoder << static_cast<uint32_t>(certificatesDataList.size());
- if (!chainLength)
+ if (certificatesDataList.isEmpty())
return;
// Encode starting from the root certificate.
- for (uint32_t i = chainLength; i > 0; i--) {
- GRefPtr<GByteArray> certificate = adoptGRef(certificatesDataList[i - 1]);
+ for (size_t i = certificatesDataList.size(); i > 0; --i) {
+ auto& certificate = certificatesDataList[i - 1];
encoder.encodeVariableLengthByteArray(IPC::DataReference(certificate->data, certificate->len));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
