231221 2021-10-05 02:07:40 -0700 Replace document.topDocument().securityOrigin() with document.topOrigin() 2021-10-05 04:01:21 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ntim ntim cdumez cmarcelo esprehn+autocc ews-watchlist japhet kangil.han webkit-bug-importer youennf oldest_to_newest 1800447 0 ntim 2021-10-05 02:07:40 -0700 Document::topOrigin() is defined as: SecurityOrigin& topOrigin() const final { return topDocument().securityOrigin(); } 1800452 1 440185 ntim 2021-10-05 02:26:11 -0700 Created attachment 440185 Patch 1800454 2 440185 youennf 2021-10-05 02:29:28 -0700 Comment on attachment 440185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440185&action=review > Source/WebCore/dom/DocumentStorageAccess.cpp:92 > + auto& topSecurityOrigin = m_document.topOrigin(); topSecurityOrigin is only used once, can we remove this variable? > Source/WebCore/dom/DocumentStorageAccess.cpp:162 > + auto& topSecurityOrigin = m_document.topOrigin(); Ditto for both topSecurityOrigin and topDocument 1800492 3 440191 ntim 2021-10-05 03:01:26 -0700 Created attachment 440191 Patch 1800505 4 ews-feeder 2021-10-05 04:00:04 -0700 Committed r283544 (242509@main): <https://commits.webkit.org/242509@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440191. 1800506 5 webkit-bug-importer 2021-10-05 04:01:21 -0700 <rdar://problem/83880206> 440185 2021-10-05 02:26:11 -0700 2021-10-05 03:01:21 -0700 Patch bug-231221-20211005112609.patch text/plain 7000 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViMWI3MjY4ZjVlODk5 N2M5MWZiNzkwNmI2M2RjYmM5MTM5NjkwZC4uM2U0ODNjNThiNWRiYjkwZTdkZTM3ZGIzNWQzYzc0 YzAyMjQyZmQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEwLTA1ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBkb2N1bWVudC50b3BE b2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCkgd2l0aCBkb2N1bWVudC50b3BPcmlnaW4oKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMjIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gYmVoYXZpb3Vy IGNoYW5nZSwgRG9jdW1lbnQ6OnRvcE9yaWdpbigpIGlzIGRlZmluZWQgYXM6CisKKyAgICAgICAg YFNlY3VyaXR5T3JpZ2luJiB0b3BPcmlnaW4oKSBjb25zdCBmaW5hbCB7IHJldHVybiB0b3BEb2N1 bWVudCgpLnNlY3VyaXR5T3JpZ2luKCk7IH1gCisKKyAgICAgICAgKiBkb20vQnJvYWRjYXN0Q2hh bm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRQYXJ0aXRpb25PcmlnaW4pOgorICAg ICAgICAqIGRvbS9Eb2N1bWVudFN0b3JhZ2VBY2Nlc3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpoYXNTdG9yYWdlQWNjZXNzUXVpY2tDaGVjayk6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6Omhhc1N0b3JhZ2VBY2Nlc3MpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFj Y2Vzc1F1aWNrQ2hlY2spOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRTdG9yYWdlQWNjZXNz OjpyZXF1ZXN0U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Zm9jdXMpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKwogMjAyMS0xMC0wNSAgTXlsZXMgQy4gTWF4Zmll bGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIE5lZ2F0aXZlIGludGVnZXJzIGlu IEBmb250LXBhbGV0dGUtdmFsdWVzIGFyZSBpbnZhbGlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vQnJvYWRjYXN0Q2hhbm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQnJvYWRj YXN0Q2hhbm5lbC5jcHAKaW5kZXggMGYwNzFmMTNmMjlhZGVhMTgwOTY2Nzg3MDZiZTAyYWI0OTMx N2E2MS4uOGM5YTlkYTVkNzhjZDE0Y2EyNWI4NTY4Y2VhZjZmODFiOGNjZDQwMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Ccm9hZGNhc3RDaGFubmVsLmNwcApAQCAtNzIsNyArNzIsNyBAQCBzdGF0aWMg Ym9vbCBzaG91bGRQYXJ0aXRpb25PcmlnaW4oRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIGlmICgh cGFnZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICByZXR1cm4gIXBhZ2UtPmNocm9tZSgp LmNsaWVudCgpLmhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVu Y2hlY2tlZENyZWF0ZUZyb21Ib3N0KGRvY3VtZW50LnRvcERvY3VtZW50KCkuc2VjdXJpdHlPcmln aW4oKS5ob3N0KCkpLCBSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3Qo ZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkpKTsKKyAgICByZXR1cm4gIXBhZ2UtPmNo cm9tZSgpLmNsaWVudCgpLmhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21h aW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KGRvY3VtZW50LnRvcE9yaWdpbigpLmhvc3QoKSks IFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChkb2N1bWVudC5zZWN1 cml0eU9yaWdpbigpLmhvc3QoKSkpOwogI2Vsc2UKICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAppbmRleCA1Njhl NTA3ZWMzNzg5MTFjZDVmOTVmYWNmOGY2ZjQ3NDgwNzkwYjA5Li45ZDU5MzczODdlYTNmOTM1Y2E2 MGNiY2VmMGMyYjgyZWFiOWU3NmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnRTdG9yYWdlQWNjZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRT dG9yYWdlQWNjZXNzLmNwcApAQCAtODksNyArODksNyBAQCBzdGQ6Om9wdGlvbmFsPGJvb2w+IERv Y3VtZW50U3RvcmFnZUFjY2Vzczo6aGFzU3RvcmFnZUFjY2Vzc1F1aWNrQ2hlY2soKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAogICAgIGF1dG8mIHNlY3VyaXR5T3JpZ2luID0gbV9kb2N1bWVudC5z ZWN1cml0eU9yaWdpbigpOwotICAgIGF1dG8mIHRvcFNlY3VyaXR5T3JpZ2luID0gbV9kb2N1bWVu dC50b3BEb2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCk7CisgICAgYXV0byYgdG9wU2VjdXJpdHlP cmlnaW4gPSBtX2RvY3VtZW50LnRvcE9yaWdpbigpOwogICAgIGlmIChzZWN1cml0eU9yaWdpbi5l cXVhbCgmdG9wU2VjdXJpdHlPcmlnaW4pKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIApAQCAtMTI0 LDcgKzEyNCw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpoYXNTdG9yYWdlQWNjZXNz KFJlZjxEZWZlcnJlZFByb21pc2U+JiYgcHJvbWlzZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAotICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmhhc1N0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFi bGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQuc2VjdXJpdHlPcmln aW4oKS5ob3N0KCkpLCBSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3Qo bV9kb2N1bWVudC50b3BEb2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgKmZyYW1l LCBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21p c2UpXSAoYm9vbCBoYXNBY2Nlc3MpIHsKKyAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5oYXNT dG9yYWdlQWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdCht X2RvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVnaXN0cmFibGVEb21haW46OnVu Y2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wT3JpZ2luKCkuaG9zdCgpKSwgKmZy YW1lLCBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHBy b21pc2UpXSAoYm9vbCBoYXNBY2Nlc3MpIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMTU5LDggKzE1OSw3IEBAIHN0ZDo6b3B0aW9uYWw8U3RvcmFn ZUFjY2Vzc1F1aWNrUmVzdWx0PiBEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdl QWNjCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm4gU3RvcmFn ZUFjY2Vzc1F1aWNrUmVzdWx0OjpHcmFudDsKIAotICAgIGF1dG8mIHRvcERvY3VtZW50ID0gbV9k b2N1bWVudC50b3BEb2N1bWVudCgpOwotICAgIGF1dG8mIHRvcFNlY3VyaXR5T3JpZ2luID0gdG9w RG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKTsKKyAgICBhdXRvJiB0b3BTZWN1cml0eU9yaWdpbiA9 IG1fZG9jdW1lbnQudG9wT3JpZ2luKCk7CiAgICAgYXV0byYgc2VjdXJpdHlPcmlnaW4gPSBtX2Rv Y3VtZW50LnNlY3VyaXR5T3JpZ2luKCk7CiAgICAgaWYgKHNlY3VyaXR5T3JpZ2luLmVxdWFsKCZ0 b3BTZWN1cml0eU9yaWdpbikpCiAgICAgICAgIHJldHVybiBTdG9yYWdlQWNjZXNzUXVpY2tSZXN1 bHQ6OkdyYW50OwpAQCAtMjAyLDcgKzIwMSw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNz OjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAg ICAgaWYgKCFwYWdlLT5zZXR0aW5ncygpLnN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFi bGVkKCkpCiAgICAgICAgIG1fc3RvcmFnZUFjY2Vzc1Njb3BlID0gU3RvcmFnZUFjY2Vzc1Njb3Bl OjpQZXJGcmFtZTsKIAotICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnJlcXVlc3RTdG9yYWdl QWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChtX2RvY3Vt ZW50LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tl ZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wRG9jdW1lbnQoKS5zZWN1cml0eU9yaWdpbigp Lmhvc3QoKSksICpmcmFtZSwgbV9zdG9yYWdlQWNjZXNzU2NvcGUsIFt0aGlzLCB3ZWFrVGhpcyA9 IG1ha2VXZWFrUHRyKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChSZXF1ZXN0 U3RvcmFnZUFjY2Vzc1Jlc3VsdCByZXN1bHQpIG11dGFibGUgeworICAgIHBhZ2UtPmNocm9tZSgp LmNsaWVudCgpLnJlcXVlc3RTdG9yYWdlQWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNr ZWRDcmVhdGVGcm9tSG9zdChtX2RvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVn aXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wT3Jp Z2luKCkuaG9zdCgpKSwgKmZyYW1lLCBtX3N0b3JhZ2VBY2Nlc3NTY29wZSwgW3RoaXMsIHdlYWtU aGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0gKFJl cXVlc3RTdG9yYWdlQWNjZXNzUmVzdWx0IHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlmICgh d2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRl eCA5OThiMGExYjU3NjBiMGIxZjMxNzIxNTA5MTM0OGUxOWJkNTM3YWJlLi5lYWQ3MjY3YTY5ZTc3 ZjA5ODllZWExN2VkNGNlMzIzZjU4YTRmNWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0z MDk3LDcgKzMwOTcsNyBAQCB2b2lkIEVsZW1lbnQ6OmZvY3VzKGNvbnN0IEZvY3VzT3B0aW9ucyYg b3B0aW9ucykKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKSkgewogICAg ICAgICBhdXRvJiBmcmFtZSA9ICpkb2N1bWVudC0+ZnJhbWUoKTsKLSAgICAgICAgaWYgKCFmcmFt ZS5oYXNIYWRVc2VySW50ZXJhY3Rpb24oKSAmJiAhZnJhbWUuaXNNYWluRnJhbWUoKSAmJiAhZG9j dW1lbnQtPnRvcERvY3VtZW50KCkuc2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVPcmlnaW5Eb21haW4o ZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkpKQorICAgICAgICBpZiAoIWZyYW1lLmhhc0hhZFVz ZXJJbnRlcmFjdGlvbigpICYmICFmcmFtZS5pc01haW5GcmFtZSgpICYmICFkb2N1bWVudC0+dG9w T3JpZ2luKCkuaXNTYW1lT3JpZ2luRG9tYWluKGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpKSkK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBGb2N1c09wdGlvbnMgb3B0aW9uc1dpdGhW aXNpYmlsaXR5ID0gb3B0aW9uczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDk5YWM3ZDUyYjFkNDc4NmU4NjMxMDEz Y2NiMGU3ZTJhNjYzYWQ3ODYuLjEwNGJjYjg3MDgyOTgwNDM5ZDU4MzFhYTMyOWViNDk1Yjk0NjY3 MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcApAQCAtOTUwLDcgKzk1MCw3IEBAIFJlc291cmNlRXJyb3JPcjxDYWNoZWRS ZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1 CiAgICAgICAgICAgICBlbHNlIGlmIChhdXRvKiB0b3BEb2N1bWVudCA9IGZyYW1lLm1haW5GcmFt ZSgpLmRvY3VtZW50KCkpCiAgICAgICAgICAgICAgICAgc2FtZU9yaWdpblJlcXVlc3QgPSB0b3BE b2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVTY2hlbWVIb3N0UG9ydChyZXF1ZXN0ZWRP cmlnaW4uZ2V0KCkpOwogICAgICAgICB9IGVsc2UgaWYgKGRvY3VtZW50KCkpIHsKLSAgICAgICAg ICAgIHNhbWVPcmlnaW5SZXF1ZXN0ID0gZG9jdW1lbnQoKS0+dG9wRG9jdW1lbnQoKS5zZWN1cml0 eU9yaWdpbigpLmlzU2FtZVNjaGVtZUhvc3RQb3J0KHJlcXVlc3RlZE9yaWdpbi5nZXQoKSkKKyAg ICAgICAgICAgIHNhbWVPcmlnaW5SZXF1ZXN0ID0gZG9jdW1lbnQoKS0+dG9wT3JpZ2luKCkuaXNT YW1lU2NoZW1lSG9zdFBvcnQocmVxdWVzdGVkT3JpZ2luLmdldCgpKQogICAgICAgICAgICAgICAg ICYmIGRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCkuaXNTYW1lU2NoZW1lSG9zdFBvcnQocmVx dWVzdGVkT3JpZ2luLmdldCgpKTsKICAgICAgICAgfQogICAgICAgICBmb3IgKGF1dG8mIGZpZWxk cyA6IG1fZG9jdW1lbnRMb2FkZXItPmN1c3RvbUhlYWRlckZpZWxkcygpKSB7Cg== 440191 2021-10-05 03:01:26 -0700 2021-10-05 04:00:05 -0700 Patch bug-231221-20211005120125.patch text/plain 7798 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVhMmE2MTkxZDQ4YWEy ZThmZGI0MzU4YjMxODdiMDkxM2ZkM2ZlNS4uMDU0ZTQxMTQ4NTcxYjNkYWM3YTIxZWQ0NGRmNDA2 MDQwNmI5OWYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEwLTA1ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBkb2N1bWVudC50b3BE b2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCkgd2l0aCBkb2N1bWVudC50b3BPcmlnaW4oKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMjIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBObyBiZWhhdmlvdXIg Y2hhbmdlLCBEb2N1bWVudDo6dG9wT3JpZ2luKCkgaXMgZGVmaW5lZCBhczoKKworICAgICAgICBg U2VjdXJpdHlPcmlnaW4mIHRvcE9yaWdpbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRvcERvY3Vt ZW50KCkuc2VjdXJpdHlPcmlnaW4oKTsgfWAKKworICAgICAgICAqIGRvbS9Ccm9hZGNhc3RDaGFu bmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFBhcnRpdGlvbk9yaWdpbik6CisgICAg ICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudFN0b3JhZ2VBY2Nlc3M6Omhhc1N0b3JhZ2VBY2Nlc3NRdWlja0NoZWNrKToKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50U3RvcmFnZUFjY2Vzczo6aGFzU3RvcmFnZUFjY2Vzcyk6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdlQWNj ZXNzUXVpY2tDaGVjayk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6 OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFbGVtZW50Ojpmb2N1cyk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UpOgorCiAyMDIxLTEwLTA1ICBUaW0gTmd1eWVuICA8bnRp bUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgc2hvdWxkQXV0b2ZvY3VzIGluIEhUTUxG b3JtQ29udHJvbEVsZW1lbnQuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQnJv YWRjYXN0Q2hhbm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQnJvYWRjYXN0Q2hhbm5lbC5j cHAKaW5kZXggMGYwNzFmMTNmMjlhZGVhMTgwOTY2Nzg3MDZiZTAyYWI0OTMxN2E2MS4uOGM5YTlk YTVkNzhjZDE0Y2EyNWI4NTY4Y2VhZjZmODFiOGNjZDQwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9C cm9hZGNhc3RDaGFubmVsLmNwcApAQCAtNzIsNyArNzIsNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRQ YXJ0aXRpb25PcmlnaW4oRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIGlmICghcGFnZSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKLSAgICByZXR1cm4gIXBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmhh c1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0 ZUZyb21Ib3N0KGRvY3VtZW50LnRvcERvY3VtZW50KCkuc2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkp LCBSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QoZG9jdW1lbnQuc2Vj dXJpdHlPcmlnaW4oKS5ob3N0KCkpKTsKKyAgICByZXR1cm4gIXBhZ2UtPmNocm9tZSgpLmNsaWVu dCgpLmhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tl ZENyZWF0ZUZyb21Ib3N0KGRvY3VtZW50LnRvcE9yaWdpbigpLmhvc3QoKSksIFJlZ2lzdHJhYmxl RG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigp Lmhvc3QoKSkpOwogI2Vsc2UKICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAppbmRleCA1NjhlNTA3ZWMzNzg5MTFj ZDVmOTVmYWNmOGY2ZjQ3NDgwNzkwYjA5Li42ZTAzNzc4OTcxN2JhYzZhZjJjNmQxZDE0YzEzZTQ1 Y2ZkOWQ5ZjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdl QWNjZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNz LmNwcApAQCAtODIsMTUgKzgyLDE0IEBAIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gRG9jdW1lbnRTdG9y YWdlQWNjZXNzOjpoYXNTdG9yYWdlQWNjZXNzUXVpY2tDaGVjaygpCiAgICAgaWYgKGZyYW1lICYm IGhhc0ZyYW1lU3BlY2lmaWNTdG9yYWdlQWNjZXNzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwog Ci0gICAgaWYgKCFmcmFtZSB8fCBtX2RvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaXNVbmlxdWUo KSkKKyAgICBhdXRvJiBzZWN1cml0eU9yaWdpbiA9IG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4o KTsKKyAgICBpZiAoIWZyYW1lIHx8IHNlY3VyaXR5T3JpZ2luLmlzVW5pcXVlKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAg cmV0dXJuIHRydWU7CiAKLSAgICBhdXRvJiBzZWN1cml0eU9yaWdpbiA9IG1fZG9jdW1lbnQuc2Vj dXJpdHlPcmlnaW4oKTsKLSAgICBhdXRvJiB0b3BTZWN1cml0eU9yaWdpbiA9IG1fZG9jdW1lbnQu dG9wRG9jdW1lbnQoKS5zZWN1cml0eU9yaWdpbigpOwotICAgIGlmIChzZWN1cml0eU9yaWdpbi5l cXVhbCgmdG9wU2VjdXJpdHlPcmlnaW4pKQorICAgIGlmIChzZWN1cml0eU9yaWdpbi5lcXVhbCgm bV9kb2N1bWVudC50b3BPcmlnaW4oKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgYXV0 byogcGFnZSA9IGZyYW1lLT5wYWdlKCk7CkBAIC0xMjQsNyArMTIzLDcgQEAgdm9pZCBEb2N1bWVu dFN0b3JhZ2VBY2Nlc3M6Omhhc1N0b3JhZ2VBY2Nlc3MoUmVmPERlZmVycmVkUHJvbWlzZT4mJiBw cm9taXNlKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcGFnZS0+Y2hyb21lKCkuY2xp ZW50KCkuaGFzU3RvcmFnZUFjY2VzcyhSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRl RnJvbUhvc3QobV9kb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmhvc3QoKSksIFJlZ2lzdHJhYmxl RG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChtX2RvY3VtZW50LnRvcERvY3VtZW50KCku c2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkpLCAqZnJhbWUsIFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRy KCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChib29sIGhhc0FjY2Vzcykgewor ICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmhhc1N0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVE b21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4o KS5ob3N0KCkpLCBSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QobV9k b2N1bWVudC50b3BPcmlnaW4oKS5ob3N0KCkpLCAqZnJhbWUsIFt3ZWFrVGhpcyA9IG1ha2VXZWFr UHRyKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChib29sIGhhc0FjY2Vzcykg ewogICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xNTMs MTYgKzE1MiwxNCBAQCBzdGQ6Om9wdGlvbmFsPFN0b3JhZ2VBY2Nlc3NRdWlja1Jlc3VsdD4gRG9j dW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjYwogICAgIGlmIChmcmFtZSAmJiBo YXNGcmFtZVNwZWNpZmljU3RvcmFnZUFjY2VzcygpKQogICAgICAgICByZXR1cm4gU3RvcmFnZUFj Y2Vzc1F1aWNrUmVzdWx0OjpHcmFudDsKIAotICAgIGlmICghZnJhbWUgfHwgbV9kb2N1bWVudC5z ZWN1cml0eU9yaWdpbigpLmlzVW5pcXVlKCkgfHwgIWlzQWxsb3dlZFRvUmVxdWVzdFN0b3JhZ2VB Y2Nlc3MoKSkKKyAgICBhdXRvJiBzZWN1cml0eU9yaWdpbiA9IG1fZG9jdW1lbnQuc2VjdXJpdHlP cmlnaW4oKTsKKyAgICBpZiAoIWZyYW1lIHx8IHNlY3VyaXR5T3JpZ2luLmlzVW5pcXVlKCkgfHwg IWlzQWxsb3dlZFRvUmVxdWVzdFN0b3JhZ2VBY2Nlc3MoKSkKICAgICAgICAgcmV0dXJuIFN0b3Jh Z2VBY2Nlc3NRdWlja1Jlc3VsdDo6UmVqZWN0OwogCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFt ZSgpKQogICAgICAgICByZXR1cm4gU3RvcmFnZUFjY2Vzc1F1aWNrUmVzdWx0OjpHcmFudDsKIAot ICAgIGF1dG8mIHRvcERvY3VtZW50ID0gbV9kb2N1bWVudC50b3BEb2N1bWVudCgpOwotICAgIGF1 dG8mIHRvcFNlY3VyaXR5T3JpZ2luID0gdG9wRG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKTsKLSAg ICBhdXRvJiBzZWN1cml0eU9yaWdpbiA9IG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKTsKLSAg ICBpZiAoc2VjdXJpdHlPcmlnaW4uZXF1YWwoJnRvcFNlY3VyaXR5T3JpZ2luKSkKKyAgICBpZiAo c2VjdXJpdHlPcmlnaW4uZXF1YWwoJm1fZG9jdW1lbnQudG9wT3JpZ2luKCkpKQogICAgICAgICBy ZXR1cm4gU3RvcmFnZUFjY2Vzc1F1aWNrUmVzdWx0OjpHcmFudDsKIAogICAgIC8vIElmIHRoZXJl IGlzIGEgc2FuZGJveCwgaXQgaGFzIHRvIGFsbG93IHRoZSBzdG9yYWdlIGFjY2VzcyBBUEkgdG8g YmUgY2FsbGVkLgpAQCAtMjAyLDcgKzE5OSw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNz OjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAg ICAgaWYgKCFwYWdlLT5zZXR0aW5ncygpLnN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFi bGVkKCkpCiAgICAgICAgIG1fc3RvcmFnZUFjY2Vzc1Njb3BlID0gU3RvcmFnZUFjY2Vzc1Njb3Bl OjpQZXJGcmFtZTsKIAotICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnJlcXVlc3RTdG9yYWdl QWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChtX2RvY3Vt ZW50LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tl ZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wRG9jdW1lbnQoKS5zZWN1cml0eU9yaWdpbigp Lmhvc3QoKSksICpmcmFtZSwgbV9zdG9yYWdlQWNjZXNzU2NvcGUsIFt0aGlzLCB3ZWFrVGhpcyA9 IG1ha2VXZWFrUHRyKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChSZXF1ZXN0 U3RvcmFnZUFjY2Vzc1Jlc3VsdCByZXN1bHQpIG11dGFibGUgeworICAgIHBhZ2UtPmNocm9tZSgp LmNsaWVudCgpLnJlcXVlc3RTdG9yYWdlQWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNr ZWRDcmVhdGVGcm9tSG9zdChtX2RvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVn aXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wT3Jp Z2luKCkuaG9zdCgpKSwgKmZyYW1lLCBtX3N0b3JhZ2VBY2Nlc3NTY29wZSwgW3RoaXMsIHdlYWtU aGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0gKFJl cXVlc3RTdG9yYWdlQWNjZXNzUmVzdWx0IHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlmICgh d2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRl eCA5OThiMGExYjU3NjBiMGIxZjMxNzIxNTA5MTM0OGUxOWJkNTM3YWJlLi5lYWQ3MjY3YTY5ZTc3 ZjA5ODllZWExN2VkNGNlMzIzZjU4YTRmNWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0z MDk3LDcgKzMwOTcsNyBAQCB2b2lkIEVsZW1lbnQ6OmZvY3VzKGNvbnN0IEZvY3VzT3B0aW9ucyYg b3B0aW9ucykKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKSkgewogICAg ICAgICBhdXRvJiBmcmFtZSA9ICpkb2N1bWVudC0+ZnJhbWUoKTsKLSAgICAgICAgaWYgKCFmcmFt ZS5oYXNIYWRVc2VySW50ZXJhY3Rpb24oKSAmJiAhZnJhbWUuaXNNYWluRnJhbWUoKSAmJiAhZG9j dW1lbnQtPnRvcERvY3VtZW50KCkuc2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVPcmlnaW5Eb21haW4o ZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkpKQorICAgICAgICBpZiAoIWZyYW1lLmhhc0hhZFVz ZXJJbnRlcmFjdGlvbigpICYmICFmcmFtZS5pc01haW5GcmFtZSgpICYmICFkb2N1bWVudC0+dG9w T3JpZ2luKCkuaXNTYW1lT3JpZ2luRG9tYWluKGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpKSkK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBGb2N1c09wdGlvbnMgb3B0aW9uc1dpdGhW aXNpYmlsaXR5ID0gb3B0aW9uczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDk5YWM3ZDUyYjFkNDc4NmU4NjMxMDEz Y2NiMGU3ZTJhNjYzYWQ3ODYuLjEwNGJjYjg3MDgyOTgwNDM5ZDU4MzFhYTMyOWViNDk1Yjk0NjY3 MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcApAQCAtOTUwLDcgKzk1MCw3IEBAIFJlc291cmNlRXJyb3JPcjxDYWNoZWRS ZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1 CiAgICAgICAgICAgICBlbHNlIGlmIChhdXRvKiB0b3BEb2N1bWVudCA9IGZyYW1lLm1haW5GcmFt ZSgpLmRvY3VtZW50KCkpCiAgICAgICAgICAgICAgICAgc2FtZU9yaWdpblJlcXVlc3QgPSB0b3BE b2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVTY2hlbWVIb3N0UG9ydChyZXF1ZXN0ZWRP cmlnaW4uZ2V0KCkpOwogICAgICAgICB9IGVsc2UgaWYgKGRvY3VtZW50KCkpIHsKLSAgICAgICAg ICAgIHNhbWVPcmlnaW5SZXF1ZXN0ID0gZG9jdW1lbnQoKS0+dG9wRG9jdW1lbnQoKS5zZWN1cml0 eU9yaWdpbigpLmlzU2FtZVNjaGVtZUhvc3RQb3J0KHJlcXVlc3RlZE9yaWdpbi5nZXQoKSkKKyAg ICAgICAgICAgIHNhbWVPcmlnaW5SZXF1ZXN0ID0gZG9jdW1lbnQoKS0+dG9wT3JpZ2luKCkuaXNT YW1lU2NoZW1lSG9zdFBvcnQocmVxdWVzdGVkT3JpZ2luLmdldCgpKQogICAgICAgICAgICAgICAg ICYmIGRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCkuaXNTYW1lU2NoZW1lSG9zdFBvcnQocmVx dWVzdGVkT3JpZ2luLmdldCgpKTsKICAgICAgICAgfQogICAgICAgICBmb3IgKGF1dG8mIGZpZWxk cyA6IG1fZG9jdW1lbnRMb2FkZXItPmN1c3RvbUhlYWRlckZpZWxkcygpKSB7Cg==