210414 2020-04-12 20:13:22 -0700 KeyedDecoder functions in ResourceLoadStatistics.{cpp,h} should return bool and use WARN_UNUSED_RETURN 2020-05-27 15:39:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 212422 212424 210416 212423 1 ddkilzer ddkilzer achristensen bfulgham cdumez darin ews-watchlist japhet katherine_cheney webkit-bug-importer wilander ysuzuki oldest_to_newest 1640766 0 ddkilzer 2020-04-12 20:13:22 -0700 KeyedDecoder functions in ResourceLoadStatistics.{cpp,h} should return bool and use WARN_UNUSED_RETURN. Found via: $ ./Tools/Scripts/check-webkit-style --filter=-,+security/missing_warn_unused_return Source/WebCore/loader/ResourceLoadStatistics.* 1640767 1 webkit-bug-importer 2020-04-12 20:14:00 -0700 <rdar://problem/61693118> 1640768 2 396250 ddkilzer 2020-04-12 20:18:48 -0700 Created attachment 396250 Patch v1 1640975 3 ews-feeder 2020-04-13 10:41:48 -0700 Committed r260023: <https://trac.webkit.org/changeset/260023> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396250. 1656466 4 ysuzuki 2020-05-27 11:36:46 -0700 Re-opened since this is blocked by bug 212422 1656529 5 400368 ddkilzer 2020-05-27 13:07:39 -0700 Created attachment 400368 Patch v2 1656534 6 ddkilzer 2020-05-27 13:10:37 -0700 The content of attachment 400368 has been deleted for the following reason: Uploaded to wrong bug (was for Bug 212424). 1656535 7 ddkilzer 2020-05-27 13:11:57 -0700 This will be fixed a different way in the future. 1656634 8 ddkilzer 2020-05-27 15:38:40 -0700 Reopening to attach new patch. 1656635 9 400393 ddkilzer 2020-05-27 15:38:41 -0700 Created attachment 400393 Patch v4 1656637 10 ddkilzer 2020-05-27 15:39:37 -0700 The content of attachment 400393 has been deleted for the following reason: Uploaded to wrong bug (was for Bug 212424). 396250 2020-04-12 20:18:48 -0700 2020-04-13 10:41:49 -0700 Patch v1 bug-210414-20200412201935.patch text/plain 13984 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5OTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWU2ODQ4YjE0MzIzNzlj Mzk2NmQ5MTNlODJjN2JiZGEzNTM0ZTY0NS4uZjY5NzNiMzljZDUyOTI4MzI1YzI0NDUzYzNlOWMw M2EyMDdjYmRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA0LTEyICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgS2V5ZWREZWNvZGVyIGZ1 bmN0aW9ucyBpbiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLntjcHAsaH0gc2hvdWxkIHJldHVybiBi b29sIGFuZCB1c2UgV0FSTl9VTlVTRURfUkVUVVJOCisgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8yMTA0MTQ+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTY5MzExOD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZUhhc2hDb3VudGVk U2V0KToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZUhhc2hTZXQpOgorICAgICAgICAoV2ViQ29y ZTo6ZGVjb2RlT3B0aW9uU2V0KToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZUZvbnRIYXNoU2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZUNhbnZhc0FjdGl2aXR5UmVjb3JkKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZSk6CisgICAgICAgICog bG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaDoKKyAgICAgICAgLSBDaGFuZ2UgZGVjb2Rl IGZ1bmN0aW9ucyB0byByZXR1cm4gYGJvb2xgLgorICAgICAgICAtIEFkZCBXQVJOX1VOVVNFRF9S RVRVUk4gdG8gYWxsIGRlY29kZSBmdW5jdGlvbnMuCisgICAgICAgIC0gQ2hlY2sgdGhlIHJldHVy biB2YWx1ZSBvZiBhbGwgZGVjb2RlIGZ1bmN0aW9ucy4KKwogMjAyMC0wNC0xMiAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gQWRkIHRhYmxlIHN1 cHBvcnQgdG8gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1dpZHRoQW5k TWFyZ2luCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3Rh dGlzdGljcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy5jcHAKaW5kZXggOWEzMTNjOTA0ZDdkMWQxMmRiMGIzMzZiOGFkYzg1Mjk1YjM0YTE3My4uYWE4 NGNiMDQ0NzY0OTE2MGE2YTU0MGMwYTRkZDNmOTdhYWM5ZTgwZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcApAQCAtMTIzLDEwICsxMjMs MTAgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjplbmNvZGUoS2V5ZWRFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogI2VuZGlmCiB9CiAKLXN0YXRpYyB2b2lkIGRlY29kZUhhc2hDb3VudGVk U2V0KEtleWVkRGVjb2RlciYgZGVjb2RlciwgY29uc3QgU3RyaW5nJiBsYWJlbCwgSGFzaENvdW50 ZWRTZXQ8UmVnaXN0cmFibGVEb21haW4+JiBoYXNoQ291bnRlZFNldCkKK3N0YXRpYyBXQVJOX1VO VVNFRF9SRVRVUk4gYm9vbCBkZWNvZGVIYXNoQ291bnRlZFNldChLZXllZERlY29kZXImIGRlY29k ZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIEhhc2hDb3VudGVkU2V0PFJlZ2lzdHJhYmxlRG9tYWlu PiYgaGFzaENvdW50ZWRTZXQpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4gaWdub3JlOwotICAgIGRl Y29kZXIuZGVjb2RlT2JqZWN0cyhsYWJlbCwgaWdub3JlLCBbJmhhc2hDb3VudGVkU2V0XShLZXll ZERlY29kZXImIGRlY29kZXJJbm5lciwgU3RyaW5nJiBkb21haW4pIHsKKyAgICByZXR1cm4gZGVj b2Rlci5kZWNvZGVPYmplY3RzKGxhYmVsLCBpZ25vcmUsIFsmaGFzaENvdW50ZWRTZXRdKEtleWVk RGVjb2RlciYgZGVjb2RlcklubmVyLCBTdHJpbmcmIGRvbWFpbikgewogICAgICAgICBpZiAoIWRl Y29kZXJJbm5lci5kZWNvZGVTdHJpbmcoIm9yaWdpbiIsIGRvbWFpbikpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIApAQCAtMTM5LDEwICsxMzksMTAgQEAgc3RhdGljIHZvaWQg ZGVjb2RlSGFzaENvdW50ZWRTZXQoS2V5ZWREZWNvZGVyJiBkZWNvZGVyLCBjb25zdCBTdHJpbmcm IGxhYmVsLCBIYXMKICAgICB9KTsKIH0KIAotc3RhdGljIHZvaWQgZGVjb2RlSGFzaFNldChLZXll ZERlY29kZXImIGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYga2V5 LCBIYXNoU2V0PFJlZ2lzdHJhYmxlRG9tYWluPiYgaGFzaFNldCkKK3N0YXRpYyBXQVJOX1VOVVNF RF9SRVRVUk4gYm9vbCBkZWNvZGVIYXNoU2V0KEtleWVkRGVjb2RlciYgZGVjb2RlciwgY29uc3Qg U3RyaW5nJiBsYWJlbCwgY29uc3QgU3RyaW5nJiBrZXksIEhhc2hTZXQ8UmVnaXN0cmFibGVEb21h aW4+JiBoYXNoU2V0KQogewogICAgIFZlY3RvcjxTdHJpbmc+IGlnbm9yZTsKLSAgICBkZWNvZGVy LmRlY29kZU9iamVjdHMobGFiZWwsIGlnbm9yZSwgWyZoYXNoU2V0LCAma2V5XShLZXllZERlY29k ZXImIGRlY29kZXJJbm5lciwgU3RyaW5nJiBkb21haW4pIHsKKyAgICByZXR1cm4gZGVjb2Rlci5k ZWNvZGVPYmplY3RzKGxhYmVsLCBpZ25vcmUsIFsmaGFzaFNldCwgJmtleV0oS2V5ZWREZWNvZGVy JiBkZWNvZGVySW5uZXIsIFN0cmluZyYgZG9tYWluKSB7CiAgICAgICAgIGlmICghZGVjb2Rlcklu bmVyLmRlY29kZVN0cmluZyhrZXksIGRvbWFpbikpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIApAQCAtMTUyLDIyICsxNTIsMjQgQEAgc3RhdGljIHZvaWQgZGVjb2RlSGFzaFNl dChLZXllZERlY29kZXImIGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmkK IH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KLXN0YXRpYyB2b2lkIGRlY29kZU9wdGlvblNldChL ZXllZERlY29kZXImIGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIE9wdGlvblNldDxUPiYg b3B0aW9uU2V0KQorc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZU9wdGlvblNl dChLZXllZERlY29kZXImIGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIE9wdGlvblNldDxU PiYgb3B0aW9uU2V0KQogewogICAgIHVpbnQ2NF90IG9wdGlvblNldEJpdE1hc2sgPSAwOwotICAg IGRlY29kZXIuZGVjb2RlVUludDY0KGxhYmVsLCBvcHRpb25TZXRCaXRNYXNrKTsKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlVUludDY0KGxhYmVsLCBvcHRpb25TZXRCaXRNYXNrKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIG9wdGlvblNldCA9IE9wdGlvblNldDxUPjo6ZnJvbVJhdyhvcHRp b25TZXRCaXRNYXNrKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogI2lmIEVOQUJMRShXRUJfQVBJ X1NUQVRJU1RJQ1MpCi1zdGF0aWMgdm9pZCBkZWNvZGVGb250SGFzaFNldChLZXllZERlY29kZXIm IGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIEhhc2hTZXQ8U3RyaW5nPiYgaGFzaFNldCkK K3N0YXRpYyBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGVGb250SGFzaFNldChLZXllZERl Y29kZXImIGRlY29kZXIsIGNvbnN0IFN0cmluZyYgbGFiZWwsIEhhc2hTZXQ8U3RyaW5nPiYgaGFz aFNldCkKIHsKLSAgICBkZWNvZGVIYXNoU2V0KGRlY29kZXIsIGxhYmVsLCAiZm9udCIsIGhhc2hT ZXQpOworICAgIHJldHVybiBkZWNvZGVIYXNoU2V0KGRlY29kZXIsIGxhYmVsLCAiZm9udCIsIGhh c2hTZXQpOwogfQogICAgIAotc3RhdGljIHZvaWQgZGVjb2RlQ2FudmFzQWN0aXZpdHlSZWNvcmQo S2V5ZWREZWNvZGVyJiBkZWNvZGVyLCBjb25zdCBTdHJpbmcmIGxhYmVsLCBDYW52YXNBY3Rpdml0 eVJlY29yZCYgY2FudmFzQWN0aXZpdHlSZWNvcmQpCitzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJO IGJvb2wgZGVjb2RlQ2FudmFzQWN0aXZpdHlSZWNvcmQoS2V5ZWREZWNvZGVyJiBkZWNvZGVyLCBj b25zdCBTdHJpbmcmIGxhYmVsLCBDYW52YXNBY3Rpdml0eVJlY29yZCYgY2FudmFzQWN0aXZpdHlS ZWNvcmQpCiB7Ci0gICAgZGVjb2Rlci5kZWNvZGVPYmplY3QobGFiZWwsIGNhbnZhc0FjdGl2aXR5 UmVjb3JkLCBbXSAoS2V5ZWREZWNvZGVyJiBkZWNvZGVySW5uZXIsIENhbnZhc0FjdGl2aXR5UmVj b3JkJiBjYW52YXNBY3Rpdml0eVJlY29yZCkgeworICAgIHJldHVybiBkZWNvZGVyLmRlY29kZU9i amVjdChsYWJlbCwgY2FudmFzQWN0aXZpdHlSZWNvcmQsIFtdIChLZXllZERlY29kZXImIGRlY29k ZXJJbm5lciwgQ2FudmFzQWN0aXZpdHlSZWNvcmQmIGNhbnZhc0FjdGl2aXR5UmVjb3JkKSB7CiAg ICAgICAgIGlmICghZGVjb2RlcklubmVyLmRlY29kZUJvb2woIndhc0RhdGFSZWFkIiwgY2FudmFz QWN0aXZpdHlSZWNvcmQud2FzRGF0YVJlYWQpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICBWZWN0b3I8U3RyaW5nPiBpZ25vcmU7CkBAIC0xOTksNjggKzIwMSw4NSBAQCBib29s IFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZShLZXllZERlY29kZXImIGRlY29kZXIsIHVu c2lnbmVkIG1vZGVsVmVyc2lvbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBTdG9y YWdlIGFjY2VzcwotICAgIGlmIChtb2RlbFZlcnNpb24gPj0gMTUpCi0gICAgICAgIGRlY29kZUhh c2hTZXQoZGVjb2RlciwgInN0b3JhZ2VBY2Nlc3NVbmRlclRvcEZyYW1lRG9tYWlucyIsICJkb21h aW4iLCBzdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZURvbWFpbnMpOwotICAgIGVsc2UKLSAgICAg ICAgZGVjb2RlSGFzaFNldChkZWNvZGVyLCAic3RvcmFnZUFjY2Vzc1VuZGVyVG9wRnJhbWVPcmln aW5zIiwgIm9yaWdpbiIsIHN0b3JhZ2VBY2Nlc3NVbmRlclRvcEZyYW1lRG9tYWlucyk7CisgICAg aWYgKG1vZGVsVmVyc2lvbiA+PSAxNSkgeworICAgICAgICBpZiAoIWRlY29kZUhhc2hTZXQoZGVj b2RlciwgInN0b3JhZ2VBY2Nlc3NVbmRlclRvcEZyYW1lRG9tYWlucyIsICJkb21haW4iLCBzdG9y YWdlQWNjZXNzVW5kZXJUb3BGcmFtZURvbWFpbnMpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIH0gZWxzZSB7CisgICAgICAgIGlmICghZGVjb2RlSGFzaFNldChkZWNvZGVyLCAic3Rv cmFnZUFjY2Vzc1VuZGVyVG9wRnJhbWVPcmlnaW5zIiwgIm9yaWdpbiIsIHN0b3JhZ2VBY2Nlc3NV bmRlclRvcEZyYW1lRG9tYWlucykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQog CiAgICAgLy8gVG9wIGZyYW1lIHN0YXRzCiAgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAxNSkgewot ICAgICAgICBkZWNvZGVIYXNoU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1Rv IiwgImRvbWFpbiIsIHRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzVG8pOwotICAgICAgICBkZWNvZGVI YXNoU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c0Zyb20iLCAiZG9tYWluIiwg dG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tKTsKKyAgICAgICAgaWYgKCFkZWNvZGVIYXNoU2V0 KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvIiwgImRvbWFpbiIsIHRvcEZyYW1l VW5pcXVlUmVkaXJlY3RzVG8pKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBp ZiAoIWRlY29kZUhhc2hTZXQoZGVjb2RlciwgInRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzRnJvbSIs ICJkb21haW4iLCB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c0Zyb20pKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0gZWxzZSBpZiAobW9kZWxWZXJzaW9uID49IDExKSB7CiAgICAgICAg IEhhc2hDb3VudGVkU2V0PFJlZ2lzdHJhYmxlRG9tYWluPiB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0 c1RvQ291bnRlZDsKLSAgICAgICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInRvcEZy YW1lVW5pcXVlUmVkaXJlY3RzVG8iLCB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvQ291bnRlZCk7 CisgICAgICAgIGlmICghZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInRvcEZyYW1lVW5p cXVlUmVkaXJlY3RzVG8iLCB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvQ291bnRlZCkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGZvciAoYXV0byYgZG9tYWluIDogdG9wRnJh bWVVbmlxdWVSZWRpcmVjdHNUb0NvdW50ZWQudmFsdWVzKCkpCiAgICAgICAgICAgICB0b3BGcmFt ZVVuaXF1ZVJlZGlyZWN0c1RvLmFkZChkb21haW4pOwogICAgICAgICAKICAgICAgICAgSGFzaENv dW50ZWRTZXQ8UmVnaXN0cmFibGVEb21haW4+IHRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzRnJvbUNv dW50ZWQ7Ci0gICAgICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVu aXF1ZVJlZGlyZWN0c0Zyb20iLCB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c0Zyb21Db3VudGVkKTsK KyAgICAgICAgaWYgKCFkZWNvZGVIYXNoQ291bnRlZFNldChkZWNvZGVyLCAidG9wRnJhbWVVbmlx dWVSZWRpcmVjdHNGcm9tIiwgdG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tQ291bnRlZCkpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGZvciAoYXV0byYgZG9tYWluIDogdG9w RnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tQ291bnRlZC52YWx1ZXMoKSkKICAgICAgICAgICAgIHRv cEZyYW1lVW5pcXVlUmVkaXJlY3RzRnJvbS5hZGQoZG9tYWluKTsKICAgICB9CiAKICAgICBpZiAo bW9kZWxWZXJzaW9uID49IDE2KSB7Ci0gICAgICAgIGRlY29kZUhhc2hTZXQoZGVjb2RlciwgInRv cEZyYW1lTGlua0RlY29yYXRpb25zRnJvbSIsICJkb21haW4iLCB0b3BGcmFtZUxpbmtEZWNvcmF0 aW9uc0Zyb20pOworICAgICAgICBpZiAoIWRlY29kZUhhc2hTZXQoZGVjb2RlciwgInRvcEZyYW1l TGlua0RlY29yYXRpb25zRnJvbSIsICJkb21haW4iLCB0b3BGcmFtZUxpbmtEZWNvcmF0aW9uc0Zy b20pKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVj b2RlQm9vbCgiZ290TGlua0RlY29yYXRpb25Gcm9tUHJldmFsZW50UmVzb3VyY2UiLCBnb3RMaW5r RGVjb3JhdGlvbkZyb21QcmV2YWxlbnRSZXNvdXJjZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogCiAgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAxNykgewogICAgICAgICBIYXNo Q291bnRlZFNldDxSZWdpc3RyYWJsZURvbWFpbj4gdG9wRnJhbWVMb2FkZWRUaGlyZFBhcnR5U2Ny aXB0c0NvdW50ZWQ7Ci0gICAgICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJ0b3BG cmFtZUxvYWRlZFRoaXJkUGFydHlTY3JpcHRzIiwgdG9wRnJhbWVMb2FkZWRUaGlyZFBhcnR5U2Ny aXB0c0NvdW50ZWQpOworICAgICAgICBpZiAoIWRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIs ICJ0b3BGcmFtZUxvYWRlZFRoaXJkUGFydHlTY3JpcHRzIiwgdG9wRnJhbWVMb2FkZWRUaGlyZFBh cnR5U2NyaXB0c0NvdW50ZWQpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBm b3IgKGF1dG8mIGRvbWFpbiA6IHRvcEZyYW1lTG9hZGVkVGhpcmRQYXJ0eVNjcmlwdHNDb3VudGVk LnZhbHVlcygpKQogICAgICAgICAgICAgdG9wRnJhbWVMb2FkZWRUaGlyZFBhcnR5U2NyaXB0cy5h ZGQoZG9tYWluKTsKICAgICB9CiAKICAgICAvLyBTdWJmcmFtZSBzdGF0cwotICAgIGlmIChtb2Rl bFZlcnNpb24gPj0gMTUpCi0gICAgICAgIGRlY29kZUhhc2hTZXQoZGVjb2RlciwgInN1YmZyYW1l VW5kZXJUb3BGcmFtZURvbWFpbnMiLCAiZG9tYWluIiwgc3ViZnJhbWVVbmRlclRvcEZyYW1lRG9t YWlucyk7Ci0gICAgZWxzZSBpZiAobW9kZWxWZXJzaW9uID49IDE0KSB7CisgICAgaWYgKG1vZGVs VmVyc2lvbiA+PSAxNSkgeworICAgICAgICBpZiAoIWRlY29kZUhhc2hTZXQoZGVjb2RlciwgInN1 YmZyYW1lVW5kZXJUb3BGcmFtZURvbWFpbnMiLCAiZG9tYWluIiwgc3ViZnJhbWVVbmRlclRvcEZy YW1lRG9tYWlucykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSBlbHNlIGlmICht b2RlbFZlcnNpb24gPj0gMTQpIHsKICAgICAgICAgSGFzaENvdW50ZWRTZXQ8UmVnaXN0cmFibGVE b21haW4+IHN1YmZyYW1lVW5kZXJUb3BGcmFtZURvbWFpbnNDb3VudGVkOwotICAgICAgICBkZWNv ZGVIYXNoQ291bnRlZFNldChkZWNvZGVyLCAic3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucyIs IHN1YmZyYW1lVW5kZXJUb3BGcmFtZURvbWFpbnNDb3VudGVkKTsKKyAgICAgICAgaWYgKCFkZWNv ZGVIYXNoQ291bnRlZFNldChkZWNvZGVyLCAic3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucyIs IHN1YmZyYW1lVW5kZXJUb3BGcmFtZURvbWFpbnNDb3VudGVkKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgZm9yIChhdXRvJiBkb21haW4gOiBzdWJmcmFtZVVuZGVyVG9wRnJh bWVEb21haW5zQ291bnRlZC52YWx1ZXMoKSkKICAgICAgICAgICAgIHN1YmZyYW1lVW5kZXJUb3BG cmFtZURvbWFpbnMuYWRkKGRvbWFpbik7CiAgICAgfQogCiAgICAgLy8gU3VicmVzb3VyY2Ugc3Rh dHMKICAgICBpZiAobW9kZWxWZXJzaW9uID49IDE1KSB7Ci0gICAgICAgIGRlY29kZUhhc2hTZXQo ZGVjb2RlciwgInN1YnJlc291cmNlVW5kZXJUb3BGcmFtZURvbWFpbnMiLCAiZG9tYWluIiwgc3Vi cmVzb3VyY2VVbmRlclRvcEZyYW1lRG9tYWlucyk7Ci0gICAgICAgIGRlY29kZUhhc2hTZXQoZGVj b2RlciwgInN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzVG8iLCAiZG9tYWluIiwgc3VicmVzb3Vy Y2VVbmlxdWVSZWRpcmVjdHNUbyk7Ci0gICAgICAgIGRlY29kZUhhc2hTZXQoZGVjb2RlciwgInN1 YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbSIsICJkb21haW4iLCBzdWJyZXNvdXJjZVVuaXF1 ZVJlZGlyZWN0c0Zyb20pOworICAgICAgICBpZiAoIWRlY29kZUhhc2hTZXQoZGVjb2RlciwgInN1 YnJlc291cmNlVW5kZXJUb3BGcmFtZURvbWFpbnMiLCAiZG9tYWluIiwgc3VicmVzb3VyY2VVbmRl clRvcEZyYW1lRG9tYWlucykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlm ICghZGVjb2RlSGFzaFNldChkZWNvZGVyLCAic3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyIs ICJkb21haW4iLCBzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvKSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFkZWNvZGVIYXNoU2V0KGRlY29kZXIsICJzdWJyZXNv dXJjZVVuaXF1ZVJlZGlyZWN0c0Zyb20iLCAiZG9tYWluIiwgc3VicmVzb3VyY2VVbmlxdWVSZWRp cmVjdHNGcm9tKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9IGVsc2UgewogICAg ICAgICBIYXNoQ291bnRlZFNldDxSZWdpc3RyYWJsZURvbWFpbj4gc3VicmVzb3VyY2VVbmRlclRv cEZyYW1lRG9tYWluc0NvdW50ZWQ7Ci0gICAgICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29k ZXIsICJzdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zIiwgc3VicmVzb3VyY2VVbmRlclRv cEZyYW1lRG9tYWluc0NvdW50ZWQpOworICAgICAgICBpZiAoIWRlY29kZUhhc2hDb3VudGVkU2V0 KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zIiwgc3VicmVzb3VyY2VV bmRlclRvcEZyYW1lRG9tYWluc0NvdW50ZWQpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICBmb3IgKGF1dG8mIGRvbWFpbiA6IHN1YnJlc291cmNlVW5kZXJUb3BGcmFtZURvbWFp bnNDb3VudGVkLnZhbHVlcygpKQogICAgICAgICAgICAgc3VicmVzb3VyY2VVbmRlclRvcEZyYW1l RG9tYWlucy5hZGQoZG9tYWluKTsKIAogICAgICAgICBIYXNoQ291bnRlZFNldDxSZWdpc3RyYWJs ZURvbWFpbj4gc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUb0NvdW50ZWQ7Ci0gICAgICAgIGRl Y29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1Rv Iiwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUb0NvdW50ZWQpOworICAgICAgICBpZiAoIWRl Y29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1Rv Iiwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUb0NvdW50ZWQpKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICBmb3IgKGF1dG8mIGRvbWFpbiA6IHN1YnJlc291cmNlVW5pcXVl UmVkaXJlY3RzVG9Db3VudGVkLnZhbHVlcygpKQogICAgICAgICAgICAgc3VicmVzb3VyY2VVbmlx dWVSZWRpcmVjdHNUby5hZGQoZG9tYWluKTsKICAgICAgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAx MSkgewogICAgICAgICAgICAgSGFzaENvdW50ZWRTZXQ8UmVnaXN0cmFibGVEb21haW4+IHN1YnJl c291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbUNvdW50ZWQ7Ci0gICAgICAgICAgICBkZWNvZGVIYXNo Q291bnRlZFNldChkZWNvZGVyLCAic3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNGcm9tIiwgc3Vi cmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNGcm9tQ291bnRlZCk7CisgICAgICAgICAgICBpZiAoIWRl Y29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c0Zy b20iLCBzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c0Zyb21Db3VudGVkKSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIGRvbWFpbiA6IHN1YnJl c291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbUNvdW50ZWQudmFsdWVzKCkpCiAgICAgICAgICAgICAg ICAgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNGcm9tLmFkZChkb21haW4pOwogICAgICAgICB9 CkBAIC0yOTksMjAgKzMxOCwyNiBAQCBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29k ZShLZXllZERlY29kZXImIGRlY29kZXIsIHVuc2lnbmVkIG1vZGVsVmVyc2lvbgogICAgIGxhc3RT ZWVuID0gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKGxhc3RTZWVuVGltZUFzRG91YmxlKTsKIAog ICAgIGlmIChtb2RlbFZlcnNpb24gPj0gMTEpIHsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZVVJbnQzMigidGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uIiwg dGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uKSkKKyAgICAgICAg aWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigidGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRv VXNlckludGVyYWN0aW9uIiwgdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVy YWN0aW9uKSkgewogICAgICAgICAgICAgdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNl ckludGVyYWN0aW9uID0gMDsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigidGlt ZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSIsIHRpbWVzQWNjZXNz ZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkpKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICB9CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGVVSW50MzIoInRp bWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkiLCB0aW1lc0FjY2Vz c2VkQXNGaXJzdFBhcnR5RHVlVG9TdG9yYWdlQWNjZXNzQVBJKSkgewogICAgICAgICAgICAgdGlt ZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSA9IDA7CisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAKICNpZiBFTkFCTEUoV0VCX0FQ SV9TVEFUSVNUSUNTKQogICAgIGlmIChtb2RlbFZlcnNpb24gPj0gMTMpIHsKLSAgICAgICAgZGVj b2RlRm9udEhhc2hTZXQoZGVjb2RlciwgImZvbnRzRmFpbGVkVG9Mb2FkIiwgZm9udHNGYWlsZWRU b0xvYWQpOwotICAgICAgICBkZWNvZGVGb250SGFzaFNldChkZWNvZGVyLCAiZm9udHNTdWNjZXNz ZnVsbHlMb2FkZWQiLCBmb250c1N1Y2Nlc3NmdWxseUxvYWRlZCk7Ci0gICAgICAgIGRlY29kZUhh c2hDb3VudGVkU2V0KGRlY29kZXIsICJ0b3BGcmFtZVJlZ2lzdHJhYmxlRG9tYWluc1doaWNoQWNj ZXNzZWRXZWJBUElzIiwgdG9wRnJhbWVSZWdpc3RyYWJsZURvbWFpbnNXaGljaEFjY2Vzc2VkV2Vi QVBJcyk7Ci0gICAgICAgIGRlY29kZUNhbnZhc0FjdGl2aXR5UmVjb3JkKGRlY29kZXIsICJjYW52 YXNBY3Rpdml0eVJlY29yZCIsIGNhbnZhc0FjdGl2aXR5UmVjb3JkKTsKLSAgICAgICAgZGVjb2Rl T3B0aW9uU2V0KGRlY29kZXIsICJuYXZpZ2F0b3JGdW5jdGlvbnNBY2Nlc3NlZEJpdE1hc2siLCBu YXZpZ2F0b3JGdW5jdGlvbnNBY2Nlc3NlZCk7Ci0gICAgICAgIGRlY29kZU9wdGlvblNldChkZWNv ZGVyLCAic2NyZWVuRnVuY3Rpb25zQWNjZXNzZWRCaXRNYXNrIiwgc2NyZWVuRnVuY3Rpb25zQWNj ZXNzZWQpOworICAgICAgICBpZiAoIShkZWNvZGVGb250SGFzaFNldChkZWNvZGVyLCAiZm9udHNG YWlsZWRUb0xvYWQiLCBmb250c0ZhaWxlZFRvTG9hZCkKKyAgICAgICAgICAgICYmIGRlY29kZUZv bnRIYXNoU2V0KGRlY29kZXIsICJmb250c1N1Y2Nlc3NmdWxseUxvYWRlZCIsIGZvbnRzU3VjY2Vz c2Z1bGx5TG9hZGVkKQorICAgICAgICAgICAgJiYgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2Rl ciwgInRvcEZyYW1lUmVnaXN0cmFibGVEb21haW5zV2hpY2hBY2Nlc3NlZFdlYkFQSXMiLCB0b3BG cmFtZVJlZ2lzdHJhYmxlRG9tYWluc1doaWNoQWNjZXNzZWRXZWJBUElzKQorICAgICAgICAgICAg JiYgZGVjb2RlQ2FudmFzQWN0aXZpdHlSZWNvcmQoZGVjb2RlciwgImNhbnZhc0FjdGl2aXR5UmVj b3JkIiwgY2FudmFzQWN0aXZpdHlSZWNvcmQpCisgICAgICAgICAgICAmJiBkZWNvZGVPcHRpb25T ZXQoZGVjb2RlciwgIm5hdmlnYXRvckZ1bmN0aW9uc0FjY2Vzc2VkQml0TWFzayIsIG5hdmlnYXRv ckZ1bmN0aW9uc0FjY2Vzc2VkKQorICAgICAgICAgICAgJiYgZGVjb2RlT3B0aW9uU2V0KGRlY29k ZXIsICJzY3JlZW5GdW5jdGlvbnNBY2Nlc3NlZEJpdE1hc2siLCBzY3JlZW5GdW5jdGlvbnNBY2Nl c3NlZCkpKSB7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAj ZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3MuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz LmgKaW5kZXggZDU4N2E1MTQxZjM4ZWY4YmM3MDhlZTc3ZTc4MWNmMGY1YmQwMjY5OS4uNjMyNjMx Y2JkMDFkMGM3MjBhNzBiNzFkMTAzZGEwMmFmMTJhZTUzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCkBAIC01OCw3ICs1OCw3IEBAIHN0cnVj dCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgV2Fs bFRpbWUgcmVkdWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWUpOwogCiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBlbmNvZGUoS2V5ZWRFbmNvZGVyJikgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQg Ym9vbCBkZWNvZGUoS2V5ZWREZWNvZGVyJiwgdW5zaWduZWQgbW9kZWxWZXJzaW9uKTsKKyAgICBX RUJDT1JFX0VYUE9SVCBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoS2V5ZWREZWNvZGVy JiwgdW5zaWduZWQgbW9kZWxWZXJzaW9uKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyB0 b1N0cmluZygpIGNvbnN0OwogCg== 400368 2020-05-27 13:07:39 -0700 2020-05-27 13:07:39 -0700 Patch v2 bug-210414-20200527130918.patch text/plain 0 ddkilzer 400393 2020-05-27 15:38:41 -0700 2020-05-27 15:38:41 -0700 Patch v4 bug-210414-20200527154021.patch text/plain 0 ddkilzer