152805 2016-01-06 13:41:21 -0800 REGRESSION(r194613): JITMulGenerator needs a scratch GPR on 32-bit too. 2016-01-06 18:38:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 132470 1 commit-queue mark.lam ap ggaren keith_miller mark.lam msaboff saam oldest_to_newest 1153194 0 commit-queue 2016-01-06 13:41:21 -0800 http://trac.webkit.org/changeset/194613 broke the build: This change introduced 32-bit JSC test failures (Requested by ryanhaddad on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1153196 1 268400 commit-queue 2016-01-06 13:41:55 -0800 Created attachment 268400 ROLLOUT of r194613 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1153215 2 268405 mark.lam 2016-01-06 14:13:34 -0800 Created attachment 268405 proposed patch. 1153218 3 268405 msaboff 2016-01-06 14:16:34 -0800 Comment on attachment 268405 proposed patch. r=me 1153310 4 ap 2016-01-06 18:33:56 -0800 Looks like the fix didn't pass EWS. Are the tests still failing? 1153311 5 mark.lam 2016-01-06 18:36:17 -0800 (In reply to comment #4) > Looks like the fix didn't pass EWS. Are the tests still failing? From the EWS bot: Error: mac-debug-ews unable to apply patch. 3 hours, 55 minutes ago Patch does not apply [results] 3 hours, 55 minutes ago Unable to pass tests without patch (tree is red?) [results] 3 hours, 56 minutes ago Looks like the fix worked: https://build.webkit.org/builders/Apple%20El%20Capitan%2032-bit%20JSC%20(BuildAndTest)?numbuilds=50 1153312 6 mark.lam 2016-01-06 18:38:17 -0800 Fix landed in r194669: <https://trac.webkit.org/r194669>. 268400 2016-01-06 13:41:55 -0800 2016-01-06 14:13:34 -0800 ROLLOUT of r194613 bug-152805-20160106134123.patch text/plain 28138 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTAxMDk0ZjkxZWIxZTJlNDk4ZjQ2YWMxN2FhYjU4OTM0YTY0ZWMzLi4yZjI5NzU2ZDEyN2Q1YTJm Nzk4ODRmYmQ2MjU2YzEzNTViYTE0OTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNi0wMS0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE5NDYxMy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjgwNQorCisgICAg ICAgIFRoaXMgY2hhbmdlIGludHJvZHVjZWQgMzItYml0IEpTQyB0ZXN0IGZhaWx1cmVzIChSZXF1 ZXN0ZWQgYnkKKyAgICAgICAgcnlhbmhhZGRhZCBvbiAjd2Via2l0KS4KKworICAgICAgICBSZXZl cnRlZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIlByb2ZpbGluZyBzaG91bGQgZGV0ZWN0IHdoZW4g bXVsdGlwbGljYXRpb24gb3ZlcmZsb3dzIGJ1dAorICAgICAgICBkb2VzIG5vdCBjcmVhdGUgbmVn YXRpdmUgemVyby4iCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzI0NzAKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTk0 NjEzCisKIDIwMTYtMDEtMDYgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFNpbGVuY2UgLVd0YXV0b2xvZ2ljYWwtY29tcGFyZQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0Lmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaApp bmRleCA2ZWEzM2FmOGY0MzQ0YWY3Y2ZhNTc1MGNhMDQ4YzZjZTIxODNjNTc5Li5lMzRmMDM0Zjdi ODFhZGQ2Y2VkOWEyY2ExZDVkODRmOTM2OTg4YzVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaApAQCAtNTIzLDcgKzUy Myw2IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IEFTU0VSVChzcmMgIT0gZGF0YVRlbXBSZWdpc3Rlcik7CiAgICAgICAgIG1vdmUoaW1tLCBnZXRD YWNoZWREYXRhVGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCkpOwogICAgICAgICBtX2Fzc2Vt Ymxlci5vcnI8MzI+KGRlc3QsIHNyYywgZGF0YVRlbXBSZWdpc3Rlcik7CiAgICAgfQpAQCAtNTM1 LDEzICs1MzQsNiBAQCBwdWJsaWM6CiAgICAgICAgIHN0b3JlMzIoZGF0YVRlbXBSZWdpc3Rlciwg YWRkcmVzcy5tX3B0cik7CiAgICAgfQogCi0gICAgdm9pZCBvcjMyKFRydXN0ZWRJbW0zMiBpbW0s IEFic29sdXRlQWRkcmVzcyBhZGRyZXNzKQotICAgIHsKLSAgICAgICAgbG9hZDMyKGFkZHJlc3Mu bV9wdHIsIGdldENhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcklEQW5kSW52YWxpZGF0ZSgpKTsKLSAg ICAgICAgb3IzMihpbW0sIG1lbW9yeVRlbXBSZWdpc3RlciwgbWVtb3J5VGVtcFJlZ2lzdGVyKTsK LSAgICAgICAgc3RvcmUzMihtZW1vcnlUZW1wUmVnaXN0ZXIsIGFkZHJlc3MubV9wdHIpOwotICAg IH0KLQogICAgIHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBBZGRyZXNzIGFkZHJlc3MpCiAg ICAgewogICAgICAgICBsb2FkMzIoYWRkcmVzcywgZ2V0Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklE QW5kSW52YWxpZGF0ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKaW5kZXggYTAyMzM2NzBlOTYxYmIwNWQyZWE4YWUx NGNiNTQ4MWU1OTYzM2Q4Ni4uNjIzZjJiNjVmMDU0NTdhN2IzMmY1MzQyNjE4NzI1Njc2YzJjM2Ni YyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTXY3LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlckFSTXY3LmgKQEAgLTM1MiwxNCArMzUyLDYgQEAgcHVibGljOgogICAgICAgICBzdG9y ZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwogICAgIH0KIAotICAg IHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKLSAg ICB7Ci0gICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgYWRkcmVzc1Rl bXBSZWdpc3Rlcik7Ci0gICAgICAgIGxvYWQzMihhZGRyZXNzVGVtcFJlZ2lzdGVyLCBkYXRhVGVt cFJlZ2lzdGVyKTsKLSAgICAgICAgb3IzMihpbW0sIGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1w UmVnaXN0ZXIpOwotICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1w UmVnaXN0ZXIpOwotICAgIH0KLQogICAgIHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBBZGRy ZXNzIGFkZHJlc3MpCiAgICAgewogICAgICAgICBsb2FkMzIoYWRkcmVzcywgZGF0YVRlbXBSZWdp c3Rlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJs b2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmlu ZGV4IDAyMzI1Njc3MDljYjcwYzhlNTlmODljZWIyMzc3ZGM0MjI1YTFhNDguLmQxM2NmNmFmZjY4 NGFiMWJhMmI1MTc0MTljY2RhMTdiN2FkZGQwNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCkBAIC00MTg4LDEwICs0MTg4LDMyIEBAIHVuc2lnbmVk IENvZGVCbG9jazo6cmFyZUNhc2VQcm9maWxlQ291bnRGb3JCeXRlY29kZU9mZnNldChpbnQgYnl0 ZWNvZGVPZmZzZXQpCiAKIFJlc3VsdFByb2ZpbGUqIENvZGVCbG9jazo6cmVzdWx0UHJvZmlsZUZv ckJ5dGVjb2RlT2Zmc2V0KGludCBieXRlY29kZU9mZnNldCkKIHsKLSAgICBhdXRvIGl0ZXJhdG9y ID0gbV9ieXRlY29kZU9mZnNldFRvUmVzdWx0UHJvZmlsZUluZGV4TWFwLmZpbmQoYnl0ZWNvZGVP ZmZzZXQpOwotICAgIGlmIChpdGVyYXRvciA9PSBtX2J5dGVjb2RlT2Zmc2V0VG9SZXN1bHRQcm9m aWxlSW5kZXhNYXAuZW5kKCkpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIHJldHVybiAm bV9yZXN1bHRQcm9maWxlc1tpdGVyYXRvci0+dmFsdWVdOworICAgIHJldHVybiB0cnlCaW5hcnlT ZWFyY2g8UmVzdWx0UHJvZmlsZSwgaW50PigKKyAgICAgICAgbV9yZXN1bHRQcm9maWxlcywgbV9y ZXN1bHRQcm9maWxlcy5zaXplKCksIGJ5dGVjb2RlT2Zmc2V0LAorICAgICAgICBnZXRSZXN1bHRQ cm9maWxlQnl0ZWNvZGVPZmZzZXQpOworfQorCit2b2lkIENvZGVCbG9jazo6dXBkYXRlUmVzdWx0 UHJvZmlsZUZvckJ5dGVjb2RlT2Zmc2V0KGludCBieXRlY29kZU9mZnNldCwgSlNWYWx1ZSByZXN1 bHQpCit7CisjaWYgRU5BQkxFKERGR19KSVQpCisgICAgUmVzdWx0UHJvZmlsZSogcHJvZmlsZSA9 IHJlc3VsdFByb2ZpbGVGb3JCeXRlY29kZU9mZnNldChieXRlY29kZU9mZnNldCk7CisgICAgaWYg KCFwcm9maWxlKQorICAgICAgICBwcm9maWxlID0gYWRkUmVzdWx0UHJvZmlsZShieXRlY29kZU9m ZnNldCk7CisKKyAgICBpZiAocmVzdWx0LmlzTnVtYmVyKCkpIHsKKyAgICAgICAgaWYgKCFyZXN1 bHQuaXNJbnQzMigpKSB7CisgICAgICAgICAgICBkb3VibGUgZG91YmxlVmFsID0gcmVzdWx0LmFz TnVtYmVyKCk7CisgICAgICAgICAgICBpZiAoIWRvdWJsZVZhbCAmJiBzdGQ6OnNpZ25iaXQoZG91 YmxlVmFsKSkKKyAgICAgICAgICAgICAgICBwcm9maWxlLT5zZXRPYnNlcnZlZE5lZ1plcm9Eb3Vi bGUoKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBwcm9maWxlLT5zZXRPYnNl cnZlZE5vbk5lZ1plcm9Eb3VibGUoKTsKKyAgICAgICAgfQorICAgIH0gZWxzZQorICAgICAgICBw cm9maWxlLT5zZXRPYnNlcnZlZE5vbk51bWJlcigpOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0o Ynl0ZWNvZGVPZmZzZXQpOworICAgIFVOVVNFRF9QQVJBTShyZXN1bHQpOworI2VuZGlmCiB9CiAK ICNpZiBFTkFCTEUoSklUKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0NvZGVCbG9jay5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9j ay5oCmluZGV4IGZmNzM1YzAzNzQ5ZmQ0N2NiZDUzZTEzNmM4YjgzOTJjNGJlMjRkZDkuLmRiYjk3 NGI1NzM2ZmEyNTg1ZTE4ZmM0MDRkYmI5OTg3ZjRkODRkOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgKQEAgLTQ1MiwyMCArNDUyLDE2IEBAIHB1YmxpYzoK ICAgICAgICAgcmV0dXJuIHZhbHVlID49IE9wdGlvbnM6OmNvdWxkVGFrZVNsb3dDYXNlTWluaW11 bUNvdW50KCk7CiAgICAgfQogCi0gICAgUmVzdWx0UHJvZmlsZSogZW5zdXJlUmVzdWx0UHJvZmls ZShpbnQgYnl0ZWNvZGVPZmZzZXQpCisgICAgUmVzdWx0UHJvZmlsZSogYWRkUmVzdWx0UHJvZmls ZShpbnQgYnl0ZWNvZGVPZmZzZXQpCiAgICAgewotICAgICAgICBSZXN1bHRQcm9maWxlKiBwcm9m aWxlID0gcmVzdWx0UHJvZmlsZUZvckJ5dGVjb2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0KTsKLSAg ICAgICAgaWYgKCFwcm9maWxlKSB7Ci0gICAgICAgICAgICBtX3Jlc3VsdFByb2ZpbGVzLmFwcGVu ZChSZXN1bHRQcm9maWxlKGJ5dGVjb2RlT2Zmc2V0KSk7Ci0gICAgICAgICAgICBwcm9maWxlID0g Jm1fcmVzdWx0UHJvZmlsZXMubGFzdCgpOwotICAgICAgICAgICAgQVNTRVJUKCZtX3Jlc3VsdFBy b2ZpbGVzLmxhc3QoKSA9PSAmbV9yZXN1bHRQcm9maWxlc1ttX3Jlc3VsdFByb2ZpbGVzLnNpemUo KSAtIDFdKTsKLSAgICAgICAgICAgIG1fYnl0ZWNvZGVPZmZzZXRUb1Jlc3VsdFByb2ZpbGVJbmRl eE1hcC5hZGQoYnl0ZWNvZGVPZmZzZXQsIG1fcmVzdWx0UHJvZmlsZXMuc2l6ZSgpIC0gMSk7Ci0g ICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHByb2ZpbGU7CisgICAgICAgIG1fcmVzdWx0UHJvZmls ZXMuYXBwZW5kKFJlc3VsdFByb2ZpbGUoYnl0ZWNvZGVPZmZzZXQpKTsKKyAgICAgICAgcmV0dXJu ICZtX3Jlc3VsdFByb2ZpbGVzLmxhc3QoKTsKICAgICB9CiAgICAgdW5zaWduZWQgbnVtYmVyT2ZS ZXN1bHRQcm9maWxlcygpIHsgcmV0dXJuIG1fcmVzdWx0UHJvZmlsZXMuc2l6ZSgpOyB9CiAgICAg UmVzdWx0UHJvZmlsZSogcmVzdWx0UHJvZmlsZUZvckJ5dGVjb2RlT2Zmc2V0KGludCBieXRlY29k ZU9mZnNldCk7CiAKKyAgICB2b2lkIHVwZGF0ZVJlc3VsdFByb2ZpbGVGb3JCeXRlY29kZU9mZnNl dChpbnQgYnl0ZWNvZGVPZmZzZXQsIEpTVmFsdWUgcmVzdWx0KTsKKwogICAgIHVuc2lnbmVkIHNw ZWNpYWxGYXN0Q2FzZVByb2ZpbGVDb3VudEZvckJ5dGVjb2RlT2Zmc2V0KGludCBieXRlY29kZU9m ZnNldCkKICAgICB7CiAgICAgICAgIFJlc3VsdFByb2ZpbGUqIHByb2ZpbGUgPSByZXN1bHRQcm9m aWxlRm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpOwpAQCAtNDgyLDYgKzQ3OCwxNiBA QCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBzcGVjaWFsRmFzdENhc2VDb3VudCA+PSBPcHRpb25z Ojpjb3VsZFRha2VTbG93Q2FzZU1pbmltdW1Db3VudCgpOwogICAgIH0KIAorICAgIGJvb2wgbGlr ZWx5VG9UYWtlRGVlcGVzdFNsb3dDYXNlKGludCBieXRlY29kZU9mZnNldCkKKyAgICB7CisgICAg ICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9maWxpbmcoKSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgdW5zaWduZWQgc2xvd0Nhc2VDb3VudCA9IHJhcmVDYXNlUHJvZmlsZUNv dW50Rm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpOworICAgICAgICB1bnNpZ25lZCBz cGVjaWFsRmFzdENhc2VDb3VudCA9IHNwZWNpYWxGYXN0Q2FzZVByb2ZpbGVDb3VudEZvckJ5dGVj b2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0KTsKKyAgICAgICAgdW5zaWduZWQgdmFsdWUgPSBzbG93 Q2FzZUNvdW50IC0gc3BlY2lhbEZhc3RDYXNlQ291bnQ7CisgICAgICAgIHJldHVybiB2YWx1ZSA+ PSBPcHRpb25zOjpsaWtlbHlUb1Rha2VTbG93Q2FzZU1pbmltdW1Db3VudCgpOworICAgIH0KKwog ICAgIHVuc2lnbmVkIG51bWJlck9mQXJyYXlQcm9maWxlcygpIGNvbnN0IHsgcmV0dXJuIG1fYXJy YXlQcm9maWxlcy5zaXplKCk7IH0KICAgICBjb25zdCBBcnJheVByb2ZpbGVWZWN0b3ImIGFycmF5 UHJvZmlsZXMoKSB7IHJldHVybiBtX2FycmF5UHJvZmlsZXM7IH0KICAgICBBcnJheVByb2ZpbGUq IGFkZEFycmF5UHJvZmlsZSh1bnNpZ25lZCBieXRlY29kZU9mZnNldCkKQEAgLTEwNjIsNyArMTA2 OCw2IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFZhbHVlUHJvZmlsZT4gbV92YWx1ZVByb2ZpbGVz OwogICAgIFNlZ21lbnRlZFZlY3RvcjxSYXJlQ2FzZVByb2ZpbGUsIDg+IG1fcmFyZUNhc2VQcm9m aWxlczsKICAgICBTZWdtZW50ZWRWZWN0b3I8UmVzdWx0UHJvZmlsZSwgOD4gbV9yZXN1bHRQcm9m aWxlczsKLSAgICBIYXNoTWFwPHVuc2lnbmVkLCB1bnNpZ25lZCwgSW50SGFzaDx1bnNpZ25lZD4s IFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBtX2J5dGVjb2Rl T2Zmc2V0VG9SZXN1bHRQcm9maWxlSW5kZXhNYXA7CiAgICAgVmVjdG9yPEFycmF5QWxsb2NhdGlv blByb2ZpbGU+IG1fYXJyYXlBbGxvY2F0aW9uUHJvZmlsZXM7CiAgICAgQXJyYXlQcm9maWxlVmVj dG9yIG1fYXJyYXlQcm9maWxlczsKICAgICBWZWN0b3I8T2JqZWN0QWxsb2NhdGlvblByb2ZpbGU+ IG1fb2JqZWN0QWxsb2NhdGlvblByb2ZpbGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL1ZhbHVlUHJvZmlsZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvVmFsdWVQcm9maWxlLmNwcAppbmRleCA4NzZjZTMwZTg5MTFkM2Q2MGJjNWVlZmNm ZDA5MTkyZTQzMDgxNjg2Li5hMzNmYzcwODhhMTcwZTRiNDY1YjQ2YzA1YzUyNGU2ZjdiMGVlZWQ5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVmFsdWVQcm9maWxl LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVmFsdWVQcm9maWxlLmNw cApAQCAtNTQsMTAgKzU0LDYgQEAgdm9pZCBwcmludEludGVybmFsKFByaW50U3RyZWFtJiBvdXQs IGNvbnN0IFJlc3VsdFByb2ZpbGUmIHByb2ZpbGUpCiAgICAgICAgICAgICBvdXQucHJpbnQoIklu dDMyT3ZlcmZsb3ciKTsKICAgICAgICAgICAgIHNlcGFyYXRvciA9ICJ8IjsKICAgICAgICAgfQot ICAgICAgICBpZiAocHJvZmlsZS5kaWRPYnNlcnZlSW50NTJPdmVyZmxvdygpKSB7Ci0gICAgICAg ICAgICBvdXQucHJpbnQoIkludDUyT3ZlcmZsb3ciKTsKLSAgICAgICAgICAgIHNlcGFyYXRvciA9 ICJ8IjsKLSAgICAgICAgfQogICAgIH0KICAgICBpZiAocHJvZmlsZS5zcGVjaWFsRmFzdFBhdGhD b3VudCgpKSB7CiAgICAgICAgIG91dC5wcmludCgiIHNwZWNpYWwgZmFzdCBwYXRoOiAiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9WYWx1ZVByb2ZpbGUuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9WYWx1ZVByb2ZpbGUuaAppbmRleCA0OGI0 N2RhN2M3ZTcyYWZjZjk0OTk5YTYxYjExNjRjNmY2NTc5NzAyLi42NGIzNGU3YmI0N2VhNWZiZWMw YmNmY2RkM2NlN2E3MGYzOGU3ZjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvVmFsdWVQcm9maWxlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL1ZhbHVlUHJvZmlsZS5oCkBAIC0yMDgsNyArMjA4LDcgQEAgaW5saW5lIGludCBnZXRSYXJl Q2FzZVByb2ZpbGVCeXRlY29kZU9mZnNldChSYXJlQ2FzZVByb2ZpbGUqIHJhcmVDYXNlUHJvZmls ZSkKIAogc3RydWN0IFJlc3VsdFByb2ZpbGUgewogcHJpdmF0ZToKLSAgICBzdGF0aWMgY29uc3Qg aW50IG51bWJlck9mRmxhZ0JpdHMgPSA1OworICAgIHN0YXRpYyBjb25zdCBpbnQgbnVtYmVyT2ZG bGFnQml0cyA9IDQ7CiAKIHB1YmxpYzoKICAgICBSZXN1bHRQcm9maWxlKGludCBieXRlY29kZU9m ZnNldCkKQEAgLTIyMiw3ICsyMjIsNiBAQCBwdWJsaWM6CiAgICAgICAgIE5lZ1plcm9Eb3VibGUg ICAgPSAxIDw8IDEsCiAgICAgICAgIE5vbk51bWJlciAgICAgICAgPSAxIDw8IDIsCiAgICAgICAg IEludDMyT3ZlcmZsb3cgICAgPSAxIDw8IDMsCi0gICAgICAgIEludDUyT3ZlcmZsb3cgICAgPSAx IDw8IDQsCiAgICAgfTsKIAogICAgIGludCBieXRlY29kZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJu IG1fYnl0ZWNvZGVPZmZzZXRBbmRGbGFncyA+PiBudW1iZXJPZkZsYWdCaXRzOyB9CkBAIC0yMzQs MTMgKzIzMywxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBkaWRPYnNlcnZlTmVnWmVyb0RvdWJsZSgp IGNvbnN0IHsgcmV0dXJuIGhhc0JpdHMoTmVnWmVyb0RvdWJsZSk7IH0KICAgICBib29sIGRpZE9i c2VydmVOb25OdW1iZXIoKSBjb25zdCB7IHJldHVybiBoYXNCaXRzKE5vbk51bWJlcik7IH0KICAg ICBib29sIGRpZE9ic2VydmVJbnQzMk92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gaGFzQml0cyhJ bnQzMk92ZXJmbG93KTsgfQotICAgIGJvb2wgZGlkT2JzZXJ2ZUludDUyT3ZlcmZsb3coKSBjb25z dCB7IHJldHVybiBoYXNCaXRzKEludDUyT3ZlcmZsb3cpOyB9CiAKICAgICB2b2lkIHNldE9ic2Vy dmVkTm9uTmVnWmVyb0RvdWJsZSgpIHsgc2V0Qml0KE5vbk5lZ1plcm9Eb3VibGUpOyB9CiAgICAg dm9pZCBzZXRPYnNlcnZlZE5lZ1plcm9Eb3VibGUoKSB7IHNldEJpdChOZWdaZXJvRG91YmxlKTsg fQogICAgIHZvaWQgc2V0T2JzZXJ2ZWROb25OdW1iZXIoKSB7IHNldEJpdChOb25OdW1iZXIpOyB9 CiAgICAgdm9pZCBzZXRPYnNlcnZlZEludDMyT3ZlcmZsb3coKSB7IHNldEJpdChJbnQzMk92ZXJm bG93KTsgfQotICAgIHZvaWQgc2V0T2JzZXJ2ZWRJbnQ1Mk92ZXJmbG93KCkgeyBzZXRCaXQoSW50 NTJPdmVyZmxvdyk7IH0KIAogICAgIHZvaWQqIGFkZHJlc3NPZkZsYWdzKCkgeyByZXR1cm4gJm1f Ynl0ZWNvZGVPZmZzZXRBbmRGbGFnczsgfQogICAgIHZvaWQqIGFkZHJlc3NPZlNwZWNpYWxGYXN0 UGF0aENvdW50KCkgeyByZXR1cm4gJm1fc3BlY2lhbEZhc3RQYXRoQ291bnQ7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKaW5kZXggYTIyZjZj Y2NhODBlNjRkYTU0MTgyY2E2YzZkYWJhNzIzYjM1Yjc4Ny4uYWNhY2VjOTY2Mjg4NjVkMzI0ZDhm MTNmYjM5NGNlZDI5YWRlODg2NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHAKQEAgLTkwOSwxOSArOTA5LDE4IEBAIHByaXZhdGU6CiAgICAg ICAgICAgICBub2RlLT5tZXJnZUZsYWdzKE5vZGVNYXlOZWdaZXJvSW5CYXNlbGluZSk7CiAgICAg ICAgICAgICBicmVhazsKIAotICAgICAgICBjYXNlIEFyaXRoTXVsOiB7Ci0gICAgICAgICAgICBS ZXN1bHRQcm9maWxlJiByZXN1bHRQcm9maWxlID0gKm1faW5saW5lU3RhY2tUb3AtPm1fcHJvZmls ZWRCbG9jay0+cmVzdWx0UHJvZmlsZUZvckJ5dGVjb2RlT2Zmc2V0KG1fY3VycmVudEluZGV4KTsK LSAgICAgICAgICAgIGlmIChyZXN1bHRQcm9maWxlLmRpZE9ic2VydmVJbnQ1Mk92ZXJmbG93KCkp Ci0gICAgICAgICAgICAgICAgbm9kZS0+bWVyZ2VGbGFncyhOb2RlTWF5T3ZlcmZsb3dJbnQ1Mik7 Ci0gICAgICAgICAgICBpZiAocmVzdWx0UHJvZmlsZS5kaWRPYnNlcnZlSW50MzJPdmVyZmxvdygp IHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50 SW5kZXgsIE92ZXJmbG93KSkKLSAgICAgICAgICAgICAgICBub2RlLT5tZXJnZUZsYWdzKE5vZGVN YXlPdmVyZmxvd0ludDMySW5CYXNlbGluZSk7Ci0gICAgICAgICAgICBpZiAocmVzdWx0UHJvZmls ZS5kaWRPYnNlcnZlTmVnWmVyb0RvdWJsZSgpIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFBy b2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIE5lZ2F0aXZlWmVybykpCisgICAgICAg IGNhc2UgQXJpdGhNdWw6CisgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGRldGVjdCBj YXNlcyB3aGVyZSB3ZSBvbmx5IG92ZXJmbG93ZWQgYnV0IG5ldmVyIGNyZWF0ZWQKKyAgICAgICAg ICAgIC8vIG5lZ2F0aXZlIHplcm8uCisgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNDcwCisgICAgICAgICAgICBpZiAobV9pbmxpbmVTdGFj a1RvcC0+bV9wcm9maWxlZEJsb2NrLT5saWtlbHlUb1Rha2VEZWVwZXN0U2xvd0Nhc2UobV9jdXJy ZW50SW5kZXgpCisgICAgICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJv ZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgT3ZlcmZsb3cpKQorICAgICAgICAgICAg ICAgIG5vZGUtPm1lcmdlRmxhZ3MoTm9kZU1heU92ZXJmbG93SW50MzJJbkJhc2VsaW5lIHwgTm9k ZU1heU5lZ1plcm9JbkJhc2VsaW5lKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKG1faW5saW5lU3Rh Y2tUb3AtPm1fcHJvZmlsZWRCbG9jay0+bGlrZWx5VG9UYWtlU2xvd0Nhc2UobV9jdXJyZW50SW5k ZXgpCisgICAgICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5o YXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgTmVnYXRpdmVaZXJvKSkKICAgICAgICAgICAgICAg ICBub2RlLT5tZXJnZUZsYWdzKE5vZGVNYXlOZWdaZXJvSW5CYXNlbGluZSk7Ci0gICAgICAgICAg ICBpZiAocmVzdWx0UHJvZmlsZS5kaWRPYnNlcnZlTm9uSW50MzIoKSkKLSAgICAgICAgICAgICAg ICBub2RlLT5tZXJnZUZsYWdzKE5vZGVNYXlIYXZlTm9uSW50UmVzdWx0KTsKICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICB9Ci0KKyAgICAgICAgICAgIAogICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGJyZWFr OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21tb24uaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29tbW9uLmgKaW5kZXggYjAxNDNkNjczODk0YjY1 ZjRmZDZjZDkwOGYyNDhiZjE5MzJkMDg2Mi4uNmIxNzYzODVlMzdjM2M0MDUxMTRlY2VlZmVlYmVm YTM4MTFkY2VmMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb21t b24uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbW1vbi5oCkBAIC0xMDcs NyArMTA3LDcgQEAgZW51bSBOb1Jlc3VsdFRhZyB7IE5vUmVzdWx0IH07CiAvLyBUaGUgcHJlZGlj dGlvbiBwcm9wYWdhdG9yIGVmZmVjdGl2ZWx5IGRvZXMgZm91ciBwYXNzZXMsIHdpdGggdGhlIGxh c3QgcGFzcwogLy8gYmVpbmcgZG9uZSBieSB0aGUgc2VwYXJhdGUgRml4dVBoYXNlLgogZW51bSBQ cmVkaWN0aW9uUGFzcyB7Ci0gICAgLy8gV2UncmUgY29udmVyZ2luZyBpbiBhIHN0cmFpZ2h0LWZv cndhcmQgZm9yd2FyZCBmbG93IGZpeHBvaW50LiBUaGlzIGlzIHRoZQorICAgIC8vIFdlJ3JlIGNv bnZlcmdpbmcgaW4gYSBzdHJhZ2h0LWZvcndhcmQgZm9yd2FyZCBmbG93IGZpeHBvaW50LiBUaGlz IGlzIHRoZQogICAgIC8vIG1vc3QgY29udmVudGlvbmFsIHBhcnQgb2YgdGhlIHByb3BhZ2F0b3Ig LSBpdCBtYWtlcyBvbmx5IG1vbm90b25pYyBkZWNpc2lvbnMKICAgICAvLyBiYXNlZCBvbiB2YWx1 ZSBwcm9maWxlcyBhbmQgcmFyZSBjYXNlIHByb2ZpbGVzLiBJdCBpZ25vcmVzIGJhc2VsaW5lIEpJ VCByYXJlCiAgICAgLy8gY2FzZSBwcm9maWxlcy4gVGhlIGdvYWwgaGVyZSBpcyB0byBkZXZlbG9w IGEgZ29vZCBndWVzcyBvZiB3aGljaCB2YXJpYWJsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdO b2RlLmgKaW5kZXggMTI4NzBkOTNkMGM0ODJlNGY4ZTVkNGQyZGFmMWU2YmYxZjcxYjYyYy4uMzIz YTQyMDE0NTY4NGY4YzczMmE0OTk4NGM3NzY5ZmU4NDJjYmE3OCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdOb2RlLmgKQEAgLTkyNiwxMiArOTI2LDcgQEAgc3RydWN0IE5vZGUgewogICAgICAg ICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgcmV0dXJuIHJlc3VsdCAmIH5Ob2RlQnl0ZWNv ZGVOZWVkc05lZ1plcm87CiAgICAgfQotCi0gICAgYm9vbCBtYXlIYXZlTm9uSW50UmVzdWx0KCkK LSAgICB7Ci0gICAgICAgIHJldHVybiBtX2ZsYWdzICYgTm9kZU1heUhhdmVOb25JbnRSZXN1bHQ7 Ci0gICAgfQotCisgICAgCiAgICAgYm9vbCBoYXNDb25zdGFudEJ1ZmZlcigpCiAgICAgewogICAg ICAgICByZXR1cm4gb3AoKSA9PSBOZXdBcnJheUJ1ZmZlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZUZsYWdzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHTm9kZUZsYWdzLmNwcAppbmRleCA3OWY0YjQzMDI0Y2E3OTNjYzU1Yjc4NzJmZjhi MWU0ZGI4NWRlZjNhLi40N2Q1NTE5NzFjYjAyYjVhNzI4MTQzMmVkMTg4M2FiZDQ0ODhkMDAyIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGVGbGFncy5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlRmxhZ3MuY3BwCkBAIC04NSwxMiAr ODUsNiBAQCB2b2lkIGR1bXBOb2RlRmxhZ3MoUHJpbnRTdHJlYW0mIGFjdHVhbE91dCwgTm9kZUZs YWdzIGZsYWdzKQogICAgICAgICAgICAgb3V0LnByaW50KGNvbW1hLCAiVXNlQXNPdGhlciIpOwog ICAgIH0KIAotICAgIGlmIChmbGFncyAmIE5vZGVNYXlIYXZlTm9uSW50UmVzdWx0KQotICAgICAg ICBvdXQucHJpbnQoY29tbWEsICJNYXlIYXZlTm9uSW50UmVzdWx0Iik7Ci0KLSAgICBpZiAoZmxh Z3MgJiBOb2RlTWF5T3ZlcmZsb3dJbnQ1MikKLSAgICAgICAgb3V0LnByaW50KGNvbW1hLCAiTWF5 T3ZlcmZsb3dJbnQ1MiIpOwotCiAgICAgaWYgKGZsYWdzICYgTm9kZU1heU92ZXJmbG93SW50MzJJ bkJhc2VsaW5lKQogICAgICAgICBvdXQucHJpbnQoY29tbWEsICJNYXlPdmVyZmxvd0ludDMySW5C YXNlbGluZSIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05v ZGVGbGFncy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlRmxhZ3MuaAppbmRl eCA2MjZiOWJiMmI1MjM1MzllMDllODQ4YzdmMDg0MDg0Y2MzNDM0MzY3Li5hMzE5YzljMjE0MWMz MmE4YzU2MzEzYTJhNWYzMjNiZWY2ZDdiOTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR05vZGVGbGFncy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHTm9kZUZsYWdzLmgKQEAgLTQ2LDEwICs0Niw5IEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3Bh Y2UgREZHIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAjZGVmaW5lIE5vZGVN dXN0R2VuZXJhdGUgICAgICAgICAgICAgICAgIDB4MDAwOCAvLyBzZXQgb24gbm9kZXMgdGhhdCBo YXZlIHNpZGUgZWZmZWN0cywgYW5kIG1heSBub3QgdHJpdmlhbGx5IGJlIHJlbW92ZWQgYnkgRENF LgogI2RlZmluZSBOb2RlSGFzVmFyQXJncyAgICAgICAgICAgICAgICAgICAweDAwMTAKLSAgICAK LSNkZWZpbmUgTm9kZUJlaGF2aW9yTWFzayAgICAgICAgICAgICAgICAgMHgwN2UwCi0jZGVmaW5l IE5vZGVNYXlIYXZlTm9uSW50UmVzdWx0ICAgICAgICAgIDB4MDAyMAotI2RlZmluZSBOb2RlTWF5 T3ZlcmZsb3dJbnQ1MiAgICAgICAgICAgICAweDAwNDAKKy8vIDB4MDAyMCBhbmQgMHgwMDQwIGFy ZSBmcmVlLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKKyNkZWZpbmUgTm9kZUJl aGF2aW9yTWFzayAgICAgICAgICAgICAgICAgMHgwNzgwCiAjZGVmaW5lIE5vZGVNYXlPdmVyZmxv d0ludDMySW5CYXNlbGluZSAgIDB4MDA4MAogI2RlZmluZSBOb2RlTWF5T3ZlcmZsb3dJbnQzMklu REZHICAgICAgICAweDAxMDAKICNkZWZpbmUgTm9kZU1heU5lZ1plcm9JbkJhc2VsaW5lICAgICAg ICAgMHgwMjAwCkBAIC05NSwxMSArOTQsNiBAQCBlbnVtIFJhcmVDYXNlUHJvZmlsaW5nU291cmNl IHsKICAgICBBbGxSYXJlQ2FzZXMKIH07CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBub2RlTWF5T3Zl cmZsb3dJbnQ1MihOb2RlRmxhZ3MgZmxhZ3MsIFJhcmVDYXNlUHJvZmlsaW5nU291cmNlKQotewot ICAgIHJldHVybiAhIShmbGFncyAmIE5vZGVNYXlPdmVyZmxvd0ludDUyKTsKLX0KLQogc3RhdGlj IGlubGluZSBib29sIG5vZGVNYXlPdmVyZmxvd0ludDMyKE5vZGVGbGFncyBmbGFncywgUmFyZUNh c2VQcm9maWxpbmdTb3VyY2Ugc291cmNlKQogewogICAgIE5vZGVGbGFncyBtYXNrID0gMDsKQEAg LTE0Nyw5ICsxNDEsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgbm9kZUNhblNwZWN1bGF0ZUludDMy KE5vZGVGbGFncyBmbGFncywgUmFyZUNhc2VQcm9maWxpbmdTb3VyYwogCiBzdGF0aWMgaW5saW5l IGJvb2wgbm9kZUNhblNwZWN1bGF0ZUludDUyKE5vZGVGbGFncyBmbGFncywgUmFyZUNhc2VQcm9m aWxpbmdTb3VyY2Ugc291cmNlKQogewotICAgIGlmIChub2RlTWF5T3ZlcmZsb3dJbnQ1MihmbGFn cywgc291cmNlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgaWYgKG5vZGVNYXlOZWda ZXJvKGZsYWdzLCBzb3VyY2UpKQogICAgICAgICByZXR1cm4gYnl0ZWNvZGVDYW5JZ25vcmVOZWdh dGl2ZVplcm8oZmxhZ3MpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcAppbmRleCBhNjcwYzcy YzNmYjBiZWU2MzQ5NjVjY2I3OGY0OTI4NThhMDQ0YWMyLi4wNGZkMjc0MmQ1OTNjZTgxOWEzYTNi Y2JlZjY1N2UwMjNkYzA0NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcApAQCAtMzQzLDEyICsz NDMsOCBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJn ZVByZWRpY3Rpb24oU3BlY0ludDUyKTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oc3BlY3VsYXRlZERv dWJsZVR5cGVGb3JQcmVkaWN0aW9ucyhsZWZ0LCByaWdodCkpOwotICAgICAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChub2RlLT5tYXlIYXZlTm9uSW50UmVzdWx0 KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihT cGVjSW50MzIgfCBTcGVjQnl0ZWNvZGVEb3VibGUpOwotICAgICAgICAgICAgICAgICAgICBlbHNl Ci0gICAgICAgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihTcGVj SW50MzIpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oU3BlY0ludDMyIHwgU3Bl Y0J5dGVjb2RlRG91YmxlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEFyaXRobWV0 aWMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRBcml0aG1ldGljLmNwcAppbmRl eCA2YTAyYTA1ZmUyZGM5ZDNmNTRhOTM1OGI1MmRlOTRjNjA1OGMwZDEwLi42ZDIxN2EwYjEzZjdm OTkxZjMwOGU2MmEzMWUyYTVlYzIxMmQ4M2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVEFyaXRobWV0aWMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUQXJpdGhtZXRpYy5jcHAKQEAgLTc2MCw3ICs3NjAsNyBAQCB2b2lkIEpJVDo6ZW1pdF9v cF9kaXYoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIAogICAgIFJlc3VsdFByb2Zp bGUqIHJlc3VsdFByb2ZpbGUgPSBudWxscHRyOwogICAgIGlmIChzaG91bGRFbWl0UHJvZmlsaW5n KCkpCi0gICAgICAgIHJlc3VsdFByb2ZpbGUgPSBtX2NvZGVCbG9jay0+ZW5zdXJlUmVzdWx0UHJv ZmlsZShtX2J5dGVjb2RlT2Zmc2V0KTsKKyAgICAgICAgcmVzdWx0UHJvZmlsZSA9IG1fY29kZUJs b2NrLT5hZGRSZXN1bHRQcm9maWxlKG1fYnl0ZWNvZGVPZmZzZXQpOwogCiAgICAgU25pcHBldE9w ZXJhbmQgbGVmdE9wZXJhbmQodHlwZXMuZmlyc3QoKSk7CiAgICAgU25pcHBldE9wZXJhbmQgcmln aHRPcGVyYW5kKHR5cGVzLnNlY29uZCgpKTsKQEAgLTgzNSw3ICs4MzUsNyBAQCB2b2lkIEpJVDo6 ZW1pdF9vcF9tdWwoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIAogICAgIFJlc3Vs dFByb2ZpbGUqIHJlc3VsdFByb2ZpbGUgPSBudWxscHRyOwogICAgIGlmIChzaG91bGRFbWl0UHJv ZmlsaW5nKCkpCi0gICAgICAgIHJlc3VsdFByb2ZpbGUgPSBtX2NvZGVCbG9jay0+ZW5zdXJlUmVz dWx0UHJvZmlsZShtX2J5dGVjb2RlT2Zmc2V0KTsKKyAgICAgICAgcmVzdWx0UHJvZmlsZSA9IG1f Y29kZUJsb2NrLT5hZGRSZXN1bHRQcm9maWxlKG1fYnl0ZWNvZGVPZmZzZXQpOwogCiAgICAgU25p cHBldE9wZXJhbmQgbGVmdE9wZXJhbmQodHlwZXMuZmlyc3QoKSk7CiAgICAgU25pcHBldE9wZXJh bmQgcmlnaHRPcGVyYW5kKHR5cGVzLnNlY29uZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUTXVsR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUTXVsR2VuZXJhdG9yLmNwcAppbmRleCA5Mzk5ODc4NGJmMDBmOTMxZWM4NGY2OTZh YjUxZjVmOTUzMjljNDVjLi5lZjgwYjVlZTU2YjA2YzAzNGViMTI3YzNmM2Q4OGM3NzcwNzYzMDdj IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE11bEdlbmVyYXRvci5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRNdWxHZW5lcmF0b3IuY3BwCkBA IC0zNSw3ICszNSw2IEBAIHZvaWQgSklUTXVsR2VuZXJhdG9yOjpnZW5lcmF0ZUZhc3RQYXRoKEND YWxsSGVscGVycyYgaml0KQogICAgIEFTU0VSVChtX3NjcmF0Y2hHUFIgIT0gSW52YWxpZEdQUlJl Zyk7CiAgICAgQVNTRVJUKG1fc2NyYXRjaEdQUiAhPSBtX2xlZnQucGF5bG9hZEdQUigpKTsKICAg ICBBU1NFUlQobV9zY3JhdGNoR1BSICE9IG1fcmlnaHQucGF5bG9hZEdQUigpKTsKLSAgICBBU1NF UlQobV9zY3JhdGNoR1BSICE9IG1fcmVzdWx0LnBheWxvYWRHUFIoKSk7CiAjaWYgVVNFKEpTVkFM VUUzMl82NCkKICAgICBBU1NFUlQobV9zY3JhdGNoR1BSICE9IG1fbGVmdC50YWdHUFIoKSk7CiAg ICAgQVNTRVJUKG1fc2NyYXRjaEdQUiAhPSBtX3JpZ2h0LnRhZ0dQUigpKTsKQEAgLTkyLDcgKzkx LDI0IEBAIHZvaWQgSklUTXVsR2VuZXJhdG9yOjpnZW5lcmF0ZUZhc3RQYXRoKENDYWxsSGVscGVy cyYgaml0KQogICAgICAgICByaWdodE5vdEludCA9IGppdC5icmFuY2hJZk5vdEludDMyKG1fcmln aHQpOwogCiAgICAgICAgIG1fc2xvd1BhdGhKdW1wTGlzdC5hcHBlbmQoaml0LmJyYW5jaE11bDMy KENDYWxsSGVscGVyczo6T3ZlcmZsb3csIG1fcmlnaHQucGF5bG9hZEdQUigpLCBtX2xlZnQucGF5 bG9hZEdQUigpLCBtX3NjcmF0Y2hHUFIpKTsKLSAgICAgICAgbV9zbG93UGF0aEp1bXBMaXN0LmFw cGVuZChqaXQuYnJhbmNoVGVzdDMyKENDYWxsSGVscGVyczo6WmVybywgbV9zY3JhdGNoR1BSKSk7 IC8vIEdvIHNsb3cgaWYgcG90ZW50aWFsIG5lZ2F0aXZlIHplcm8uCisgICAgICAgIGlmICghbV9y ZXN1bHRQcm9maWxlKSB7CisgICAgICAgICAgICBtX3Nsb3dQYXRoSnVtcExpc3QuYXBwZW5kKGpp dC5icmFuY2hUZXN0MzIoQ0NhbGxIZWxwZXJzOjpaZXJvLCBtX3NjcmF0Y2hHUFIpKTsgLy8gR28g c2xvdyBpZiBwb3RlbnRpYWwgbmVnYXRpdmUgemVyby4KKworICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgQ0NhbGxIZWxwZXJzOjpKdW1wTGlzdCBub3ROZWdhdGl2ZVplcm87CisgICAgICAg ICAgICBub3ROZWdhdGl2ZVplcm8uYXBwZW5kKGppdC5icmFuY2hUZXN0MzIoQ0NhbGxIZWxwZXJz OjpOb25aZXJvLCBtX3NjcmF0Y2hHUFIpKTsKKworICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpK dW1wIG5lZ2F0aXZlWmVybyA9IGppdC5icmFuY2gzMihDQ2FsbEhlbHBlcnM6Okxlc3NUaGFuLCBt X2xlZnQucGF5bG9hZEdQUigpLCBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW0zMigwKSk7CisgICAg ICAgICAgICBub3ROZWdhdGl2ZVplcm8uYXBwZW5kKGppdC5icmFuY2gzMihDQ2FsbEhlbHBlcnM6 OkdyZWF0ZXJUaGFuT3JFcXVhbCwgbV9yaWdodC5wYXlsb2FkR1BSKCksIENDYWxsSGVscGVyczo6 VHJ1c3RlZEltbTMyKDApKSk7CisKKyAgICAgICAgICAgIG5lZ2F0aXZlWmVyby5saW5rKCZqaXQp OworICAgICAgICAgICAgLy8gUmVjb3JkIHRoaXMsIHNvIHRoYXQgdGhlIHNwZWN1bGF0aXZlIEpJ VCBrbm93cyB0aGF0IHdlIGZhaWxlZCBzcGVjdWxhdGlvbgorICAgICAgICAgICAgLy8gYmVjYXVz ZSBvZiBhIG5lZ2F0aXZlIHplcm8uCisgICAgICAgICAgICBqaXQuYWRkMzIoQ0NhbGxIZWxwZXJz OjpUcnVzdGVkSW1tMzIoMSksIENDYWxsSGVscGVyczo6QWJzb2x1dGVBZGRyZXNzKG1fcmVzdWx0 UHJvZmlsZS0+YWRkcmVzc09mU3BlY2lhbEZhc3RQYXRoQ291bnQoKSkpOworICAgICAgICAgICAg bV9zbG93UGF0aEp1bXBMaXN0LmFwcGVuZChqaXQuanVtcCgpKTsKKworICAgICAgICAgICAgbm90 TmVnYXRpdmVaZXJvLmxpbmsoJmppdCk7CisgICAgICAgIH0KIAogICAgICAgICBqaXQuYm94SW50 MzIobV9zY3JhdGNoR1BSLCBtX3Jlc3VsdCk7CiAgICAgICAgIG1fZW5kSnVtcExpc3QuYXBwZW5k KGppdC5qdW1wKCkpOwpAQCAtMTMxLDU4ICsxNDcsNyBAQCB2b2lkIEpJVE11bEdlbmVyYXRvcjo6 Z2VuZXJhdGVGYXN0UGF0aChDQ2FsbEhlbHBlcnMmIGppdCkKIAogICAgIC8vIERvIGRvdWJsZVZh ciAqIGRvdWJsZVZhci4KICAgICBqaXQubXVsRG91YmxlKG1fcmlnaHRGUFIsIG1fbGVmdEZQUik7 Ci0KLSAgICBpZiAoIW1fcmVzdWx0UHJvZmlsZSkKLSAgICAgICAgaml0LmJveERvdWJsZShtX2xl ZnRGUFIsIG1fcmVzdWx0KTsKLSAgICBlbHNlIHsKLSAgICAgICAgLy8gVGhlIEludDUyIG92ZXJm bG93IGNoZWNrIGJlbG93IGludGVudGlvbmFsbHkgb21pdHMgMWxsIDw8IDUxIGFzIGEgdmFsaWQg bmVnYXRpdmUgSW50NTIgdmFsdWUuCi0gICAgICAgIC8vIFRoZXJlZm9yZSwgd2Ugd2lsbCBnZXQg YSBmYWxzZSBwb3NpdGl2ZSBpZiB0aGUgcmVzdWx0IGlzIHRoYXQgdmFsdWUuIFRoaXMgaXMgaW50 ZW50aW9uYWxseQotICAgICAgICAvLyBkb25lIHRvIHNpbXBsaWZ5IHRoZSBjaGVja2luZyBhbGdv cml0aG0uCi0KLSAgICAgICAgY29uc3QgaW50NjRfdCBuZWdhdGl2ZVplcm9CaXRzID0gMWxsIDw8 IDYzOwotI2lmIFVTRShKU1ZBTFVFNjQpCi0gICAgICAgIGppdC5tb3ZlRG91YmxlVG82NChtX2xl ZnRGUFIsIG1fcmVzdWx0LnBheWxvYWRHUFIoKSk7Ci0gICAgICAgIENDYWxsSGVscGVyczo6SnVt cCBub3ROZWdhdGl2ZVplcm8gPSBqaXQuYnJhbmNoNjQoQ0NhbGxIZWxwZXJzOjpOb3RFcXVhbCwg bV9yZXN1bHQucGF5bG9hZEdQUigpLCBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW02NChuZWdhdGl2 ZVplcm9CaXRzKSk7Ci0KLSAgICAgICAgaml0Lm9yMzIoQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1t MzIoUmVzdWx0UHJvZmlsZTo6TmVnWmVyb0RvdWJsZSksIENDYWxsSGVscGVyczo6QWJzb2x1dGVB ZGRyZXNzKG1fcmVzdWx0UHJvZmlsZS0+YWRkcmVzc09mRmxhZ3MoKSkpOwotICAgICAgICBDQ2Fs bEhlbHBlcnM6Okp1bXAgZG9uZSA9IGppdC5qdW1wKCk7Ci0KLSAgICAgICAgbm90TmVnYXRpdmVa ZXJvLmxpbmsoJmppdCk7Ci0gICAgICAgIGppdC5vcjMyKENDYWxsSGVscGVyczo6VHJ1c3RlZElt bTMyKFJlc3VsdFByb2ZpbGU6Ok5vbk5lZ1plcm9Eb3VibGUpLCBDQ2FsbEhlbHBlcnM6OkFic29s dXRlQWRkcmVzcyhtX3Jlc3VsdFByb2ZpbGUtPmFkZHJlc3NPZkZsYWdzKCkpKTsKLQotICAgICAg ICBqaXQubW92ZShtX3Jlc3VsdC5wYXlsb2FkR1BSKCksIG1fc2NyYXRjaEdQUik7Ci0gICAgICAg IGppdC51cnNoaWZ0UHRyKENDYWxsSGVscGVyczo6SW1tMzIoNTIpLCBtX3NjcmF0Y2hHUFIpOwot ICAgICAgICBqaXQuYW5kMzIoQ0NhbGxIZWxwZXJzOjpJbW0zMigweDdmZiksIG1fc2NyYXRjaEdQ Uik7Ci0gICAgICAgIENDYWxsSGVscGVyczo6SnVtcCBub0ludDUyT3ZlcmZsb3cgPSBqaXQuYnJh bmNoMzIoQ0NhbGxIZWxwZXJzOjpMZXNzVGhhbk9yRXF1YWwsIG1fc2NyYXRjaEdQUiwgQ0NhbGxI ZWxwZXJzOjpUcnVzdGVkSW1tMzIoMHg0MzEpKTsKLQotICAgICAgICBqaXQub3IzMihDQ2FsbEhl bHBlcnM6OlRydXN0ZWRJbW0zMihSZXN1bHRQcm9maWxlOjpJbnQ1Mk92ZXJmbG93KSwgQ0NhbGxI ZWxwZXJzOjpBYnNvbHV0ZUFkZHJlc3MobV9yZXN1bHRQcm9maWxlLT5hZGRyZXNzT2ZGbGFncygp KSk7Ci0gICAgICAgIG5vSW50NTJPdmVyZmxvdy5saW5rKCZqaXQpOwotCi0gICAgICAgIGRvbmUu bGluaygmaml0KTsKLSAgICAgICAgaml0LnN1YjY0KEdQUkluZm86OnRhZ1R5cGVOdW1iZXJSZWdp c3RlciwgbV9yZXN1bHQucGF5bG9hZEdQUigpKTsgLy8gQm94IHRoZSBkb3VibGUuCi0jZWxzZQot ICAgICAgICBqaXQuYm94RG91YmxlKG1fbGVmdEZQUiwgbV9yZXN1bHQpOwotICAgICAgICBDQ2Fs bEhlbHBlcnM6Okp1bXBMaXN0IG5vdE5lZ2F0aXZlWmVybzsKLSAgICAgICAgbm90TmVnYXRpdmVa ZXJvLmFwcGVuZChqaXQuYnJhbmNoMzIoQ0NhbGxIZWxwZXJzOjpOb3RFcXVhbCwgbV9yZXN1bHQu cGF5bG9hZEdQUigpLCBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW0zMigwKSkpOwotICAgICAgICBu b3ROZWdhdGl2ZVplcm8uYXBwZW5kKGppdC5icmFuY2gzMihDQ2FsbEhlbHBlcnM6Ok5vdEVxdWFs LCBtX3Jlc3VsdC50YWdHUFIoKSwgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tMzIobmVnYXRpdmVa ZXJvQml0cyA+PiAzMikpKTsKLQotICAgICAgICBqaXQub3IzMihDQ2FsbEhlbHBlcnM6OlRydXN0 ZWRJbW0zMihSZXN1bHRQcm9maWxlOjpOZWdaZXJvRG91YmxlKSwgQ0NhbGxIZWxwZXJzOjpBYnNv bHV0ZUFkZHJlc3MobV9yZXN1bHRQcm9maWxlLT5hZGRyZXNzT2ZGbGFncygpKSk7Ci0gICAgICAg IENDYWxsSGVscGVyczo6SnVtcCBkb25lID0gaml0Lmp1bXAoKTsKLQotICAgICAgICBub3ROZWdh dGl2ZVplcm8ubGluaygmaml0KTsKLSAgICAgICAgaml0Lm9yMzIoQ0NhbGxIZWxwZXJzOjpUcnVz dGVkSW1tMzIoUmVzdWx0UHJvZmlsZTo6Tm9uTmVnWmVyb0RvdWJsZSksIENDYWxsSGVscGVyczo6 QWJzb2x1dGVBZGRyZXNzKG1fcmVzdWx0UHJvZmlsZS0+YWRkcmVzc09mRmxhZ3MoKSkpOwotCi0g ICAgICAgIGppdC5tb3ZlKG1fcmVzdWx0LnRhZ0dQUigpLCBtX3NjcmF0Y2hHUFIpOwotICAgICAg ICBqaXQudXJzaGlmdFB0cihDQ2FsbEhlbHBlcnM6OkltbTMyKDUyIC0gMzIpLCBtX3NjcmF0Y2hH UFIpOwotICAgICAgICBqaXQuYW5kMzIoQ0NhbGxIZWxwZXJzOjpJbW0zMigweDdmZiksIG1fc2Ny YXRjaEdQUik7Ci0gICAgICAgIENDYWxsSGVscGVyczo6SnVtcCBub0ludDUyT3ZlcmZsb3cgPSBq aXQuYnJhbmNoMzIoQ0NhbGxIZWxwZXJzOjpMZXNzVGhhbk9yRXF1YWwsIG1fc2NyYXRjaEdQUiwg Q0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMHg0MzEpKTsKLSAgICAgICAgCi0gICAgICAgIGpp dC5vcjMyKENDYWxsSGVscGVyczo6VHJ1c3RlZEltbTMyKFJlc3VsdFByb2ZpbGU6OkludDUyT3Zl cmZsb3cpLCBDQ2FsbEhlbHBlcnM6OkFic29sdXRlQWRkcmVzcyhtX3Jlc3VsdFByb2ZpbGUtPmFk ZHJlc3NPZkZsYWdzKCkpKTsKLQotICAgICAgICBtX2VuZEp1bXBMaXN0LmFwcGVuZChub0ludDUy T3ZlcmZsb3cpOwotICAgICAgICBtX2VuZEp1bXBMaXN0LmFwcGVuZChkb25lKTsKLSNlbmRpZgot ICAgIH0KKyAgICBqaXQuYm94RG91YmxlKG1fbGVmdEZQUiwgbV9yZXN1bHQpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NvbW1vblNsb3dQYXRocy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21t b25TbG93UGF0aHMuY3BwCmluZGV4IDZmOGM3NTQ5OTZlMzYzNGRmOWYyYjFmZjM5YTdlZjgzNDgz YWNmMjQuLmYwNjI2YTExNWZiMWMyMWI5NjdkNmY3Y2U4NGZkYjFkZTZlNzc3NDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcApAQCAt MTM1LDYgKzEzNSwxNSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgSlNWYWx1ZTo6ZW5jb2Rl KHZhbHVlKTsgICAgICAgICAgICAgICAgICBcCiAgICAgfSB3aGlsZSAoZmFsc2UpCiAKKyNkZWZp bmUgUkVUVVJOX1dJVEhfUkVTVUxUX1BST0ZJTElORyh2YWx1ZV9fKSBcCisgICAgUkVUVVJOX1dJ VEhfUFJPRklMSU5HKHZhbHVlX18sIFBST0ZJTEVfUkVTVUxUKHJldHVyblZhbHVlX18pKQorICAg IAorI2RlZmluZSBQUk9GSUxFX1JFU1VMVCh2YWx1ZV9fKSBkbyB7IFwKKyAgICAgICAgQ29kZUJs b2NrKiBjb2RlQmxvY2sgPSBleGVjLT5jb2RlQmxvY2soKTsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKKyAgICAgICAgdW5zaWduZWQgYnl0ZWNvZGVPZmZzZXQgPSBjb2RlQmxv Y2stPmJ5dGVjb2RlT2Zmc2V0KHBjKTsgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgY29k ZUJsb2NrLT51cGRhdGVSZXN1bHRQcm9maWxlRm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZz ZXQsIHZhbHVlX18pOyAgIFwKKyAgICB9IHdoaWxlIChmYWxzZSkKKwogI2RlZmluZSBDQUxMX0VO RF9JTVBMKGV4ZWMsIGNhbGxUYXJnZXQpIFJFVFVSTl9UV08oKGNhbGxUYXJnZXQpLCAoZXhlYykp CiAKICNkZWZpbmUgQ0FMTF9USFJPVyhleGVjLCBwYywgZXhjZXB0aW9uVG9UaHJvdykgZG8geyAg ICAgICAgICAgICAgICAgICAgIFwKQEAgLTM0OSw1NyArMzU4LDE5IEBAIFNMT1dfUEFUSF9ERUNM KHNsb3dfcGF0aF9uZWdhdGUpCiAgICAgUkVUVVJOKGpzTnVtYmVyKC1PUF9DKDIpLmpzVmFsdWUo KS50b051bWJlcihleGVjKSkpOwogfQogCi0jaWYgRU5BQkxFKERGR19KSVQpCi1zdGF0aWMgdm9p ZCB1cGRhdGVSZXN1bHRQcm9maWxlRm9yQmluYXJ5QXJpdGhPcChFeGVjU3RhdGUqIGV4ZWMsIElu c3RydWN0aW9uKiBwYywgSlNWYWx1ZSByZXN1bHQsIEpTVmFsdWUgbGVmdCwgSlNWYWx1ZSByaWdo dCkKLXsKLSAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9IGV4ZWMtPmNvZGVCbG9jaygpOwotICAg IHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0ID0gY29kZUJsb2NrLT5ieXRlY29kZU9mZnNldChwYyk7 Ci0gICAgUmVzdWx0UHJvZmlsZSogcHJvZmlsZSA9IGNvZGVCbG9jay0+ZW5zdXJlUmVzdWx0UHJv ZmlsZShieXRlY29kZU9mZnNldCk7Ci0KLSAgICBpZiAocmVzdWx0LmlzTnVtYmVyKCkpIHsKLSAg ICAgICAgaWYgKCFyZXN1bHQuaXNJbnQzMigpKSB7Ci0gICAgICAgICAgICBpZiAobGVmdC5pc0lu dDMyKCkgJiYgcmlnaHQuaXNJbnQzMigpKQotICAgICAgICAgICAgICAgIHByb2ZpbGUtPnNldE9i c2VydmVkSW50MzJPdmVyZmxvdygpOwotCi0gICAgICAgICAgICBkb3VibGUgZG91YmxlVmFsID0g cmVzdWx0LmFzTnVtYmVyKCk7Ci0gICAgICAgICAgICBpZiAoIWRvdWJsZVZhbCAmJiBzdGQ6OnNp Z25iaXQoZG91YmxlVmFsKSkKLSAgICAgICAgICAgICAgICBwcm9maWxlLT5zZXRPYnNlcnZlZE5l Z1plcm9Eb3VibGUoKTsKLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIHByb2Zp bGUtPnNldE9ic2VydmVkTm9uTmVnWmVyb0RvdWJsZSgpOwotCi0gICAgICAgICAgICAgICAgLy8g VGhlIEludDUyIG92ZXJmbG93IGNoZWNrIGhlcmUgaW50ZW50aW9uYWxseSBvbWl0cyAxbGwgPDwg NTEgYXMgYSB2YWxpZCBuZWdhdGl2ZSBJbnQ1MiB2YWx1ZS4KLSAgICAgICAgICAgICAgICAvLyBU aGVyZWZvcmUsIHdlIHdpbGwgZ2V0IGEgZmFsc2UgcG9zaXRpdmUgaWYgdGhlIHJlc3VsdCBpcyB0 aGF0IHZhbHVlLiBUaGlzIGlzIGludGVudGlvbmFsbHkKLSAgICAgICAgICAgICAgICAvLyBkb25l IHRvIHNpbXBsaWZ5IHRoZSBjaGVja2luZyBhbGdvcml0aG0uCi0gICAgICAgICAgICAgICAgc3Rh dGljIGNvbnN0IGludDY0X3QgaW50NTJPdmVyZmxvd1BvaW50ID0gKDFsbCA8PCA1MSk7Ci0gICAg ICAgICAgICAgICAgaW50NjRfdCBpbnQ2NFZhbCA9IHN0YXRpY19jYXN0PGludDY0X3Q+KHN0ZDo6 YWJzKGRvdWJsZVZhbCkpOwotICAgICAgICAgICAgICAgIGlmIChpbnQ2NFZhbCA+PSBpbnQ1Mk92 ZXJmbG93UG9pbnQpCi0gICAgICAgICAgICAgICAgICAgIHByb2ZpbGUtPnNldE9ic2VydmVkSW50 NTJPdmVyZmxvdygpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfSBlbHNlCi0gICAg ICAgIHByb2ZpbGUtPnNldE9ic2VydmVkTm9uTnVtYmVyKCk7Ci19Ci0jZWxzZQotc3RhdGljIHZv aWQgdXBkYXRlUmVzdWx0UHJvZmlsZUZvckJpbmFyeUFyaXRoT3AoRXhlY1N0YXRlKiwgSW5zdHJ1 Y3Rpb24qLCBKU1ZhbHVlLCBKU1ZhbHVlLCBKU1ZhbHVlKSB7IH0KLSNlbmRpZgotCiBTTE9XX1BB VEhfREVDTChzbG93X3BhdGhfYWRkKQogewogICAgIEJFR0lOKCk7CiAgICAgSlNWYWx1ZSB2MSA9 IE9QX0MoMikuanNWYWx1ZSgpOwogICAgIEpTVmFsdWUgdjIgPSBPUF9DKDMpLmpzVmFsdWUoKTsK LSAgICBKU1ZhbHVlIHJlc3VsdDsKLQorICAgIAogICAgIGlmICh2MS5pc1N0cmluZygpICYmICF2 Mi5pc09iamVjdCgpKQotICAgICAgICByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBhc1N0cmluZyh2 MSksIHYyLnRvU3RyaW5nKGV4ZWMpKTsKLSAgICBlbHNlIGlmICh2MS5pc051bWJlcigpICYmIHYy LmlzTnVtYmVyKCkpCi0gICAgICAgIHJlc3VsdCA9IGpzTnVtYmVyKHYxLmFzTnVtYmVyKCkgKyB2 Mi5hc051bWJlcigpKTsKLSAgICBlbHNlCi0gICAgICAgIHJlc3VsdCA9IGpzQWRkU2xvd0Nhc2Uo ZXhlYywgdjEsIHYyKTsKLQotICAgIFJFVFVSTl9XSVRIX1BST0ZJTElORyhyZXN1bHQsIHsKLSAg ICAgICAgdXBkYXRlUmVzdWx0UHJvZmlsZUZvckJpbmFyeUFyaXRoT3AoZXhlYywgcGMsIHJlc3Vs dCwgdjEsIHYyKTsKLSAgICB9KTsKKyAgICAgICAgUkVUVVJOX1dJVEhfUkVTVUxUX1BST0ZJTElO Ryhqc1N0cmluZyhleGVjLCBhc1N0cmluZyh2MSksIHYyLnRvU3RyaW5nKGV4ZWMpKSk7CisgICAg CisgICAgaWYgKHYxLmlzTnVtYmVyKCkgJiYgdjIuaXNOdW1iZXIoKSkKKyAgICAgICAgUkVUVVJO X1dJVEhfUkVTVUxUX1BST0ZJTElORyhqc051bWJlcih2MS5hc051bWJlcigpICsgdjIuYXNOdW1i ZXIoKSkpOworICAgIAorICAgIFJFVFVSTl9XSVRIX1JFU1VMVF9QUk9GSUxJTkcoanNBZGRTbG93 Q2FzZShleGVjLCB2MSwgdjIpKTsKIH0KIAogLy8gVGhlIGZvbGxvd2luZyBhcml0aG1ldGljIGFu ZCBiaXR3aXNlIG9wZXJhdGlvbnMgbmVlZCB0byBiZSBzdXJlIHRvIHJ1bgpAQCAtNDA5LDQwICsz ODAsMjUgQEAgU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX2FkZCkKIFNMT1dfUEFUSF9ERUNMKHNs b3dfcGF0aF9tdWwpCiB7CiAgICAgQkVHSU4oKTsKLSAgICBKU1ZhbHVlIGxlZnQgPSBPUF9DKDIp LmpzVmFsdWUoKTsKLSAgICBKU1ZhbHVlIHJpZ2h0ID0gT1BfQygzKS5qc1ZhbHVlKCk7Ci0gICAg ZG91YmxlIGEgPSBsZWZ0LnRvTnVtYmVyKGV4ZWMpOwotICAgIGRvdWJsZSBiID0gcmlnaHQudG9O dW1iZXIoZXhlYyk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihhICogYik7Ci0gICAg UkVUVVJOX1dJVEhfUFJPRklMSU5HKHJlc3VsdCwgewotICAgICAgICB1cGRhdGVSZXN1bHRQcm9m aWxlRm9yQmluYXJ5QXJpdGhPcChleGVjLCBwYywgcmVzdWx0LCBsZWZ0LCByaWdodCk7Ci0gICAg fSk7CisgICAgZG91YmxlIGEgPSBPUF9DKDIpLmpzVmFsdWUoKS50b051bWJlcihleGVjKTsKKyAg ICBkb3VibGUgYiA9IE9QX0MoMykuanNWYWx1ZSgpLnRvTnVtYmVyKGV4ZWMpOworICAgIFJFVFVS Tl9XSVRIX1JFU1VMVF9QUk9GSUxJTkcoanNOdW1iZXIoYSAqIGIpKTsKIH0KIAogU0xPV19QQVRI X0RFQ0woc2xvd19wYXRoX3N1YikKIHsKICAgICBCRUdJTigpOwotICAgIEpTVmFsdWUgbGVmdCA9 IE9QX0MoMikuanNWYWx1ZSgpOwotICAgIEpTVmFsdWUgcmlnaHQgPSBPUF9DKDMpLmpzVmFsdWUo KTsKLSAgICBkb3VibGUgYSA9IGxlZnQudG9OdW1iZXIoZXhlYyk7Ci0gICAgZG91YmxlIGIgPSBy aWdodC50b051bWJlcihleGVjKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGEgLSBi KTsKLSAgICBSRVRVUk5fV0lUSF9QUk9GSUxJTkcocmVzdWx0LCB7Ci0gICAgICAgIHVwZGF0ZVJl c3VsdFByb2ZpbGVGb3JCaW5hcnlBcml0aE9wKGV4ZWMsIHBjLCByZXN1bHQsIGxlZnQsIHJpZ2h0 KTsKLSAgICB9KTsKKyAgICBkb3VibGUgYSA9IE9QX0MoMikuanNWYWx1ZSgpLnRvTnVtYmVyKGV4 ZWMpOworICAgIGRvdWJsZSBiID0gT1BfQygzKS5qc1ZhbHVlKCkudG9OdW1iZXIoZXhlYyk7Cisg ICAgUkVUVVJOX1dJVEhfUkVTVUxUX1BST0ZJTElORyhqc051bWJlcihhIC0gYikpOwogfQogCiBT TE9XX1BBVEhfREVDTChzbG93X3BhdGhfZGl2KQogewogICAgIEJFR0lOKCk7Ci0gICAgSlNWYWx1 ZSBsZWZ0ID0gT1BfQygyKS5qc1ZhbHVlKCk7Ci0gICAgSlNWYWx1ZSByaWdodCA9IE9QX0MoMyku anNWYWx1ZSgpOwotICAgIGRvdWJsZSBhID0gbGVmdC50b051bWJlcihleGVjKTsKLSAgICBkb3Vi bGUgYiA9IHJpZ2h0LnRvTnVtYmVyKGV4ZWMpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0ganNOdW1i ZXIoYSAvIGIpOwotICAgIFJFVFVSTl9XSVRIX1BST0ZJTElORyhyZXN1bHQsIHsKLSAgICAgICAg dXBkYXRlUmVzdWx0UHJvZmlsZUZvckJpbmFyeUFyaXRoT3AoZXhlYywgcGMsIHJlc3VsdCwgbGVm dCwgcmlnaHQpOwotICAgIH0pOworICAgIGRvdWJsZSBhID0gT1BfQygyKS5qc1ZhbHVlKCkudG9O dW1iZXIoZXhlYyk7CisgICAgZG91YmxlIGIgPSBPUF9DKDMpLmpzVmFsdWUoKS50b051bWJlcihl eGVjKTsKKyAgICBSRVRVUk5fV0lUSF9SRVNVTFRfUFJPRklMSU5HKGpzTnVtYmVyKGEgLyBiKSk7 CiB9CiAKIFNMT1dfUEFUSF9ERUNMKHNsb3dfcGF0aF9tb2QpCg== 268405 2016-01-06 14:13:34 -0800 2016-01-06 14:16:34 -0800 proposed patch. bug-152805.patch text/plain 1980 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NjY1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDE2LTAxLTA2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OKHIxOTQ2MTMpOiBKSVRNdWxHZW5lcmF0b3IgbmVlZHMgYSBzY3JhdGNoIEdQUiBv biAzMi1iaXQgdG9vLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTUyODA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgT09QUy4KKworICAgICAgICBUaGVy ZSBhcmVuJ3QgZW5vdWdoIHJlZ2lzdGVycyBvbiB4ODYgMzItYml0IHRvIGFsbG9jYXRlIHRoZSBu ZWVkZWQgc2NyYXRjaCBHUFIuCisgICAgICAgIFNvLCB3ZSdsbCBjb250aW51ZSB0byB1c2Ugb25l IG9mIHRoZSByZXN1bHQgcmVnaXN0ZXJzIGFzIHRoZSBzY3JhdGNoLCBhbmQKKyAgICAgICAgcmUt Y29tcHV0ZSB0aGUgcmVzdWx0IGF0IHRoZSBlbmQuCisKKyAgICAgICAgKiBqaXQvSklUTXVsR2Vu ZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6SklUTXVsR2VuZXJhdG9yOjpnZW5lcmF0ZUZhc3RQ YXRoKToKKwogMjAxNi0wMS0wNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgogCiAgICAgICAgIEFkZCBhIHNtYXJ0IGJsb2NrIHBvaW50ZXIKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUTXVsR2VuZXJhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE11bEdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDE5NDY2NCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUTXVsR2VuZXJhdG9yLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzUsOCArMzUsOSBAQCB2b2lkIEpJVE11bEdlbmVyYXRvcjo6Z2VuZXJhdGVG YXN0UGF0aChDCiAgICAgQVNTRVJUKG1fc2NyYXRjaEdQUiAhPSBJbnZhbGlkR1BSUmVnKTsKICAg ICBBU1NFUlQobV9zY3JhdGNoR1BSICE9IG1fbGVmdC5wYXlsb2FkR1BSKCkpOwogICAgIEFTU0VS VChtX3NjcmF0Y2hHUFIgIT0gbV9yaWdodC5wYXlsb2FkR1BSKCkpOworI2lmIFVTRShKU1ZBTFVF NjQpCiAgICAgQVNTRVJUKG1fc2NyYXRjaEdQUiAhPSBtX3Jlc3VsdC5wYXlsb2FkR1BSKCkpOwot I2lmIFVTRShKU1ZBTFVFMzJfNjQpCisjZWxzZQogICAgIEFTU0VSVChtX3NjcmF0Y2hHUFIgIT0g bV9sZWZ0LnRhZ0dQUigpKTsKICAgICBBU1NFUlQobV9zY3JhdGNoR1BSICE9IG1fcmlnaHQudGFn R1BSKCkpOwogICAgIEFTU0VSVChtX3NjcmF0Y2hGUFIgIT0gSW52YWxpZEZQUlJlZyk7CkBAIC0x ODAsNiArMTgxLDkgQEAgdm9pZCBKSVRNdWxHZW5lcmF0b3I6OmdlbmVyYXRlRmFzdFBhdGgoQwog ICAgICAgICBqaXQub3IzMihDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW0zMihSZXN1bHRQcm9maWxl OjpJbnQ1Mk92ZXJmbG93KSwgQ0NhbGxIZWxwZXJzOjpBYnNvbHV0ZUFkZHJlc3MobV9yZXN1bHRQ cm9maWxlLT5hZGRyZXNzT2ZGbGFncygpKSk7CiAKICAgICAgICAgbV9lbmRKdW1wTGlzdC5hcHBl bmQobm9JbnQ1Mk92ZXJmbG93KTsKKyAgICAgICAgaWYgKG1fc2NyYXRjaEdQUiA9PSBtX3Jlc3Vs dC50YWdHUFIoKSB8fCBtX3NjcmF0Y2hHUFIgPT0gbV9yZXN1bHQucGF5bG9hZEdQUigpKQorICAg ICAgICAgICAgaml0LmJveERvdWJsZShtX2xlZnRGUFIsIG1fcmVzdWx0KTsKKwogICAgICAgICBt X2VuZEp1bXBMaXN0LmFwcGVuZChkb25lKTsKICNlbmRpZgogICAgIH0K