158594 2016-06-09 17:16:08 -0700 Make some methods const. 2016-06-09 17:41:32 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1201060 0 mark.lam 2016-06-09 17:16:08 -0700 Patch coming. 1201062 1 280968 mark.lam 2016-06-09 17:18:38 -0700 Created attachment 280968 proposed patch. 1201069 2 mark.lam 2016-06-09 17:41:32 -0700 Thanks for the review. Landed in r201896: <http://trac.webkit.org/r201896>. 280968 2016-06-09 17:18:38 -0700 2016-06-09 17:19:56 -0700 proposed patch. bug-158594.patch text/plain 9214 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxODk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE2LTA2LTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIHNvbWUgbWV0aG9kcyBjb25zdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1ODU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6 Q29kZUJsb2NrOjpjb2x1bW5OdW1iZXJGb3JCeXRlY29kZU9mZnNldCk6CisgICAgICAgIChKU0M6 OkNvZGVCbG9jazo6ZXhwcmVzc2lvblJhbmdlRm9yQnl0ZWNvZGVPZmZzZXQpOgorICAgICAgICAq IGJ5dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICAqIGJ5dGVjb2RlL0V4cHJlc3Npb25SYW5n ZUluZm8uaDoKKyAgICAgICAgKEpTQzo6RXhwcmVzc2lvblJhbmdlSW5mbzo6ZW5jb2RlRmF0Q29s dW1uTW9kZSk6CisgICAgICAgIChKU0M6OkV4cHJlc3Npb25SYW5nZUluZm86OmRlY29kZUZhdExp bmVNb2RlKToKKyAgICAgICAgKEpTQzo6RXhwcmVzc2lvblJhbmdlSW5mbzo6ZGVjb2RlRmF0Q29s dW1uTW9kZSk6CisgICAgICAgICogYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3BwOgorICAg ICAgICAoSlNDOjpVbmxpbmtlZENvZGVCbG9jazo6bGluZU51bWJlckZvckJ5dGVjb2RlT2Zmc2V0 KToKKyAgICAgICAgKEpTQzo6VW5saW5rZWRDb2RlQmxvY2s6OmdldExpbmVBbmRDb2x1bW4pOgor ICAgICAgICAoSlNDOjpVbmxpbmtlZENvZGVCbG9jazo6ZXhwcmVzc2lvblJhbmdlRm9yQnl0ZWNv ZGVPZmZzZXQpOgorICAgICAgICAqIGJ5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmg6CisgICAg ICAgIChKU0M6OlVubGlua2VkQ29kZUJsb2NrOjpjcmVhdGVSYXJlRGF0YUlmTmVjZXNzYXJ5KToK KyAgICAgICAgKiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6Oklu dGVycHJldGVyOjppc09wY29kZSk6CisgICAgICAgIChKU0M6OlN0YWNrRnJhbWU6OmNvbXB1dGVM aW5lQW5kQ29sdW1uKToKKyAgICAgICAgKEpTQzo6U3RhY2tGcmFtZTo6dG9TdHJpbmcpOgorICAg ICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmg6CisgICAgICAgIChKU0M6OlN0YWNrRnJh bWU6OmlzTmF0aXZlKToKKwogMjAxNi0wNi0wOSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFw cGxlLmNvbT4KIAogICAgICAgICBFUzY6IFJldXNpbmcgZnVuY3Rpb24gbmFtZSBhcyBhIHBhcmFt ZXRlciBuYW1lIHNob3VsZG4ndCB0aHJvdyBTeW50YXggRXJyb3IKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZpc2lvbiAyMDE4OTEpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzE3Niw3ICszMTc2LDcgQEAgdW5zaWduZWQgQ29kZUJsb2NrOjpjb2x1bW5OdW1i ZXJGb3JCeXRlYwogICAgIHJldHVybiBjb2x1bW47CiB9CiAKLXZvaWQgQ29kZUJsb2NrOjpleHBy ZXNzaW9uUmFuZ2VGb3JCeXRlY29kZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCwgaW50 JiBkaXZvdCwgaW50JiBzdGFydE9mZnNldCwgaW50JiBlbmRPZmZzZXQsIHVuc2lnbmVkJiBsaW5l LCB1bnNpZ25lZCYgY29sdW1uKQordm9pZCBDb2RlQmxvY2s6OmV4cHJlc3Npb25SYW5nZUZvckJ5 dGVjb2RlT2Zmc2V0KHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0LCBpbnQmIGRpdm90LCBpbnQmIHN0 YXJ0T2Zmc2V0LCBpbnQmIGVuZE9mZnNldCwgdW5zaWduZWQmIGxpbmUsIHVuc2lnbmVkJiBjb2x1 bW4pIGNvbnN0CiB7CiAgICAgbV91bmxpbmtlZENvZGUtPmV4cHJlc3Npb25SYW5nZUZvckJ5dGVj b2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0LCBkaXZvdCwgc3RhcnRPZmZzZXQsIGVuZE9mZnNldCwg bGluZSwgY29sdW1uKTsKICAgICBkaXZvdCArPSBtX3NvdXJjZU9mZnNldDsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJKHJldmlzaW9uIDIwMTg5MSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkod29ya2luZyBj b3B5KQpAQCAtMjMwLDcgKzIzMCw3IEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBsaW5lTnVtYmVy Rm9yQnl0ZWNvZGVPZmZzZXQodW5zaWduZWQgYnl0ZWNvZGVPZmZzZXQpOwogICAgIHVuc2lnbmVk IGNvbHVtbk51bWJlckZvckJ5dGVjb2RlT2Zmc2V0KHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0KTsK ICAgICB2b2lkIGV4cHJlc3Npb25SYW5nZUZvckJ5dGVjb2RlT2Zmc2V0KHVuc2lnbmVkIGJ5dGVj b2RlT2Zmc2V0LCBpbnQmIGRpdm90LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50JiBzdGFydE9mZnNldCwgaW50JiBlbmRPZmZzZXQsIHVuc2lnbmVkJiBsaW5l LCB1bnNpZ25lZCYgY29sdW1uKTsKKyAgICAgICAgaW50JiBzdGFydE9mZnNldCwgaW50JiBlbmRP ZmZzZXQsIHVuc2lnbmVkJiBsaW5lLCB1bnNpZ25lZCYgY29sdW1uKSBjb25zdDsKIAogICAgIE9w dGlvbmFsPHVuc2lnbmVkPiBieXRlY29kZU9mZnNldEZyb21DYWxsU2l0ZUluZGV4KENhbGxTaXRl SW5kZXgpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRXhwcmVzc2lv blJhbmdlSW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9FeHByZXNzaW9uUmFuZ2VJbmZvLmgJKHJldmlzaW9uIDIwMTg5MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9FeHByZXNzaW9uUmFuZ2VJbmZvLmgJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEyLCAyMDEzIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMi0yMDEzLCAyMDE2 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucwpAQCAtODYsMTMgKzg2LDEzIEBAIHN0cnVjdCBFeHByZXNzaW9uUmFuZ2VJbmZvIHsK ICAgICAgICAgcG9zaXRpb24gPSAoKGxpbmUgJiBGYXRDb2x1bW5Nb2RlTGluZU1hc2spIDw8IEZh dENvbHVtbk1vZGVMaW5lU2hpZnQgfCAoY29sdW1uICYgRmF0Q29sdW1uTW9kZUNvbHVtbk1hc2sp KTsKICAgICB9CiAKLSAgICB2b2lkIGRlY29kZUZhdExpbmVNb2RlKHVuc2lnbmVkJiBsaW5lLCB1 bnNpZ25lZCYgY29sdW1uKQorICAgIHZvaWQgZGVjb2RlRmF0TGluZU1vZGUodW5zaWduZWQmIGxp bmUsIHVuc2lnbmVkJiBjb2x1bW4pIGNvbnN0CiAgICAgewogICAgICAgICBsaW5lID0gKHBvc2l0 aW9uID4+IEZhdExpbmVNb2RlTGluZVNoaWZ0KSAmIEZhdExpbmVNb2RlTGluZU1hc2s7CiAgICAg ICAgIGNvbHVtbiA9IHBvc2l0aW9uICYgRmF0TGluZU1vZGVDb2x1bW5NYXNrOwogICAgIH0KIAot ICAgIHZvaWQgZGVjb2RlRmF0Q29sdW1uTW9kZSh1bnNpZ25lZCYgbGluZSwgdW5zaWduZWQmIGNv bHVtbikKKyAgICB2b2lkIGRlY29kZUZhdENvbHVtbk1vZGUodW5zaWduZWQmIGxpbmUsIHVuc2ln bmVkJiBjb2x1bW4pIGNvbnN0CiAgICAgewogICAgICAgICBsaW5lID0gKHBvc2l0aW9uID4+IEZh dENvbHVtbk1vZGVMaW5lU2hpZnQpICYgRmF0Q29sdW1uTW9kZUxpbmVNYXNrOwogICAgICAgICBj b2x1bW4gPSBwb3NpdGlvbiAmIEZhdENvbHVtbk1vZGVDb2x1bW5NYXNrOwpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3Bw CShyZXZpc2lvbiAyMDE4OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5s aW5rZWRDb2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMiwgMjAxMywgMjAxNSBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAxMywgMjAxNS0yMDE2IEFwcGxlIEluYy4g QWxsIFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MTI4LDggKzEyOCw4IEBAIGludCBVbmxpbmtlZENvZGVCbG9jazo6bGluZU51bWJlckZvckJ5dGUK ICAgICByZXR1cm4gbGluZTsKIH0KIAotaW5saW5lIHZvaWQgVW5saW5rZWRDb2RlQmxvY2s6Omdl dExpbmVBbmRDb2x1bW4oRXhwcmVzc2lvblJhbmdlSW5mbyYgaW5mbywKLSAgICB1bnNpZ25lZCYg bGluZSwgdW5zaWduZWQmIGNvbHVtbikKK2lubGluZSB2b2lkIFVubGlua2VkQ29kZUJsb2NrOjpn ZXRMaW5lQW5kQ29sdW1uKGNvbnN0IEV4cHJlc3Npb25SYW5nZUluZm8mIGluZm8sCisgICAgdW5z aWduZWQmIGxpbmUsIHVuc2lnbmVkJiBjb2x1bW4pIGNvbnN0CiB7CiAgICAgc3dpdGNoIChpbmZv Lm1vZGUpIHsKICAgICBjYXNlIEV4cHJlc3Npb25SYW5nZUluZm86OkZhdExpbmVNb2RlOgpAQCAt MTg1LDcgKzE4NSw3IEBAIHZvaWQgVW5saW5rZWRDb2RlQmxvY2s6OmR1bXBFeHByZXNzaW9uUmEK ICNlbmRpZgogCiB2b2lkIFVubGlua2VkQ29kZUJsb2NrOjpleHByZXNzaW9uUmFuZ2VGb3JCeXRl Y29kZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCwKLSAgICBpbnQmIGRpdm90LCBpbnQm IHN0YXJ0T2Zmc2V0LCBpbnQmIGVuZE9mZnNldCwgdW5zaWduZWQmIGxpbmUsIHVuc2lnbmVkJiBj b2x1bW4pCisgICAgaW50JiBkaXZvdCwgaW50JiBzdGFydE9mZnNldCwgaW50JiBlbmRPZmZzZXQs IHVuc2lnbmVkJiBsaW5lLCB1bnNpZ25lZCYgY29sdW1uKSBjb25zdAogewogICAgIEFTU0VSVChi eXRlY29kZU9mZnNldCA8IGluc3RydWN0aW9ucygpLmNvdW50KCkpOwogCkBAIC0xOTgsNyArMTk4 LDcgQEAgdm9pZCBVbmxpbmtlZENvZGVCbG9jazo6ZXhwcmVzc2lvblJhbmdlRgogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgVmVjdG9yPEV4cHJlc3Npb25SYW5nZUluZm8+JiBleHByZXNz aW9uSW5mbyA9IG1fZXhwcmVzc2lvbkluZm87CisgICAgY29uc3QgVmVjdG9yPEV4cHJlc3Npb25S YW5nZUluZm8+JiBleHByZXNzaW9uSW5mbyA9IG1fZXhwcmVzc2lvbkluZm87CiAKICAgICBpbnQg bG93ID0gMDsKICAgICBpbnQgaGlnaCA9IGV4cHJlc3Npb25JbmZvLnNpemUoKTsKQEAgLTIxMyw3 ICsyMTMsNyBAQCB2b2lkIFVubGlua2VkQ29kZUJsb2NrOjpleHByZXNzaW9uUmFuZ2VGCiAgICAg aWYgKCFsb3cpCiAgICAgICAgIGxvdyA9IDE7CiAKLSAgICBFeHByZXNzaW9uUmFuZ2VJbmZvJiBp bmZvID0gZXhwcmVzc2lvbkluZm9bbG93IC0gMV07CisgICAgY29uc3QgRXhwcmVzc2lvblJhbmdl SW5mbyYgaW5mbyA9IGV4cHJlc3Npb25JbmZvW2xvdyAtIDFdOwogICAgIHN0YXJ0T2Zmc2V0ID0g aW5mby5zdGFydE9mZnNldDsKICAgICBlbmRPZmZzZXQgPSBpbmZvLmVuZE9mZnNldDsKICAgICBk aXZvdCA9IGluZm8uZGl2b3RQb2ludDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9VbmxpbmtlZENvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oCShyZXZpc2lvbiAyMDE4OTEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suaAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAxNSBB cHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAx NiBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTMyNSw3ICszMjUsNyBAQCBwdWJsaWM6CiAgICAgaW50IGxpbmVOdW1iZXJG b3JCeXRlY29kZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCk7CiAKICAgICB2b2lkIGV4 cHJlc3Npb25SYW5nZUZvckJ5dGVjb2RlT2Zmc2V0KHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0LCBp bnQmIGRpdm90LAotICAgICAgICBpbnQmIHN0YXJ0T2Zmc2V0LCBpbnQmIGVuZE9mZnNldCwgdW5z aWduZWQmIGxpbmUsIHVuc2lnbmVkJiBjb2x1bW4pOworICAgICAgICBpbnQmIHN0YXJ0T2Zmc2V0 LCBpbnQmIGVuZE9mZnNldCwgdW5zaWduZWQmIGxpbmUsIHVuc2lnbmVkJiBjb2x1bW4pIGNvbnN0 OwogCiAgICAgYm9vbCB0eXBlUHJvZmlsZXJFeHByZXNzaW9uSW5mb0ZvckJ5dGVjb2RlT2Zmc2V0 KHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0LCB1bnNpZ25lZCYgc3RhcnREaXZvdCwgdW5zaWduZWQm IGVuZERpdm90KTsKIApAQCAtMzg3LDcgKzM4Nyw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBt X3JhcmVEYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxSYXJlRGF0YT4oKTsKICAgICB9CiAKLSAgICB2 b2lkIGdldExpbmVBbmRDb2x1bW4oRXhwcmVzc2lvblJhbmdlSW5mbyYsIHVuc2lnbmVkJiBsaW5l LCB1bnNpZ25lZCYgY29sdW1uKTsKKyAgICB2b2lkIGdldExpbmVBbmRDb2x1bW4oY29uc3QgRXhw cmVzc2lvblJhbmdlSW5mbyYsIHVuc2lnbmVkJiBsaW5lLCB1bnNpZ25lZCYgY29sdW1uKSBjb25z dDsKIAogICAgIGludCBtX251bVBhcmFtZXRlcnM7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAkocmV2aXNpb24gMjAxODkx KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDQ0LDcgKzQ0NCw3IEBAIGJvb2wgSW50ZXJwcmV0ZXI6OmlzT3Bj b2RlKE9wY29kZSBvcGNvZGUKICNlbmRpZgogfQogCi12b2lkIFN0YWNrRnJhbWU6OmNvbXB1dGVM aW5lQW5kQ29sdW1uKHVuc2lnbmVkJiBsaW5lLCB1bnNpZ25lZCYgY29sdW1uKQordm9pZCBTdGFj a0ZyYW1lOjpjb21wdXRlTGluZUFuZENvbHVtbih1bnNpZ25lZCYgbGluZSwgdW5zaWduZWQmIGNv bHVtbikgY29uc3QKIHsKICAgICBpZiAoIWNvZGVCbG9jaykgewogICAgICAgICBsaW5lID0gMDsK QEAgLTQ2Miw3ICs0NjIsNyBAQCB2b2lkIFN0YWNrRnJhbWU6OmNvbXB1dGVMaW5lQW5kQ29sdW1u KHVuCiAgICAgICAgIGxpbmUgPSBleGVjdXRhYmxlLT5vdmVycmlkZUxpbmVOdW1iZXIoKTsKIH0K IAotU3RyaW5nIFN0YWNrRnJhbWU6OnRvU3RyaW5nKFZNJiB2bSkKK1N0cmluZyBTdGFja0ZyYW1l Ojp0b1N0cmluZyhWTSYgdm0pIGNvbnN0CiB7CiAgICAgU3RyaW5nQnVpbGRlciB0cmFjZUJ1aWxk OwogICAgIFN0cmluZyBmdW5jdGlvbk5hbWUgPSB0aGlzLT5mdW5jdGlvbk5hbWUodm0pOwpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmgJ KHJldmlzaW9uIDIwMTg5MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9J bnRlcnByZXRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC05MCwxMSArOTAsMTEgQEAgbmFtZXNwYWNl IEpTQyB7CiAKICAgICAgICAgYm9vbCBpc05hdGl2ZSgpIGNvbnN0IHsgcmV0dXJuICFjb2RlQmxv Y2s7IH0KIAotICAgICAgICB2b2lkIGNvbXB1dGVMaW5lQW5kQ29sdW1uKHVuc2lnbmVkJiBsaW5l LCB1bnNpZ25lZCYgY29sdW1uKTsKKyAgICAgICAgdm9pZCBjb21wdXRlTGluZUFuZENvbHVtbih1 bnNpZ25lZCYgbGluZSwgdW5zaWduZWQmIGNvbHVtbikgY29uc3Q7CiAgICAgICAgIFN0cmluZyBm dW5jdGlvbk5hbWUoVk0mKSBjb25zdDsKICAgICAgICAgaW50cHRyX3Qgc291cmNlSUQoKSBjb25z dDsKICAgICAgICAgU3RyaW5nIHNvdXJjZVVSTCgpIGNvbnN0OwotICAgICAgICBTdHJpbmcgdG9T dHJpbmcoVk0mKTsKKyAgICAgICAgU3RyaW5nIHRvU3RyaW5nKFZNJikgY29uc3Q7CiAgICAgfTsK IAogICAgIGNsYXNzIFN1c3BlbmRFeGNlcHRpb25TY29wZSB7Cg==