196034 2019-03-20 14:43:47 -0700 Use WeakPtr instead of storing raw pointers in WebSocket code 2019-03-20 16:31:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ggaren webkit-bug-importer oldest_to_newest 1519194 0 achristensen 2019-03-20 14:43:47 -0700 Use WeakPtr instead of storing raw pointers in WebSocket code 1519198 1 365404 achristensen 2019-03-20 14:45:20 -0700 Created attachment 365404 Patch 1519268 2 365404 ggaren 2019-03-20 16:02:28 -0700 Comment on attachment 365404 Patch r=me 1519274 3 365404 cdumez 2019-03-20 16:08:46 -0700 Comment on attachment 365404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365404&action=review > Source/WebCore/Modules/websockets/WebSocketHandshake.cpp:126 > + , m_document(document ? makeWeakPtr(*document) : nullptr) eh.. we have a makeWeakPtr() which takes in a raw pointer and does this for you. 1519292 4 achristensen 2019-03-20 16:30:23 -0700 Fixed! https://trac.webkit.org/changeset/243252/webkit 1519293 5 webkit-bug-importer 2019-03-20 16:31:18 -0700 <rdar://problem/49084881> 365404 2019-03-20 14:45:20 -0700 2019-03-20 16:08:46 -0700 Patch bug-196034-20190320144519.patch text/plain 10770 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MzI0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTIwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIFdlYWtQ dHIgaW5zdGVhZCBvZiBzdG9yaW5nIHJhdyBwb2ludGVycyBpbiBXZWJTb2NrZXQgY29kZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2MDM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjb3VsZCBw cmV2ZW50IHVzaW5nIGZyZWVkIG1lbW9yeSBpZiB3ZSBmb3JnZXQgdG8gcmVzZXQgYSBwb2ludGVy IHNvbWV3aGVyZS4KKworICAgICAgICAqIE1vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFu bmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENo YW5uZWwpOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6Y29ubmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpmYWlsKToKKyAgICAgICAgKFdlYkNv cmU6OldlYlNvY2tldENoYW5uZWw6OmRpc2Nvbm5lY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2Vi U29ja2V0Q2hhbm5lbDo6ZGlkT3BlblNvY2tldFN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpX ZWJTb2NrZXRDaGFubmVsOjpkaWRDbG9zZVNvY2tldFN0cmVhbSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKToKKyAgICAgICAgKFdlYkNv cmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6 V2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0ZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNv Y2tldENoYW5uZWw6OnByb2Nlc3NPdXRnb2luZ0ZyYW1lUXVldWUpOgorICAgICAgICAoV2ViQ29y ZTo6V2ViU29ja2V0Q2hhbm5lbDo6c2VuZEZyYW1lKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oOgorICAgICAgICAqIE1vZHVsZXMvd2Vic29ja2V0cy9X ZWJTb2NrZXRDaGFubmVsQ2xpZW50Lmg6CisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dl YlNvY2tldEhhbmRzaGFrZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRIYW5kc2hh a2U6OldlYlNvY2tldEhhbmRzaGFrZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dl YlNvY2tldEhhbmRzaGFrZS5oOgorCiAyMDE5LTAzLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MgT01dIFN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVBy b3BlcnR5TWFwIGNyZWF0ZXMgYSBSZWYgY3ljbGUgd2l0aCBpdHMgb3duZXIgZWxlbWVudApJbmRl eDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2Nr ZXRDaGFubmVsLmNwcAkocmV2aXNpb24gMjQzMTgwKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Myw4 ICs2Myw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNvbnN0IFNlY29uZHMgVENQTWF4aW11bVNl Z21lbnRMaWZldGltZSB7IDJfbWluIH07CiAKIFdlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENo YW5uZWwoRG9jdW1lbnQmIGRvY3VtZW50LCBXZWJTb2NrZXRDaGFubmVsQ2xpZW50JiBjbGllbnQs IFNvY2tldFByb3ZpZGVyJiBwcm92aWRlcikKLSAgICA6IG1fZG9jdW1lbnQoJmRvY3VtZW50KQot ICAgICwgbV9jbGllbnQoJmNsaWVudCkKKyAgICA6IG1fZG9jdW1lbnQobWFrZVdlYWtQdHIoZG9j dW1lbnQpKQorICAgICwgbV9jbGllbnQobWFrZVdlYWtQdHIoY2xpZW50KSkKICAgICAsIG1fcmVz dW1lVGltZXIoKnRoaXMsICZXZWJTb2NrZXRDaGFubmVsOjpyZXN1bWVUaW1lckZpcmVkKQogICAg ICwgbV9jbG9zaW5nVGltZXIoKnRoaXMsICZXZWJTb2NrZXRDaGFubmVsOjpjbG9zaW5nVGltZXJG aXJlZCkKICAgICAsIG1fc29ja2V0UHJvdmlkZXIocHJvdmlkZXIpCkBAIC0xMTIsMTIgKzExMiwx MiBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmNvbm5lY3QoY29uc3QgVVJMCiAgICAgCiAgICAg QVNTRVJUKCFtX2hhbmRsZSk7CiAgICAgQVNTRVJUKCFtX3N1c3BlbmRlZCk7Ci0gICAgbV9oYW5k c2hha2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYlNvY2tldEhhbmRzaGFrZT4odXJsLCBwcm90b2Nv bCwgbV9kb2N1bWVudCwgYWxsb3dDb29raWVzKTsKKyAgICBtX2hhbmRzaGFrZSA9IHN0ZDo6bWFr ZV91bmlxdWU8V2ViU29ja2V0SGFuZHNoYWtlPih1cmwsIHByb3RvY29sLCBtX2RvY3VtZW50Lmdl dCgpLCBhbGxvd0Nvb2tpZXMpOwogICAgIG1faGFuZHNoYWtlLT5yZXNldCgpOwogICAgIGlmICht X2RlZmxhdGVGcmFtZXIuY2FuRGVmbGF0ZSgpKQogICAgICAgICBtX2hhbmRzaGFrZS0+YWRkRXh0 ZW5zaW9uUHJvY2Vzc29yKG1fZGVmbGF0ZUZyYW1lci5jcmVhdGVFeHRlbnNpb25Qcm9jZXNzb3Io KSk7CiAgICAgaWYgKG1faWRlbnRpZmllcikKLSAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRDcmVhdGVXZWJTb2NrZXQobV9kb2N1bWVudCwgbV9pZGVudGlmaWVyLCB1cmwpOwor ICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNvY2tldChtX2Rv Y3VtZW50LmdldCgpLCBtX2lkZW50aWZpZXIsIHVybCk7CiAKICAgICBpZiAoRnJhbWUqIGZyYW1l ID0gbV9kb2N1bWVudC0+ZnJhbWUoKSkgewogICAgICAgICByZWYoKTsKQEAgLTIxNCw3ICsyMTQs NyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmZhaWwoY29uc3QgU3RyaW5nCiAgICAgTE9HKE5l dHdvcmssICJXZWJTb2NrZXRDaGFubmVsICVwIGZhaWwoKSByZWFzb249JyVzJyIsIHRoaXMsIHJl YXNvbi51dGY4KCkuZGF0YSgpKTsKICAgICBBU1NFUlQoIW1fc3VzcGVuZGVkKTsKICAgICBpZiAo bV9kb2N1bWVudCkgewotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2Vp dmVXZWJTb2NrZXRGcmFtZUVycm9yKG1fZG9jdW1lbnQsIG1faWRlbnRpZmllciwgcmVhc29uKTsK KyAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0RnJh bWVFcnJvcihtX2RvY3VtZW50LmdldCgpLCBtX2lkZW50aWZpZXIsIHJlYXNvbik7CiAKICAgICAg ICAgU3RyaW5nIGNvbnNvbGVNZXNzYWdlOwogICAgICAgICBpZiAobV9oYW5kc2hha2UpCkBAIC0y NDUsNyArMjQ1LDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaXNjb25uZWN0KCkKIHsKICAg ICBMT0coTmV0d29yaywgIldlYlNvY2tldENoYW5uZWwgJXAgZGlzY29ubmVjdCgpIiwgdGhpcyk7 CiAgICAgaWYgKG1faWRlbnRpZmllciAmJiBtX2RvY3VtZW50KQotICAgICAgICBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmRpZENsb3NlV2ViU29ja2V0KG1fZG9jdW1lbnQsIG1faWRlbnRpZmll cik7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ2xvc2VXZWJTb2NrZXQo bV9kb2N1bWVudC5nZXQoKSwgbV9pZGVudGlmaWVyKTsKICAgICBpZiAobV9oYW5kc2hha2UpCiAg ICAgICAgIG1faGFuZHNoYWtlLT5jbGVhckRvY3VtZW50KCk7CiAgICAgbV9jbGllbnQgPSBudWxs cHRyOwpAQCAtMjczLDcgKzI3Myw3IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkT3BlblNv Y2tldFN0cmUKICAgICBpZiAoIW1fZG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAo bV9pZGVudGlmaWVyICYmIFVOTElLRUxZKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6aGFzRnJv bnRlbmRzKCkpKQotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxTZW5kV2Vi U29ja2V0SGFuZHNoYWtlUmVxdWVzdChtX2RvY3VtZW50LCBtX2lkZW50aWZpZXIsIG1faGFuZHNo YWtlLT5jbGllbnRIYW5kc2hha2VSZXF1ZXN0KCkpOworICAgICAgICBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdChtX2RvY3VtZW50Lmdl dCgpLCBtX2lkZW50aWZpZXIsIG1faGFuZHNoYWtlLT5jbGllbnRIYW5kc2hha2VSZXF1ZXN0KCkp OwogICAgIGF1dG8gaGFuZHNoYWtlTWVzc2FnZSA9IG1faGFuZHNoYWtlLT5jbGllbnRIYW5kc2hh a2VNZXNzYWdlKCk7CiAgICAgYXV0byBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eSA9IG1f aGFuZHNoYWtlLT5jbGllbnRIYW5kc2hha2VDb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eSgp OwogICAgIGhhbmRsZS5zZW5kSGFuZHNoYWtlKFdURk1vdmUoaGFuZHNoYWtlTWVzc2FnZSksIFdU Rk1vdmUoY29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHkpLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpXSAoYm9vbCBzdWNjZXNzLCBib29sIGRpZEFjY2Vzc1NlY3VyZUNv b2tpZXMpIHsKQEAgLTI4OSw3ICsyODksNyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZENs b3NlU29ja2V0U3RyCiB7CiAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXRDaGFubmVsICVwIGRp ZENsb3NlU29ja2V0U3RyZWFtKCkiLCB0aGlzKTsKICAgICBpZiAobV9pZGVudGlmaWVyICYmIG1f ZG9jdW1lbnQpCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ2xvc2VXZWJT b2NrZXQobV9kb2N1bWVudCwgbV9pZGVudGlmaWVyKTsKKyAgICAgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRDbG9zZVdlYlNvY2tldChtX2RvY3VtZW50LmdldCgpLCBtX2lkZW50aWZp ZXIpOwogICAgIEFTU0VSVF9VTlVTRUQoaGFuZGxlLCAmaGFuZGxlID09IG1faGFuZGxlIHx8ICFt X2hhbmRsZSk7CiAgICAgbV9jbG9zZWQgPSB0cnVlOwogICAgIGlmIChtX2Nsb3NpbmdUaW1lci5p c0FjdGl2ZSgpKQpAQCAtMzAwLDcgKzMwMCw3IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlk Q2xvc2VTb2NrZXRTdHIKICAgICAgICAgbV91bmhhbmRsZWRCdWZmZXJlZEFtb3VudCA9IG1faGFu ZGxlLT5idWZmZXJlZEFtb3VudCgpOwogICAgICAgICBpZiAobV9zdXNwZW5kZWQpCiAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIFdlYlNvY2tldENoYW5uZWxDbGllbnQqIGNsaWVudCA9IG1f Y2xpZW50OworICAgICAgICBXZWJTb2NrZXRDaGFubmVsQ2xpZW50KiBjbGllbnQgPSBtX2NsaWVu dC5nZXQoKTsKICAgICAgICAgbV9jbGllbnQgPSBudWxscHRyOwogICAgICAgICBtX2RvY3VtZW50 ID0gbnVsbHB0cjsKICAgICAgICAgbV9oYW5kbGUgPSBudWxscHRyOwpAQCAtMzYzLDcgKzM2Myw3 IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkRmFpbFNvY2tldFN0cmUKICAgICAgICAgICAg IG1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJXZWJTb2NrZXQgbmV0d29yayBlcnJvcjogZXJyb3IgY29k ZSAiLCBlcnJvci5lcnJvckNvZGUoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1lc3Nh Z2UgPSAiV2ViU29ja2V0IG5ldHdvcmsgZXJyb3I6ICIgKyBlcnJvci5sb2NhbGl6ZWREZXNjcmlw dGlvbigpOwotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVXZWJT b2NrZXRGcmFtZUVycm9yKG1fZG9jdW1lbnQsIG1faWRlbnRpZmllciwgbWVzc2FnZSk7CisgICAg ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEZyYW1lRXJy b3IobV9kb2N1bWVudC5nZXQoKSwgbV9pZGVudGlmaWVyLCBtZXNzYWdlKTsKICAgICAgICAgbV9k b2N1bWVudC0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6TmV0d29yaywgTWVzc2Fn ZUxldmVsOjpFcnJvciwgbWVzc2FnZSk7CiAgICAgfQogICAgIG1fc2hvdWxkRGlzY2FyZFJlY2Vp dmVkRGF0YSA9IHRydWU7CkBAIC00NDgsNyArNDQ4LDcgQEAgYm9vbCBXZWJTb2NrZXRDaGFubmVs Ojpwcm9jZXNzQnVmZmVyKCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYg KG1faGFuZHNoYWtlLT5tb2RlKCkgPT0gV2ViU29ja2V0SGFuZHNoYWtlOjpDb25uZWN0ZWQpIHsK ICAgICAgICAgICAgIGlmIChtX2lkZW50aWZpZXIpCi0gICAgICAgICAgICAgICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UobV9k b2N1bWVudCwgbV9pZGVudGlmaWVyLCBtX2hhbmRzaGFrZS0+c2VydmVySGFuZHNoYWtlUmVzcG9u c2UoKSk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNl aXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UobV9kb2N1bWVudC5nZXQoKSwgbV9pZGVudGlm aWVyLCBtX2hhbmRzaGFrZS0+c2VydmVySGFuZHNoYWtlUmVzcG9uc2UoKSk7CiAgICAgICAgICAg ICBTdHJpbmcgc2VydmVyU2V0Q29va2llID0gbV9oYW5kc2hha2UtPnNlcnZlclNldENvb2tpZSgp OwogICAgICAgICAgICAgaWYgKCFzZXJ2ZXJTZXRDb29raWUuaXNFbXB0eSgpKSB7CiAgICAgICAg ICAgICAgICAgaWYgKG1fZG9jdW1lbnQgJiYgbV9kb2N1bWVudC0+cGFnZSgpICYmIG1fZG9jdW1l bnQtPnBhZ2UoKS0+Y29va2llSmFyKCkuY29va2llc0VuYWJsZWQoKm1fZG9jdW1lbnQpKQpAQCAt NTgyLDcgKzU4Miw3IEBAIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0ZyYW1lKCkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEZyYW1lKG1fZG9jdW1lbnQsIG1faWRlbnRpZmllciwgZnJh bWUpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEZy YW1lKG1fZG9jdW1lbnQuZ2V0KCksIG1faWRlbnRpZmllciwgZnJhbWUpOwogCiAgICAgc3dpdGNo IChmcmFtZS5vcENvZGUpIHsKICAgICBjYXNlIFdlYlNvY2tldEZyYW1lOjpPcENvZGVDb250aW51 YXRpb246CkBAIC03NjgsNyArNzY4LDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpwcm9jZXNz T3V0Z29pbmdGcgogICAgICAgICAgICAgICAgIEFTU0VSVChmcmFtZS0+YmxvYkRhdGEpOwogICAg ICAgICAgICAgICAgIG1fYmxvYkxvYWRlciA9IHN0ZDo6bWFrZV91bmlxdWU8RmlsZVJlYWRlckxv YWRlcj4oRmlsZVJlYWRlckxvYWRlcjo6UmVhZEFzQXJyYXlCdWZmZXIsIHRoaXMpOwogICAgICAg ICAgICAgICAgIG1fYmxvYkxvYWRlclN0YXR1cyA9IEJsb2JMb2FkZXJTdGFydGVkOwotICAgICAg ICAgICAgICAgIG1fYmxvYkxvYWRlci0+c3RhcnQobV9kb2N1bWVudCwgKmZyYW1lLT5ibG9iRGF0 YSk7CisgICAgICAgICAgICAgICAgbV9ibG9iTG9hZGVyLT5zdGFydChtX2RvY3VtZW50LmdldCgp LCAqZnJhbWUtPmJsb2JEYXRhKTsKICAgICAgICAgICAgICAgICBtX291dGdvaW5nRnJhbWVRdWV1 ZS5wcmVwZW5kKFdURk1vdmUoZnJhbWUpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAg LTgyMCw3ICs4MjAsNyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OnNlbmRGcmFtZShXZWJTb2Nr CiAgICAgQVNTRVJUKCFtX3N1c3BlbmRlZCk7CiAKICAgICBXZWJTb2NrZXRGcmFtZSBmcmFtZShv cENvZGUsIHRydWUsIGZhbHNlLCB0cnVlLCBkYXRhLCBkYXRhTGVuZ3RoKTsKLSAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZFNlbmRXZWJTb2NrZXRGcmFtZShtX2RvY3VtZW50LCBtX2lk ZW50aWZpZXIsIGZyYW1lKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFNlbmRX ZWJTb2NrZXRGcmFtZShtX2RvY3VtZW50LmdldCgpLCBtX2lkZW50aWZpZXIsIGZyYW1lKTsKIAog ICAgIGF1dG8gZGVmbGF0ZVJlc3VsdCA9IG1fZGVmbGF0ZUZyYW1lci5kZWZsYXRlKGZyYW1lKTsK ICAgICBpZiAoIWRlZmxhdGVSZXN1bHQtPnN1Y2NlZWRlZCgpKSB7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgJKHJl dmlzaW9uIDI0MzE4MCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJT b2NrZXRDaGFubmVsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE5Myw4ICsxOTMsOCBAQCBwcml2YXRl OgogICAgICAgICBCbG9iTG9hZGVyRmFpbGVkCiAgICAgfTsKIAotICAgIERvY3VtZW50KiBtX2Rv Y3VtZW50OwotICAgIFdlYlNvY2tldENoYW5uZWxDbGllbnQqIG1fY2xpZW50OworICAgIFdlYWtQ dHI8RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAgV2Vha1B0cjxXZWJTb2NrZXRDaGFubmVsQ2xp ZW50PiBtX2NsaWVudDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViU29ja2V0SGFuZHNoYWtlPiBt X2hhbmRzaGFrZTsKICAgICBSZWZQdHI8U29ja2V0U3RyZWFtSGFuZGxlPiBtX2hhbmRsZTsKICAg ICBWZWN0b3I8Y2hhcj4gbV9idWZmZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbENsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsQ2xpZW50LmgJKHJldmlz aW9uIDI0MzE4MCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2Nr ZXRDaGFubmVsQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDEwICszMSwxMSBAQAogI3By YWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFr UHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgV2ViU29ja2V0Q2hhbm5lbENs aWVudCB7CitjbGFzcyBXZWJTb2NrZXRDaGFubmVsQ2xpZW50IDogcHVibGljIENhbk1ha2VXZWFr UHRyPFdlYlNvY2tldENoYW5uZWxDbGllbnQ+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJT b2NrZXRDaGFubmVsQ2xpZW50KCkgPSBkZWZhdWx0OwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb25u ZWN0KCkgPSAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNv Y2tldEhhbmRzaGFrZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAJKHJldmlzaW9uIDI0MzE4MCkKKysrIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjMsNyArMTIzLDcgQEAgV2ViU29ja2V0SGFuZHNoYWtlOjpXZWJT b2NrZXRIYW5kc2hha2UoYwogICAgIDogbV91cmwodXJsKQogICAgICwgbV9jbGllbnRQcm90b2Nv bChwcm90b2NvbCkKICAgICAsIG1fc2VjdXJlKG1fdXJsLnByb3RvY29sSXMoIndzcyIpKQotICAg ICwgbV9kb2N1bWVudChkb2N1bWVudCkKKyAgICAsIG1fZG9jdW1lbnQoZG9jdW1lbnQgPyBtYWtl V2Vha1B0cigqZG9jdW1lbnQpIDogbnVsbHB0cikKICAgICAsIG1fbW9kZShJbmNvbXBsZXRlKQog ICAgICwgbV9hbGxvd0Nvb2tpZXMoYWxsb3dDb29raWVzKQogewpJbmRleDogU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuaAko cmV2aXNpb24gMjQzMTgwKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dl YlNvY2tldEhhbmRzaGFrZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5j bHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgogI2luY2x1ZGUgIldlYlNvY2tldEV4dGVuc2lvbkRp c3BhdGNoZXIuaCIKICNpbmNsdWRlICJXZWJTb2NrZXRFeHRlbnNpb25Qcm9jZXNzb3IuaCIKKyNp bmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xMDAsNyArMTAxLDcgQEAgcHJpdmF0ZToKICAgICBV UkwgbV91cmw7CiAgICAgU3RyaW5nIG1fY2xpZW50UHJvdG9jb2w7CiAgICAgYm9vbCBtX3NlY3Vy ZTsKLSAgICBEb2N1bWVudCogbV9kb2N1bWVudDsKKyAgICBXZWFrUHRyPERvY3VtZW50PiBtX2Rv Y3VtZW50OwogCiAgICAgTW9kZSBtX21vZGU7CiAgICAgYm9vbCBtX2FsbG93Q29va2llczsK