203985 2019-11-07 16:50:34 -0800 Use ActiveDOMObject::queueTaskKeepingObjectAlive() in DOMCache 2019-11-07 18:36:17 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202843 1 cdumez cdumez commit-queue ggaren rniwa webkit-bug-importer youennf oldest_to_newest 1588496 0 cdumez 2019-11-07 16:50:34 -0800 Use ActiveDOMObject::queueTaskKeepingObjectAlive() in DOMCache and drop DOMCache::enqueueTask(). 1588500 1 383092 cdumez 2019-11-07 16:53:50 -0800 Created attachment 383092 Patch 1588536 2 383092 commit-queue 2019-11-07 18:35:39 -0800 Comment on attachment 383092 Patch Clearing flags on attachment: 383092 Committed r252227: <https://trac.webkit.org/changeset/252227> 1588537 3 commit-queue 2019-11-07 18:35:41 -0800 All reviewed patches have been landed. Closing bug. 1588538 4 webkit-bug-importer 2019-11-07 18:36:17 -0800 <rdar://problem/57007807> 383092 2019-11-07 16:53:50 -0800 2019-11-07 18:35:39 -0800 Patch bug-203985-20191107165349.patch text/plain 9374 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU1ZjNlZDkxY2E3MTA4 M2YwMjBhYmNjZjZkMzUzOTAwMjIxNGFmYy4uNjIyMmVjNmZlZjhkMTJhMTg3ZjE4NTllOTg0NzI3 MGI1M2FjOWZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTExLTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEFjdGl2ZURPTU9iamVj dDo6cXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCkgaW4gRE9NQ2FjaGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzk4NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBBY3RpdmVET01PYmplY3Q6 OnF1ZXVlVGFza0tlZXBpbmdPYmplY3RBbGl2ZSgpIGluIERPTUNhY2hlIGFuZCBkcm9wIERPTUNh Y2hlOjplbnF1ZXVlVGFzaygpLgorCisgICAgICAgICogTW9kdWxlcy9jYWNoZS9ET01DYWNoZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpET01DYWNoZTo6bWF0Y2gpOgorICAgICAgICAoV2ViQ29y ZTo6RE9NQ2FjaGU6Om1hdGNoQWxsKToKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlOjphZGRB bGwpOgorICAgICAgICAoV2ViQ29yZTo6RE9NQ2FjaGU6OnB1dFdpdGhSZXNwb25zZURhdGEpOgor ICAgICAgICAoV2ViQ29yZTo6RE9NQ2FjaGU6OnB1dCk6CisgICAgICAgIChXZWJDb3JlOjpET01D YWNoZTo6cmVtb3ZlKToKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlOjprZXlzKToKKyAgICAg ICAgKFdlYkNvcmU6OkRPTUNhY2hlOjplbnF1ZXVlVGFzayk6IERlbGV0ZWQuCisgICAgICAgICog TW9kdWxlcy9jYWNoZS9ET01DYWNoZS5oOgorCiAyMDE5LTExLTA3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUG9ydCBXb3JrZXIgdG8gdGhlIEhUTUw1IGV2ZW50 IGxvb3AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZS5jcHAKaW5kZXggZTIw NzE5YzNlNGFmNjQxYWQwYzIyYzliNzBmYmE2YTU5YmE0MjU3NC4uOTZmZTczZWNiZmMzNzA3YjIy ODE4ZGRiOTc3Y2EyMzMxMTc4MzM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9jYWNoZS9ET01DYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9E T01DYWNoZS5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgRE9NQ2FjaGU6On5ET01DYWNoZSgpCiB2b2lk IERPTUNhY2hlOjptYXRjaChSZXF1ZXN0SW5mbyYmIGluZm8sIENhY2hlUXVlcnlPcHRpb25zJiYg b3B0aW9ucywgUmVmPERlZmVycmVkUHJvbWlzZT4mJiBwcm9taXNlKQogewogICAgIGRvTWF0Y2go V1RGTW92ZShpbmZvKSwgV1RGTW92ZShvcHRpb25zKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldKEV4Y2VwdGlvbk9yPFJl ZlB0cjxGZXRjaFJlc3BvbnNlPj4mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBlbnF1ZXVl VGFzayhbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0 KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlz LCBUYXNrU291cmNlOjpET01NYW5pcHVsYXRpb24sIFtwcm9taXNlID0gV1RGTW92ZShwcm9taXNl KSwgcmVzdWx0ID0gV1RGTW92ZShyZXN1bHQpXSgpIG11dGFibGUgewogICAgICAgICAgICAgaWYg KHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewogICAgICAgICAgICAgICAgIHByb21pc2UtPnJlamVj dChyZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CkBA IC0xMjMsNyArMTIzLDcgQEAgdm9pZCBET01DYWNoZTo6bWF0Y2hBbGwoT3B0aW9uYWw8UmVxdWVz dEluZm8+JiYgaW5mbywgQ2FjaGVRdWVyeU9wdGlvbnMmJiBvcHRpb24KIAogICAgIGlmICghcmVx dWVzdCkgewogICAgICAgICByZXRyaWV2ZVJlY29yZHMoVVJMIHsgfSwgW3RoaXMsIHByb21pc2Ug PSBXVEZNb3ZlKHByb21pc2UpXShPcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSBtdXRh YmxlIHsKLSAgICAgICAgICAgIGVucXVldWVUYXNrKFt0aGlzLCBwcm9taXNlID0gV1RGTW92ZShw cm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgeworICAg ICAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlzLCBUYXNrU291cmNlOjpE T01NYW5pcHVsYXRpb24sIFt0aGlzLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgZXhjZXB0 aW9uID0gV1RGTW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIGlm IChleGNlcHRpb24pIHsKICAgICAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoV1RGTW92 ZShleGNlcHRpb24udmFsdWUoKSkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0x MzQsNyArMTM0LDcgQEAgdm9pZCBET01DYWNoZTo6bWF0Y2hBbGwoT3B0aW9uYWw8UmVxdWVzdElu Zm8+JiYgaW5mbywgQ2FjaGVRdWVyeU9wdGlvbnMmJiBvcHRpb24KICAgICAgICAgcmV0dXJuOwog ICAgIH0KICAgICBxdWVyeUNhY2hlKHJlcXVlc3QucmVsZWFzZU5vbk51bGwoKSwgV1RGTW92ZShv cHRpb25zKSwgW3RoaXMsIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXShFeGNlcHRpb25PcjxW ZWN0b3I8Q2FjaGVTdG9yYWdlUmVjb3JkPj4mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBl bnF1ZXVlVGFzayhbdGhpcywgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlc3VsdCA9IFdU Rk1vdmUocmVzdWx0KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVj dEFsaXZlKCp0aGlzLCBUYXNrU291cmNlOjpET01NYW5pcHVsYXRpb24sIFt0aGlzLCBwcm9taXNl ID0gV1RGTW92ZShwcm9taXNlKSwgcmVzdWx0ID0gV1RGTW92ZShyZXN1bHQpXSgpIG11dGFibGUg ewogICAgICAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewogICAgICAgICAgICAg ICAgIHByb21pc2UucmVqZWN0KHJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCkpOwogICAgICAgICAg ICAgICAgIHJldHVybjsKQEAgLTI0MiwxMyArMjQyLDEzIEBAIHZvaWQgRE9NQ2FjaGU6OmFkZEFs bChWZWN0b3I8UmVxdWVzdEluZm8+JiYgaW5mb3MsIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYm IHByCiAKICAgICBhdXRvIHRhc2tIYW5kbGVyID0gRmV0Y2hUYXNrc0hhbmRsZXI6OmNyZWF0ZSgq dGhpcywgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdU Rk1vdmUocHJvbWlzZSldKEV4Y2VwdGlvbk9yPFZlY3RvcjxSZWNvcmQ+PiYmIHJlc3VsdCkgbXV0 YWJsZSB7CiAgICAgICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpIHsKLSAgICAgICAgICAg IGVucXVldWVUYXNrKFtwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgZXhjZXB0aW9uID0gcmVz dWx0LnJlbGVhc2VFeGNlcHRpb24oKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIHF1ZXVlVGFz a0tlZXBpbmdPYmplY3RBbGl2ZSgqdGhpcywgVGFza1NvdXJjZTo6RE9NTWFuaXB1bGF0aW9uLCBb cHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGV4Y2VwdGlvbiA9IHJlc3VsdC5yZWxlYXNlRXhj ZXB0aW9uKCldKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoV1RG TW92ZShleGNlcHRpb24pKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAgICAgICAgIGJhdGNoUHV0T3BlcmF0aW9uKHJlc3VsdC5yZWxlYXNlUmV0dXJu VmFsdWUoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBw cm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0oRXhjZXB0aW9uT3I8dm9pZD4mJiByZXN1bHQpIG11 dGFibGUgewotICAgICAgICAgICAgZW5xdWV1ZVRhc2soW3Byb21pc2UgPSBXVEZNb3ZlKHByb21p c2UpLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBx dWV1ZVRhc2tLZWVwaW5nT2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6OkRPTU1hbmlwdWxh dGlvbiwgW3Byb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3Vs dCldKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgcHJvbWlzZS5zZXR0bGUoV1RGTW92ZShy ZXN1bHQpKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKQEAgLTMxMyw3ICszMTMsNyBA QCB2b2lkIERPTUNhY2hlOjphZGRBbGwoVmVjdG9yPFJlcXVlc3RJbmZvPiYmIGluZm9zLCBET01Q cm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcgogdm9pZCBET01DYWNoZTo6cHV0V2l0aFJlc3BvbnNl RGF0YShET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcm9taXNlLCBSZWY8RmV0Y2hSZXF1ZXN0 PiYmIHJlcXVlc3QsIFJlZjxGZXRjaFJlc3BvbnNlPiYmIHJlc3BvbnNlLCBFeGNlcHRpb25PcjxS ZWZQdHI8U2hhcmVkQnVmZmVyPj4mJiByZXNwb25zZUJvZHkpCiB7CiAgICAgaWYgKHJlc3BvbnNl Qm9keS5oYXNFeGNlcHRpb24oKSkgewotICAgICAgICBlbnF1ZXVlVGFzayhbcHJvbWlzZSA9IFdU Rk1vdmUocHJvbWlzZSksIGV4Y2VwdGlvbiA9IHJlc3BvbnNlQm9keS5yZWxlYXNlRXhjZXB0aW9u KCldKCkgbXV0YWJsZSB7CisgICAgICAgIHF1ZXVlVGFza0tlZXBpbmdPYmplY3RBbGl2ZSgqdGhp cywgVGFza1NvdXJjZTo6RE9NTWFuaXB1bGF0aW9uLCBbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlz ZSksIGV4Y2VwdGlvbiA9IHJlc3BvbnNlQm9keS5yZWxlYXNlRXhjZXB0aW9uKCldKCkgbXV0YWJs ZSB7CiAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChXVEZNb3ZlKGV4Y2VwdGlvbikpOwogICAg ICAgICB9KTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzIzLDcgKzMyMyw3IEBAIHZvaWQgRE9NQ2Fj aGU6OnB1dFdpdGhSZXNwb25zZURhdGEoRE9NUHJvbWlzZURlZmVycmVkPHZvaWQ+JiYgcHJvbWlz ZSwgUmVmPEZldGNoCiAgICAgaWYgKGF1dG8gYnVmZmVyID0gcmVzcG9uc2VCb2R5LnJlbGVhc2VS ZXR1cm5WYWx1ZSgpKQogICAgICAgICBib2R5ID0gYnVmZmVyLnJlbGVhc2VOb25OdWxsKCk7CiAg ICAgYmF0Y2hQdXRPcGVyYXRpb24ocmVxdWVzdC5nZXQoKSwgcmVzcG9uc2UuZ2V0KCksIFdURk1v dmUoYm9keSksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByb21pc2Ug PSBXVEZNb3ZlKHByb21pc2UpXShFeGNlcHRpb25Pcjx2b2lkPiYmIHJlc3VsdCkgbXV0YWJsZSB7 Ci0gICAgICAgIGVucXVldWVUYXNrKFtwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgcmVzdWx0 ID0gV1RGTW92ZShyZXN1bHQpXSgpIG11dGFibGUgeworICAgICAgICBxdWV1ZVRhc2tLZWVwaW5n T2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6OkRPTU1hbmlwdWxhdGlvbiwgW3Byb21pc2Ug PSBXVEZNb3ZlKHByb21pc2UpLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCldKCkgbXV0YWJsZSB7 CiAgICAgICAgICAgICBwcm9taXNlLnNldHRsZShXVEZNb3ZlKHJlc3VsdCkpOwogICAgICAgICB9 KTsKICAgICB9KTsKQEAgLTM4OSw3ICszODksNyBAQCB2b2lkIERPTUNhY2hlOjpwdXQoUmVxdWVz dEluZm8mJiBpbmZvLCBSZWY8RmV0Y2hSZXNwb25zZT4mJiByZXNwb25zZSwgRE9NUHJvbWlzZQog ICAgIH0KIAogICAgIGJhdGNoUHV0T3BlcmF0aW9uKHJlcXVlc3QuZ2V0KCksIHJlc3BvbnNlLmdl dCgpLCByZXNwb25zZS0+Y29uc3VtZUJvZHkoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldKEV4Y2VwdGlvbk9yPHZvaWQ+ JiYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgZW5xdWV1ZVRhc2soW3Byb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCldKCkgbXV0YWJsZSB7CisgICAg ICAgIHF1ZXVlVGFza0tlZXBpbmdPYmplY3RBbGl2ZSgqdGhpcywgVGFza1NvdXJjZTo6RE9NTWFu aXB1bGF0aW9uLCBbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlc3VsdCA9IFdURk1vdmUo cmVzdWx0KV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHByb21pc2Uuc2V0dGxlKFdURk1vdmUo cmVzdWx0KSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtNDA3LDcgKzQwNyw3IEBAIHZvaWQg RE9NQ2FjaGU6OnJlbW92ZShSZXF1ZXN0SW5mbyYmIGluZm8sIENhY2hlUXVlcnlPcHRpb25zJiYg b3B0aW9ucywgRE9NUHJvbWlzCiAgICAgfQogCiAgICAgYmF0Y2hEZWxldGVPcGVyYXRpb24ocmVx dWVzdE9yRXhjZXB0aW9uLnJlbGVhc2VSZXR1cm5WYWx1ZSgpLCBXVEZNb3ZlKG9wdGlvbnMpLCBb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShw cm9taXNlKV0oRXhjZXB0aW9uT3I8Ym9vbD4mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBl bnF1ZXVlVGFzayhbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlc3VsdCA9IFdURk1vdmUo cmVzdWx0KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZl KCp0aGlzLCBUYXNrU291cmNlOjpET01NYW5pcHVsYXRpb24sIFtwcm9taXNlID0gV1RGTW92ZShw cm9taXNlKSwgcmVzdWx0ID0gV1RGTW92ZShyZXN1bHQpXSgpIG11dGFibGUgewogICAgICAgICAg ICAgcHJvbWlzZS5zZXR0bGUoV1RGTW92ZShyZXN1bHQpKTsKICAgICAgICAgfSk7CiAgICAgfSk7 CkBAIC00MzUsNyArNDM1LDcgQEAgdm9pZCBET01DYWNoZTo6a2V5cyhPcHRpb25hbDxSZXF1ZXN0 SW5mbz4mJiBpbmZvLCBDYWNoZVF1ZXJ5T3B0aW9ucyYmIG9wdGlvbnMsIEsKIAogICAgIGlmICgh cmVxdWVzdCkgewogICAgICAgICByZXRyaWV2ZVJlY29yZHMoVVJMIHsgfSwgW3RoaXMsIHByb21p c2UgPSBXVEZNb3ZlKHByb21pc2UpXShPcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSBt dXRhYmxlIHsKLSAgICAgICAgICAgIGVucXVldWVUYXNrKFt0aGlzLCBwcm9taXNlID0gV1RGTW92 ZShwcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgewor ICAgICAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlzLCBUYXNrU291cmNl OjpET01NYW5pcHVsYXRpb24sIFt0aGlzLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgZXhj ZXB0aW9uID0gV1RGTW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgewogICAgICAgICAgICAgICAg IGlmIChleGNlcHRpb24pIHsKICAgICAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoV1RG TW92ZShleGNlcHRpb24udmFsdWUoKSkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CkBA IC00NDcsNyArNDQ3LDcgQEAgdm9pZCBET01DYWNoZTo6a2V5cyhPcHRpb25hbDxSZXF1ZXN0SW5m bz4mJiBpbmZvLCBDYWNoZVF1ZXJ5T3B0aW9ucyYmIG9wdGlvbnMsIEsKICAgICB9CiAKICAgICBx dWVyeUNhY2hlKHJlcXVlc3QucmVsZWFzZU5vbk51bGwoKSwgV1RGTW92ZShvcHRpb25zKSwgW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJv bWlzZSldKGF1dG8mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBlbnF1ZXVlVGFzayhbcHJv bWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0oKSBtdXRh YmxlIHsKKyAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlzLCBUYXNrU291 cmNlOjpET01NYW5pcHVsYXRpb24sIFtwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgcmVzdWx0 ID0gV1RGTW92ZShyZXN1bHQpXSgpIG11dGFibGUgewogICAgICAgICAgICAgaWYgKHJlc3VsdC5o YXNFeGNlcHRpb24oKSkgewogICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KHJlc3VsdC5y ZWxlYXNlRXhjZXB0aW9uKCkpOwogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTYwNywxNCAr NjA3LDQgQEAgY29uc3QgY2hhciogRE9NQ2FjaGU6OmFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25z dAogICAgIHJldHVybiAiQ2FjaGUiOwogfQogCi12b2lkIERPTUNhY2hlOjplbnF1ZXVlVGFzayhG dW5jdGlvbjx2b2lkKCk+JiYgdGFzaykKLXsKLSAgICBhdXRvKiBjb250ZXh0ID0gc2NyaXB0RXhl Y3V0aW9uQ29udGV4dCgpOwotICAgIGlmICghY29udGV4dCkKLSAgICAgICAgcmV0dXJuOwotICAg IGNvbnRleHQtPmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpET01NYW5pcHVsYXRp b24sICpjb250ZXh0LCBbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwZW5kaW5nQWN0 aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKSwgdGFzayA9IFdURk1vdmUodGFzayld IHsKLSAgICAgICAgdGFzaygpOwotICAgIH0pOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0RPTUNhY2hlLmggYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0RPTUNhY2hlLmgKaW5kZXggMDk5MWI5MzBiMjg4 MjJiZTljYjUzYmQ4ZDQyMGViM2I4NTc1MDk3NC4uYTZlZDIyNzY3ZWNiY2ExMmQzNzdlOTE3OTRh NzNjYWIxMTRhN2NhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9E T01DYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGUuaApA QCAtODQsOCArODQsNiBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxSZWY8RmV0Y2hSZXNwb25zZT4+ IGNsb25lUmVzcG9uc2VzKGNvbnN0IFZlY3RvcjxDYWNoZVN0b3JhZ2VSZWNvcmQ+Jik7CiAgICAg RE9NQ2FjaGVFbmdpbmU6OlJlY29yZCB0b0Nvbm5lY3Rpb25SZWNvcmQoY29uc3QgRmV0Y2hSZXF1 ZXN0JiwgRmV0Y2hSZXNwb25zZSYsIERPTUNhY2hlRW5naW5lOjpSZXNwb25zZUJvZHkmJik7CiAK LSAgICB2b2lkIGVucXVldWVUYXNrKEZ1bmN0aW9uPHZvaWQoKT4mJik7Ci0KICAgICBTdHJpbmcg bV9uYW1lOwogICAgIHVpbnQ2NF90IG1faWRlbnRpZmllcjsKICAgICBSZWY8Q2FjaGVTdG9yYWdl Q29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwo=