137621 2014-10-10 12:55:06 -0700 REGRESSION(r174606): broke a JSC test (Requested by estes on #webkit). 2014-10-10 13:30:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137617 1 commit-queue commit-queue msaboff oliver oldest_to_newest 1040998 0 commit-queue 2014-10-10 12:55:06 -0700 http://trac.webkit.org/changeset/174606 broke the build: broke a JSC test (Requested by estes 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. 1041000 1 239643 commit-queue 2014-10-10 12:55:31 -0700 Created attachment 239643 ROLLOUT of r174606 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. 1041009 2 239643 commit-queue 2014-10-10 13:30:36 -0700 Comment on attachment 239643 ROLLOUT of r174606 Clearing flags on attachment: 239643 Committed r174610: <http://trac.webkit.org/changeset/174610> 1041010 3 commit-queue 2014-10-10 13:30:38 -0700 All reviewed patches have been landed. Closing bug. 239643 2014-10-10 12:55:31 -0700 2014-10-10 13:30:36 -0700 ROLLOUT of r174606 bug-137621-20141010125534.patch text/plain 20483 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZTA1NTAwMzBlNGFlYzFkYTEyYjc2M2JkZmE4ZmY4ODgxMzg5ZjkwLi40ZWUyMDEyZDUxM2Y5MWJl ZmM0YTdjYmNiZjI0MGRmMGJlNjcwOWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNC0xMC0xMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE3NDYwNi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzYyMQorCisgICAg ICAgIGJyb2tlIGEgSlNDIHRlc3QgKFJlcXVlc3RlZCBieSBlc3RlcyBvbiAjd2Via2l0KS4KKwor ICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIlZhcmlvdXMgYXJndW1lbnRz IG9wdGltaXNhdGlvbnMgaW4gY29kZWdlbiBmYWlsIHRvIGFjY291bnQKKyAgICAgICAgZm9yIGFy Z3VtZW50cyBiZWluZyBpbiBsZXhpY2FsIHJlY29yZCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzYxNworICAgICAgICBodHRwOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8xNzQ2MDYKKwogMjAxNC0xMC0xMCAgT2xpdmVyIEh1bnQgIDxvbGl2 ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFZhcmlvdXMgYXJndW1lbnRzIG9wdGltaXNhdGlvbnMg aW4gY29kZWdlbiBmYWlsIHRvIGFjY291bnQgZm9yIGFyZ3VtZW50cyBiZWluZyBpbiBsZXhpY2Fs IHJlY29yZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVC bG9jay5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcApp bmRleCA1YTcwYjI4NGY0ODZkZDE2MTVkMGY4YmJlM2RmN2VjMmI1ZTgzODYyLi5iOTBhMDVlZGNh OGY4ZTdiZmJlNzg5ZjNmYzFmOGEwY2YxYmI2YzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcApAQCAtMzg4Nyw4ICszODg3LDYgQEAgc3RydWN0IFZl cmlmeUNhcHR1cmVkRGVmIHsKIAogICAgICAgICBpZiAoY29kZUJsb2NrLT51c2VzQXJndW1lbnRz KCkgJiYgdmlydHVhbFJlZyA9PSBjb2RlQmxvY2stPmFyZ3VtZW50c1JlZ2lzdGVyKCkpCiAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmIChjb2RlQmxvY2stPnVzZXNBcmd1bWVudHMoKSAm JiB2aXJ0dWFsUmVnID09IHVubW9kaWZpZWRBcmd1bWVudHNSZWdpc3Rlcihjb2RlQmxvY2stPmFy Z3VtZW50c1JlZ2lzdGVyKCkpKQotICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChj b2RlQmxvY2stPmNhcHR1cmVDb3VudCgpICYmIGNvZGVCbG9jay0+c3ltYm9sVGFibGUoKS0+aXND YXB0dXJlZChvcGVyYW5kKSkgewogICAgICAgICAgICAgY29kZUJsb2NrLT5iZWdpblZhbGlkYXRp b25EaWRGYWlsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBp bGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCmluZGV4IDMyN2I1ZDg1ZjBiMzBhMjAyMzUwZDFh OTY5NWNlNTJiMDExN2Q0ZWIuLmY1NjljZGI3NzlkMzY5MzlhMGE4MzZjZmRhOTdmYzViNmYwNmVk YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNv ZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIv Qnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC0xNjcsNyArMTY3LDYgQEAgQnl0ZWNvZGVHZW5lcmF0 b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJiB2bSwgUHJvZ3JhbU5vZGUqIHByb2dyYW1Ob2RlLCBV bmxpbmtlZFAKICAgICAsIG1fbGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXIoMCkKICAgICAsIG1f ZW1wdHlWYWx1ZVJlZ2lzdGVyKDApCiAgICAgLCBtX2dsb2JhbE9iamVjdFJlZ2lzdGVyKDApCi0g ICAgLCBtX2xvY2FsQXJndW1lbnRzUmVnaXN0ZXIoMCkKICAgICAsIG1fZmluYWxseURlcHRoKDAp CiAgICAgLCBtX2xvY2FsU2NvcGVEZXB0aCgwKQogICAgICwgbV9jb2RlVHlwZShHbG9iYWxDb2Rl KQpAQCAtMjEyLDcgKzIxMSw2IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRv cihWTSYgdm0sIEZ1bmN0aW9uQm9keU5vZGUqIGZ1bmN0aW9uQm9keSwgVW5sCiAgICAgLCBtX2xl eGljYWxFbnZpcm9ubWVudFJlZ2lzdGVyKDApCiAgICAgLCBtX2VtcHR5VmFsdWVSZWdpc3Rlcigw KQogICAgICwgbV9nbG9iYWxPYmplY3RSZWdpc3RlcigwKQotICAgICwgbV9sb2NhbEFyZ3VtZW50 c1JlZ2lzdGVyKDApCiAgICAgLCBtX2ZpbmFsbHlEZXB0aCgwKQogICAgICwgbV9sb2NhbFNjb3Bl RGVwdGgoMCkKICAgICAsIG1fY29kZVR5cGUoRnVuY3Rpb25Db2RlKQpAQCAtMjUyLDcgKzI1MCw2 IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYgdm0sIEZ1bmN0aW9u Qm9keU5vZGUqIGZ1bmN0aW9uQm9keSwgVW5sCiAgICAgICAgIGVtaXRPcGNvZGUob3BfY3JlYXRl X2xleGljYWxfZW52aXJvbm1lbnQpOwogICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobV9s ZXhpY2FsRW52aXJvbm1lbnRSZWdpc3Rlci0+aW5kZXgoKSk7CiAgICAgfQotICAgIFJlZ2lzdGVy SUQqIGxvY2FsQXJndW1lbnRzUmVnaXN0ZXIgPSBudWxscHRyOwogICAgIFJlZ2lzdGVySUQqIHNj cmF0Y2ggPSBhZGRWYXIoKTsKICAgICBtX3N5bWJvbFRhYmxlLT5zZXRDYXB0dXJlU3RhcnQodmly dHVhbFJlZ2lzdGVyRm9yTG9jYWwobV9jb2RlQmxvY2stPm1fbnVtVmFycykub2Zmc2V0KCkpOwog CkBAIC0yNjAsOCArMjU3LDYgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9y KFZNJiB2bSwgRnVuY3Rpb25Cb2R5Tm9kZSogZnVuY3Rpb25Cb2R5LCBVbmwKICAgICAgICAgUmVn aXN0ZXJJRCogdW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyID0gYWRkVmFyKCk7IC8vIEFub255 bW91cywgc28gaXQgY2FuJ3QgYmUgbW9kaWZpZWQgYnkgdXNlciBjb2RlLgogICAgICAgICBSZWdp c3RlcklEKiBhcmd1bWVudHNSZWdpc3RlciA9IGFkZFZhcihwcm9wZXJ0eU5hbWVzKCkuYXJndW1l bnRzLCBJc1ZhcmlhYmxlLCBOb3RXYXRjaGFibGUpOyAvLyBDYW4gYmUgY2hhbmdlZCBieSBhc3Np Z25pbmcgdG8gJ2FyZ3VtZW50cycuCiAKLSAgICAgICAgbG9jYWxBcmd1bWVudHNSZWdpc3RlciA9 IGFyZ3VtZW50c1JlZ2lzdGVyOwotCiAgICAgICAgIC8vIFdlIGNhbiBzYXZlIGEgbGl0dGxlIHNw YWNlIGJ5IGhhcmQtY29kaW5nIHRoZSBrbm93bGVkZ2UgdGhhdCB0aGUgdHdvCiAgICAgICAgIC8v ICdhcmd1bWVudHMnIHZhbHVlcyBhcmUgc3RvcmVkIGluIGNvbnNlY3V0aXZlIHJlZ2lzdGVycywg YW5kIHN0b3JpbmcKICAgICAgICAgLy8gb25seSB0aGUgaW5kZXggb2YgdGhlIGFzc2lnbmFibGUg b25lLgpAQCAtMjc5LDE1ICsyNzQsNiBAQCBCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5l cmF0b3IoVk0mIHZtLCBGdW5jdGlvbkJvZHlOb2RlKiBmdW5jdGlvbkJvZHksIFVubAogICAgICAg ICAgICAgICAgIGluaXRpYWxpemVDYXB0dXJlZFZhcmlhYmxlKGFyZ3VtZW50c1JlZ2lzdGVyLCBw cm9wZXJ0eU5hbWVzKCkuYXJndW1lbnRzLCBhcmd1bWVudHNSZWdpc3Rlcik7CiAgICAgICAgICAg ICAgICAgUmVnaXN0ZXJJRCogdW5jaGVja2VkQXJndW1lbnRzUmVnaXN0ZXIgPSAmcmVnaXN0ZXJG b3IoSlNDOjp1bm1vZGlmaWVkQXJndW1lbnRzUmVnaXN0ZXIobV9jb2RlQmxvY2stPmFyZ3VtZW50 c1JlZ2lzdGVyKCkpLm9mZnNldCgpKTsKICAgICAgICAgICAgICAgICBpbml0aWFsaXplQ2FwdHVy ZWRWYXJpYWJsZSh1bmNoZWNrZWRBcmd1bWVudHNSZWdpc3RlciwgcHJvcGVydHlOYW1lcygpLmFy Z3VtZW50cywgdW5jaGVja2VkQXJndW1lbnRzUmVnaXN0ZXIpOwotICAgICAgICAgICAgICAgIGlm IChmdW5jdGlvbkJvZHktPm1vZGlmaWVzQXJndW1lbnRzKCkpIHsKLSAgICAgICAgICAgICAgICAg ICAgZW1pdE9wY29kZShvcF9tb3YpOwotICAgICAgICAgICAgICAgICAgICBpbnN0cnVjdGlvbnMo KS5hcHBlbmQoYXJndW1lbnRzUmVnaXN0ZXItPmluZGV4KCkpOwotICAgICAgICAgICAgICAgICAg ICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoYWRkQ29uc3RhbnRWYWx1ZShqc1VuZGVmaW5lZCgpKS0+ aW5kZXgoKSk7Ci0gICAgICAgICAgICAgICAgICAgIGVtaXRPcGNvZGUob3BfbW92KTsKLSAgICAg ICAgICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKHVuY2hlY2tlZEFyZ3VtZW50c1Jl Z2lzdGVyLT5pbmRleCgpKTsKLSAgICAgICAgICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBw ZW5kKGFkZENvbnN0YW50VmFsdWUoanNVbmRlZmluZWQoKSktPmluZGV4KCkpOwotICAgICAgICAg ICAgICAgICAgICBsb2NhbEFyZ3VtZW50c1JlZ2lzdGVyID0gbnVsbHB0cjsKLSAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC00MDAsNyArMzg2LDYg QEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJiB2bSwgRnVuY3Rpb25C b2R5Tm9kZSogZnVuY3Rpb25Cb2R5LCBVbmwKICAgICBpbnQgbmV4dFBhcmFtZXRlckluZGV4ID0g Q2FsbEZyYW1lOjp0aGlzQXJndW1lbnRPZmZzZXQoKTsKICAgICBtX3RoaXNSZWdpc3Rlci5zZXRJ bmRleChuZXh0UGFyYW1ldGVySW5kZXgrKyk7CiAgICAgbV9jb2RlQmxvY2stPmFkZFBhcmFtZXRl cigpOwotCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwYXJhbWV0ZXJzLnNpemUoKTsgKytp LCArK25leHRQYXJhbWV0ZXJJbmRleCkgewogICAgICAgICBpbnQgaW5kZXggPSBuZXh0UGFyYW1l dGVySW5kZXg7CiAgICAgICAgIGF1dG8gcGF0dGVybiA9IHBhcmFtZXRlcnMuYXQoaSk7CkBAIC00 MzQsNyArNDE5LDYgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJiB2 bSwgRnVuY3Rpb25Cb2R5Tm9kZSogZnVuY3Rpb25Cb2R5LCBVbmwKICAgICAgICAgaW5zdHJ1Y3Rp b25zKCkuYXBwZW5kKDApOwogICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoMCk7CiAgICAg fQotICAgIG1fbG9jYWxBcmd1bWVudHNSZWdpc3RlciA9IGxvY2FsQXJndW1lbnRzUmVnaXN0ZXI7 CiB9CiAKIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYgdm0sIEV2YWxO b2RlKiBldmFsTm9kZSwgVW5saW5rZWRFdmFsQ29kZUJsb2NrKiBjb2RlQmxvY2ssIERlYnVnZ2Vy TW9kZSBkZWJ1Z2dlck1vZGUsIFByb2ZpbGVyTW9kZSBwcm9maWxlck1vZGUpCkBAIC00NDcsNyAr NDMxLDYgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJiB2bSwgRXZh bE5vZGUqIGV2YWxOb2RlLCBVbmxpbmtlZEV2YWxDb2QKICAgICAsIG1fbGV4aWNhbEVudmlyb25t ZW50UmVnaXN0ZXIoMCkKICAgICAsIG1fZW1wdHlWYWx1ZVJlZ2lzdGVyKDApCiAgICAgLCBtX2ds b2JhbE9iamVjdFJlZ2lzdGVyKDApCi0gICAgLCBtX2xvY2FsQXJndW1lbnRzUmVnaXN0ZXIoMCkK ICAgICAsIG1fZmluYWxseURlcHRoKDApCiAgICAgLCBtX2xvY2FsU2NvcGVEZXB0aCgwKQogICAg ICwgbV9jb2RlVHlwZShFdmFsQ29kZSkKQEAgLTU2MiwxNyArNTQ1LDE5IEBAIGJvb2wgQnl0ZWNv ZGVHZW5lcmF0b3I6OndpbGxSZXNvbHZlVG9Bcmd1bWVudHMoY29uc3QgSWRlbnRpZmllciYgaWRl bnQpCiAgICAgaWYgKGVudHJ5LmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBpZiAobV9jb2RlQmxvY2stPnVzZXNBcmd1bWVudHMoKSAmJiBtX2NvZGVUeXBlID09IEZ1bmN0 aW9uQ29kZSAmJiBtX2xvY2FsQXJndW1lbnRzUmVnaXN0ZXIpCisgICAgaWYgKG1fY29kZUJsb2Nr LT51c2VzQXJndW1lbnRzKCkgJiYgbV9jb2RlVHlwZSA9PSBGdW5jdGlvbkNvZGUpCiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotUmVnaXN0ZXJJRCog Qnl0ZWNvZGVHZW5lcmF0b3I6OnVuY2hlY2tlZExvY2FsQXJndW1lbnRzUmVnaXN0ZXIoKQorUmVn aXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OnVuY2hlY2tlZFJlZ2lzdGVyRm9yQXJndW1lbnRz KCkKIHsKICAgICBBU1NFUlQod2lsbFJlc29sdmVUb0FyZ3VtZW50cyhwcm9wZXJ0eU5hbWVzKCku YXJndW1lbnRzKSk7Ci0gICAgQVNTRVJUKG1fbG9jYWxBcmd1bWVudHNSZWdpc3Rlcik7Ci0gICAg cmV0dXJuIG1fbG9jYWxBcmd1bWVudHNSZWdpc3RlcjsKKworICAgIFN5bWJvbFRhYmxlRW50cnkg ZW50cnkgPSBzeW1ib2xUYWJsZSgpLmdldChwcm9wZXJ0eU5hbWVzKCkuYXJndW1lbnRzLmltcGwo KSk7CisgICAgQVNTRVJUKCFlbnRyeS5pc051bGwoKSk7CisgICAgcmV0dXJuICZyZWdpc3RlckZv cihlbnRyeS5nZXRJbmRleCgpKTsKIH0KIAogUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6 OmNyZWF0ZUxhenlSZWdpc3RlcklmTmVjZXNzYXJ5KFJlZ2lzdGVySUQqIHJlZykKQEAgLTE4NDMs NyArMTgyOCw3IEBAIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0Q2FsbChPcGNv ZGVJRCBvcGNvZGVJRCwgUmVnaXN0ZXJJRCogZHN0LCBSZWdpCiAgICAgICAgICAgICBhdXRvIGV4 cHJlc3Npb24gPSBzdGF0aWNfY2FzdDxTcHJlYWRFeHByZXNzaW9uTm9kZSo+KG4tPm1fZXhwcikt PmV4cHJlc3Npb24oKTsKICAgICAgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBhcmd1bWVudFJl Z2lzdGVyOwogICAgICAgICAgICAgaWYgKGV4cHJlc3Npb24tPmlzUmVzb2x2ZU5vZGUoKSAmJiB3 aWxsUmVzb2x2ZVRvQXJndW1lbnRzKHN0YXRpY19jYXN0PFJlc29sdmVOb2RlKj4oZXhwcmVzc2lv biktPmlkZW50aWZpZXIoKSkgJiYgIXN5bWJvbFRhYmxlKCkuc2xvd0FyZ3VtZW50cygpKQotICAg ICAgICAgICAgICAgIGFyZ3VtZW50UmVnaXN0ZXIgPSB1bmNoZWNrZWRMb2NhbEFyZ3VtZW50c1Jl Z2lzdGVyKCk7CisgICAgICAgICAgICAgICAgYXJndW1lbnRSZWdpc3RlciA9IHVuY2hlY2tlZFJl Z2lzdGVyRm9yQXJndW1lbnRzKCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg YXJndW1lbnRSZWdpc3RlciA9IGV4cHJlc3Npb24tPmVtaXRCeXRlY29kZSgqdGhpcywgY2FsbEFy Z3VtZW50cy5hcmd1bWVudFJlZ2lzdGVyKDApKTsKICAgICAgICAgICAgIFJlZlB0cjxSZWdpc3Rl cklEPiB0aGlzUmVnaXN0ZXIgPSBlbWl0TW92ZShuZXdUZW1wb3JhcnkoKSwgY2FsbEFyZ3VtZW50 cy50aGlzUmVnaXN0ZXIoKSk7CkBAIC0xOTg1LDcgKzE5NzAsNyBAQCBSZWdpc3RlcklEKiBCeXRl Y29kZUdlbmVyYXRvcjo6ZW1pdENvbnN0cnVjdChSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQq IGZ1bmMsCiAgICAgICAgICAgICBhdXRvIGV4cHJlc3Npb24gPSBzdGF0aWNfY2FzdDxTcHJlYWRF eHByZXNzaW9uTm9kZSo+KG4tPm1fZXhwciktPmV4cHJlc3Npb24oKTsKICAgICAgICAgICAgIFJl ZlB0cjxSZWdpc3RlcklEPiBhcmd1bWVudFJlZ2lzdGVyOwogICAgICAgICAgICAgaWYgKGV4cHJl c3Npb24tPmlzUmVzb2x2ZU5vZGUoKSAmJiB3aWxsUmVzb2x2ZVRvQXJndW1lbnRzKHN0YXRpY19j YXN0PFJlc29sdmVOb2RlKj4oZXhwcmVzc2lvbiktPmlkZW50aWZpZXIoKSkgJiYgIXN5bWJvbFRh YmxlKCkuc2xvd0FyZ3VtZW50cygpKQotICAgICAgICAgICAgICAgIGFyZ3VtZW50UmVnaXN0ZXIg PSB1bmNoZWNrZWRMb2NhbEFyZ3VtZW50c1JlZ2lzdGVyKCk7CisgICAgICAgICAgICAgICAgYXJn dW1lbnRSZWdpc3RlciA9IHVuY2hlY2tlZFJlZ2lzdGVyRm9yQXJndW1lbnRzKCk7CiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgYXJndW1lbnRSZWdpc3RlciA9IGV4cHJlc3Npb24t PmVtaXRCeXRlY29kZSgqdGhpcywgY2FsbEFyZ3VtZW50cy5hcmd1bWVudFJlZ2lzdGVyKDApKTsK ICAgICAgICAgICAgIHJldHVybiBlbWl0Q29uc3RydWN0VmFyYXJncyhkc3QsIGZ1bmMsIGFyZ3Vt ZW50UmVnaXN0ZXIuZ2V0KCksIG5ld1RlbXBvcmFyeSgpLCAwLCBjYWxsQXJndW1lbnRzLnByb2Zp bGVIb29rUmVnaXN0ZXIoKSwgZGl2b3QsIGRpdm90U3RhcnQsIGRpdm90RW5kKTsKQEAgLTI1NTMs MTMgKzI1MzgsMTMgQEAgdm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEVudW1lcmF0aW9uKFRo cm93YWJsZUV4cHJlc3Npb25EYXRhKiBub2RlLCBFeHByZXNzaW8KICAgICAgICAgZW1pdEp1bXAo bG9vcENvbmRpdGlvbi5nZXQoKSk7CiAgICAgICAgIGVtaXRMYWJlbChsb29wU3RhcnQuZ2V0KCkp OwogICAgICAgICBlbWl0TG9vcEhpbnQoKTsKLSAgICAgICAgZW1pdEdldEFyZ3VtZW50QnlWYWwo dmFsdWUuZ2V0KCksIHVuY2hlY2tlZExvY2FsQXJndW1lbnRzUmVnaXN0ZXIoKSwgaW5kZXguZ2V0 KCkpOworICAgICAgICBlbWl0R2V0QXJndW1lbnRCeVZhbCh2YWx1ZS5nZXQoKSwgdW5jaGVja2Vk UmVnaXN0ZXJGb3JBcmd1bWVudHMoKSwgaW5kZXguZ2V0KCkpOwogICAgICAgICBjYWxsQmFjaygq dGhpcywgdmFsdWUuZ2V0KCkpOwogICAgIAogICAgICAgICBlbWl0TGFiZWwoc2NvcGUtPmNvbnRp bnVlVGFyZ2V0KCkpOwogICAgICAgICBlbWl0SW5jKGluZGV4LmdldCgpKTsKICAgICAgICAgZW1p dExhYmVsKGxvb3BDb25kaXRpb24uZ2V0KCkpOwotICAgICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4g bGVuZ3RoID0gZW1pdEdldEFyZ3VtZW50c0xlbmd0aChuZXdUZW1wb3JhcnkoKSwgdW5jaGVja2Vk TG9jYWxBcmd1bWVudHNSZWdpc3RlcigpKTsKKyAgICAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IGxl bmd0aCA9IGVtaXRHZXRBcmd1bWVudHNMZW5ndGgobmV3VGVtcG9yYXJ5KCksIHVuY2hlY2tlZFJl Z2lzdGVyRm9yQXJndW1lbnRzKCkpOwogICAgICAgICBlbWl0SnVtcElmVHJ1ZShlbWl0RXF1YWxp dHlPcChvcF9sZXNzLCBuZXdUZW1wb3JhcnkoKSwgaW5kZXguZ2V0KCksIGxlbmd0aC5nZXQoKSks IGxvb3BTdGFydC5nZXQoKSk7CiAgICAgICAgIGVtaXRMYWJlbChzY29wZS0+YnJlYWtUYXJnZXQo KSk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAppbmRleCA0NmQ1OTBkZTcwMTZhMTJkMzYz Zjk0NjAxM2UyMTgyZmQ0YWNiYzMyLi5mN2IxNDgxYTM0MGFjNzdkOTE0YjVmYjBhMWExMWNmYTNi YjM5NWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5 dGVjb2RlR2VuZXJhdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5oCkBAIC0yNzcsOSArMjc3LDcgQEAgbmFtZXNwYWNlIEpTQyB7 CiAgICAgICAgIHZvaWQgc2V0SXNOdW1lcmljQ29tcGFyZUZ1bmN0aW9uKGJvb2wgaXNOdW1lcmlj Q29tcGFyZUZ1bmN0aW9uKTsKIAogICAgICAgICBib29sIHdpbGxSZXNvbHZlVG9Bcmd1bWVudHMo Y29uc3QgSWRlbnRpZmllciYpOwotCi0gICAgICAgIGJvb2wgaGFzU2FmZUxvY2FsQXJndW1lbnRz UmVnaXN0ZXIoKSB7IHJldHVybiBtX2xvY2FsQXJndW1lbnRzUmVnaXN0ZXI7IH0KLSAgICAgICAg UmVnaXN0ZXJJRCogdW5jaGVja2VkTG9jYWxBcmd1bWVudHNSZWdpc3RlcigpOworICAgICAgICBS ZWdpc3RlcklEKiB1bmNoZWNrZWRSZWdpc3RlckZvckFyZ3VtZW50cygpOwogCiAgICAgICAgIGJv b2wgaXNDYXB0dXJlZChpbnQgb3BlcmFuZCk7CiAgICAgICAgIENhcHR1cmVNb2RlIGNhcHR1cmVN b2RlKGludCBvcGVyYW5kKSB7IHJldHVybiBpc0NhcHR1cmVkKG9wZXJhbmQpID8gSXNDYXB0dXJl ZCA6IE5vdENhcHR1cmVkOyB9CkBAIC03NTQsOCArNzUyLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIFJlZ2lzdGVySUQqIG1fbGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXI7CiAgICAgICAg IFJlZ2lzdGVySUQqIG1fZW1wdHlWYWx1ZVJlZ2lzdGVyOwogICAgICAgICBSZWdpc3RlcklEKiBt X2dsb2JhbE9iamVjdFJlZ2lzdGVyOwotICAgICAgICBSZWdpc3RlcklEKiBtX2xvY2FsQXJndW1l bnRzUmVnaXN0ZXI7Ci0KICAgICAgICAgVmVjdG9yPElkZW50aWZpZXIsIDE2PiBtX3dhdGNoYWJs ZVZhcmlhYmxlczsKICAgICAgICAgU2VnbWVudGVkVmVjdG9yPFJlZ2lzdGVySUQsIDMyPiBtX2Nv bnN0YW50UG9vbFJlZ2lzdGVyczsKICAgICAgICAgU2VnbWVudGVkVmVjdG9yPFJlZ2lzdGVySUQs IDMyPiBtX2NhbGxlZVJlZ2lzdGVyczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAppbmRleCBiOTkyYmM2MjBlNjZiYTJhOWYzYTYx NTdiOTM5ZjU4YTgyMGVjZDFjLi40YjRlNWE3MGFkYjc0ZWFhMjUzNzMyZTU0MDdiZmYzYjcyNzg2 NTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVz Q29kZWdlbi5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rl c0NvZGVnZW4uY3BwCkBAIC0zODYsNyArMzg2LDcgQEAgUmVnaXN0ZXJJRCogQnJhY2tldEFjY2Vz c29yTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2kK ICAgICAgICAgJiYgIWdlbmVyYXRvci5zeW1ib2xUYWJsZSgpLnNsb3dBcmd1bWVudHMoKSkgewog ICAgICAgICBSZWdpc3RlcklEKiBwcm9wZXJ0eSA9IGdlbmVyYXRvci5lbWl0Tm9kZShtX3N1YnNj cmlwdCk7CiAgICAgICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgZGl2 b3RTdGFydCgpLCBkaXZvdEVuZCgpKTsKLSAgICAgICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0R2V0 QXJndW1lbnRCeVZhbChnZW5lcmF0b3IuZmluYWxEZXN0aW5hdGlvbihkc3QpLCBnZW5lcmF0b3Iu dW5jaGVja2VkTG9jYWxBcmd1bWVudHNSZWdpc3RlcigpLCBwcm9wZXJ0eSk7CisgICAgICAgIHJl dHVybiBnZW5lcmF0b3IuZW1pdEdldEFyZ3VtZW50QnlWYWwoZ2VuZXJhdG9yLmZpbmFsRGVzdGlu YXRpb24oZHN0KSwgZ2VuZXJhdG9yLnVuY2hlY2tlZFJlZ2lzdGVyRm9yQXJndW1lbnRzKCksIHBy b3BlcnR5KTsKICAgICB9CiAKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gYmFzZSA9IGdlbmVyYXRv ci5lbWl0Tm9kZUZvckxlZnRIYW5kU2lkZShtX2Jhc2UsIG1fc3Vic2NyaXB0SGFzQXNzaWdubWVu dHMsIG1fc3Vic2NyaXB0LT5pc1B1cmUoZ2VuZXJhdG9yKSk7CkBAIC00MTIsNyArNDEyLDcgQEAg UmVnaXN0ZXJJRCogRG90QWNjZXNzb3JOb2RlOjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0 b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXIKICAgICAgICAgaWYgKCFnZW5lcmF0b3Iud2lsbFJlc29s dmVUb0FyZ3VtZW50cyhyZXNvbHZlTm9kZS0+aWRlbnRpZmllcigpKSkKICAgICAgICAgICAgIGdv dG8gbm9uQXJndW1lbnRzUGF0aDsKICAgICAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5m byhkaXZvdCgpLCBkaXZvdFN0YXJ0KCksIGRpdm90RW5kKCkpOwotICAgICAgICByZXR1cm4gZ2Vu ZXJhdG9yLmVtaXRHZXRBcmd1bWVudHNMZW5ndGgoZ2VuZXJhdG9yLmZpbmFsRGVzdGluYXRpb24o ZHN0KSwgZ2VuZXJhdG9yLnVuY2hlY2tlZExvY2FsQXJndW1lbnRzUmVnaXN0ZXIoKSk7CisgICAg ICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdEdldEFyZ3VtZW50c0xlbmd0aChnZW5lcmF0b3IuZmlu YWxEZXN0aW5hdGlvbihkc3QpLCBnZW5lcmF0b3IudW5jaGVja2VkUmVnaXN0ZXJGb3JBcmd1bWVu dHMoKSk7CiAgICAgfQogCiBub25Bcmd1bWVudHNQYXRoOgpAQCAtNTkzLDcgKzU5Myw3IEBAIHN0 YXRpYyBSZWdpc3RlcklEKiBnZXRBcmd1bWVudEJ5VmFsKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5l cmF0b3IsIEV4cHJlc3Npb25Ob2RlCiAgICAgICAgICYmIGdlbmVyYXRvci53aWxsUmVzb2x2ZVRv QXJndW1lbnRzKHN0YXRpY19jYXN0PFJlc29sdmVOb2RlKj4oYmFzZSktPmlkZW50aWZpZXIoKSkK ICAgICAgICAgJiYgIWdlbmVyYXRvci5zeW1ib2xUYWJsZSgpLnNsb3dBcmd1bWVudHMoKSkgewog ICAgICAgICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25JbmZvKGRpdm90LCBkaXZvdFN0YXJ0LCBk aXZvdEVuZCk7Ci0gICAgICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdEdldEFyZ3VtZW50QnlWYWwo Z2VuZXJhdG9yLmZpbmFsRGVzdGluYXRpb24oZHN0KSwgZ2VuZXJhdG9yLnVuY2hlY2tlZExvY2Fs QXJndW1lbnRzUmVnaXN0ZXIoKSwgcHJvcGVydHkpOworICAgICAgICByZXR1cm4gZ2VuZXJhdG9y LmVtaXRHZXRBcmd1bWVudEJ5VmFsKGdlbmVyYXRvci5maW5hbERlc3RpbmF0aW9uKGRzdCksIGdl bmVyYXRvci51bmNoZWNrZWRSZWdpc3RlckZvckFyZ3VtZW50cygpLCBwcm9wZXJ0eSk7CiAgICAg fQogICAgIHJldHVybiBudWxscHRyOwogfQpAQCAtNjIxLDcgKzYyMSw3IEBAIFJlZ2lzdGVySUQq IENhbGxGdW5jdGlvbkNhbGxEb3ROb2RlOjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3Im IGdlbmVyYXRvciwKICAgICAgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiB0aGlzUmVnaXN0ZXIg PSBnZXRBcmd1bWVudEJ5VmFsKGdlbmVyYXRvciwgc3ViamVjdCwgZ2VuZXJhdG9yLmVtaXRMb2Fk KDAsIGpzTnVtYmVyKDApKSwgMCwgc3ByZWFkLT5kaXZvdCgpLCBzcHJlYWQtPmRpdm90U3RhcnQo KSwgc3ByZWFkLT5kaXZvdEVuZCgpKTsKICAgICAgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBh cmd1bWVudHNSZWdpc3RlcjsKICAgICAgICAgICAgIGlmICh0aGlzUmVnaXN0ZXIpCi0gICAgICAg ICAgICAgICAgYXJndW1lbnRzUmVnaXN0ZXIgPSBnZW5lcmF0b3IudW5jaGVja2VkTG9jYWxBcmd1 bWVudHNSZWdpc3RlcigpOworICAgICAgICAgICAgICAgIGFyZ3VtZW50c1JlZ2lzdGVyID0gZ2Vu ZXJhdG9yLnVuY2hlY2tlZFJlZ2lzdGVyRm9yQXJndW1lbnRzKCk7CiAgICAgICAgICAgICBlbHNl IHsKICAgICAgICAgICAgICAgICBhcmd1bWVudHNSZWdpc3RlciA9IGdlbmVyYXRvci5lbWl0Tm9k ZShzdWJqZWN0KTsKICAgICAgICAgICAgICAgICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25JbmZv KHNwcmVhZC0+ZGl2b3QoKSwgc3ByZWFkLT5kaXZvdFN0YXJ0KCksIHNwcmVhZC0+ZGl2b3RFbmQo KSk7CkBAIC03NDksNyArNzQ5LDcgQEAgUmVnaXN0ZXJJRCogQXBwbHlGdW5jdGlvbkNhbGxEb3RO b2RlOjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwKICAgICAgICAg UmVmUHRyPFJlZ2lzdGVySUQ+IGFyZ3NSZWdpc3RlcjsKICAgICAgICAgQXJndW1lbnRMaXN0Tm9k ZSogYXJncyA9IG1fYXJncy0+bV9saXN0Tm9kZS0+bV9uZXh0OwogICAgICAgICBpZiAoYXJncy0+ bV9leHByLT5pc1Jlc29sdmVOb2RlKCkgJiYgZ2VuZXJhdG9yLndpbGxSZXNvbHZlVG9Bcmd1bWVu dHMoc3RhdGljX2Nhc3Q8UmVzb2x2ZU5vZGUqPihhcmdzLT5tX2V4cHIpLT5pZGVudGlmaWVyKCkp ICYmICFnZW5lcmF0b3Iuc3ltYm9sVGFibGUoKS5zbG93QXJndW1lbnRzKCkpCi0gICAgICAgICAg ICBhcmdzUmVnaXN0ZXIgPSBnZW5lcmF0b3IudW5jaGVja2VkTG9jYWxBcmd1bWVudHNSZWdpc3Rl cigpOworICAgICAgICAgICAgYXJnc1JlZ2lzdGVyID0gZ2VuZXJhdG9yLnVuY2hlY2tlZFJlZ2lz dGVyRm9yQXJndW1lbnRzKCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGFyZ3NSZWdpc3Rl ciA9IGdlbmVyYXRvci5lbWl0Tm9kZShhcmdzLT5tX2V4cHIpOwogCkBAIC0yNzIxLDcgKzI3MjEs NyBAQCBSZWdpc3RlcklEKiBBcnJheVBhdHRlcm5Ob2RlOjplbWl0RGlyZWN0QmluZGluZyhCeXRl Y29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZQogewogICAgIGlmIChyaHMtPmlzUmVzb2x2ZU5v ZGUoKQogICAgICAgICAmJiBnZW5lcmF0b3Iud2lsbFJlc29sdmVUb0FyZ3VtZW50cyhzdGF0aWNf Y2FzdDxSZXNvbHZlTm9kZSo+KHJocyktPmlkZW50aWZpZXIoKSkKLSAgICAgICAgJiYgZ2VuZXJh dG9yLmhhc1NhZmVMb2NhbEFyZ3VtZW50c1JlZ2lzdGVyKCkmJiAhZ2VuZXJhdG9yLnN5bWJvbFRh YmxlKCkuc2xvd0FyZ3VtZW50cygpKSB7CisgICAgICAgICYmICFnZW5lcmF0b3Iuc3ltYm9sVGFi bGUoKS5zbG93QXJndW1lbnRzKCkpIHsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt X3RhcmdldFBhdHRlcm5zLnNpemUoKTsgaSsrKSB7CiAgICAgICAgICAgICBhdXRvIHRhcmdldCA9 IG1fdGFyZ2V0UGF0dGVybnNbaV07CiAgICAgICAgICAgICBpZiAoIXRhcmdldCkKQEAgLTI3Mjks NyArMjcyOSw3IEBAIFJlZ2lzdGVySUQqIEFycmF5UGF0dGVybk5vZGU6OmVtaXREaXJlY3RCaW5k aW5nKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlCiAgICAgICAgICAgICAKICAgICAg ICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiB0ZW1wID0gZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgp OwogICAgICAgICAgICAgZ2VuZXJhdG9yLmVtaXRMb2FkKHRlbXAuZ2V0KCksIGpzTnVtYmVyKGkp KTsKLSAgICAgICAgICAgIGdlbmVyYXRvci5lbWl0R2V0QXJndW1lbnRCeVZhbCh0ZW1wLmdldCgp LCBnZW5lcmF0b3IudW5jaGVja2VkTG9jYWxBcmd1bWVudHNSZWdpc3RlcigpLCB0ZW1wLmdldCgp KTsKKyAgICAgICAgICAgIGdlbmVyYXRvci5lbWl0R2V0QXJndW1lbnRCeVZhbCh0ZW1wLmdldCgp LCBnZW5lcmF0b3IudW5jaGVja2VkUmVnaXN0ZXJGb3JBcmd1bWVudHMoKSwgdGVtcC5nZXQoKSk7 CiAgICAgICAgICAgICB0YXJnZXQtPmJpbmRWYWx1ZShnZW5lcmF0b3IsIHRlbXAuZ2V0KCkpOwog ICAgICAgICB9CiAgICAgICAgIGlmIChkc3QgPT0gZ2VuZXJhdG9yLmlnbm9yZWRSZXN1bHQoKSB8 fCAhZHN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0 YWNrVmlzaXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tW aXNpdG9yLmNwcAppbmRleCBjZTNiNDIzYTg3OGQ5M2Q4NDFjNmFlZTA3MGZiMDk5NTMwNzFmOTcz Li4yOWRjOTY3ZjQ4NGRkZWVmMTFmYWFhNTg1YWViY2VkY2QyNmJkNWJiIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcApAQCAtMjk1 LDkgKzI5NSw2IEBAIEFyZ3VtZW50cyogU3RhY2tWaXNpdG9yOjpGcmFtZTo6ZXhpc3RpbmdBcmd1 bWVudHMoKQogICAgIGVsc2UKICNlbmRpZiAvLyBFTkFCTEUoREZHX0pJVCkKICAgICAgICAgcmVn ID0gY29kZUJsb2NrKCktPmFyZ3VtZW50c1JlZ2lzdGVyKCk7Ci0KLSAgICBpZiAoY29kZUJsb2Nr KCktPm5lZWRzQWN0aXZhdGlvbigpKQotICAgICAgICByZXR1cm4ganNDYXN0PEFyZ3VtZW50cyo+ KGNhbGxGcmFtZSgpLT5sZXhpY2FsRW52aXJvbm1lbnQoKS0+cmVnaXN0ZXJBdCh1bm1vZGlmaWVk QXJndW1lbnRzUmVnaXN0ZXIocmVnKS5vZmZzZXQoKSkuZ2V0KCkpOwogICAgIAogICAgIEpTVmFs dWUgcmVzdWx0ID0gY2FsbEZyYW1lKCktPnIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKHJl Zykub2Zmc2V0KCkpLmpzVmFsdWUoKTsKICAgICBpZiAoIXJlc3VsdCB8fCAhcmVzdWx0LmlzQ2Vs bCgpKSAvLyBQcm90ZWN0IGFnYWluc3QgVW5kZWZpbmVkIGluIGNhc2Ugd2UgdGhyb3cgaW4gb3Bf ZW50ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgKaW5kZXggYTYxOThiYzI2NGFh YWJiNWJmMTczNDNmNGU3Y2M2NWY4Y2NmZDZhNS4uYjdiZTI3MjNiYmU2NzFkMWNlOGRhNjJhMzQy YjU5ODJjMzFiNThmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9O b2Rlcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuaApAQCAtMTQ0 MCw3ICsxNDQwLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIGJvb2wgdXNlc0V2YWwoKSBj b25zdCB7IHJldHVybiBtX2ZlYXR1cmVzICYgRXZhbEZlYXR1cmU7IH0KICAgICAgICAgYm9vbCB1 c2VzQXJndW1lbnRzKCkgY29uc3QgeyByZXR1cm4gKG1fZmVhdHVyZXMgJiBBcmd1bWVudHNGZWF0 dXJlKSAmJiAhKG1fZmVhdHVyZXMgJiBTaGFkb3dzQXJndW1lbnRzRmVhdHVyZSk7IH0KICAgICAg ICAgYm9vbCBtb2RpZmllc1BhcmFtZXRlcigpIGNvbnN0IHsgcmV0dXJuIG1fZmVhdHVyZXMgJiBN b2RpZmllZFBhcmFtZXRlckZlYXR1cmU7IH0KLSAgICAgICAgYm9vbCBtb2RpZmllc0FyZ3VtZW50 cygpIGNvbnN0IHsgcmV0dXJuIG1fZmVhdHVyZXMgJiAoRXZhbEZlYXR1cmUgfCBNb2RpZmllZEFy Z3VtZW50c0ZlYXR1cmUpOyB9CiAgICAgICAgIGJvb2wgaXNTdHJpY3RNb2RlKCkgY29uc3QgeyBy ZXR1cm4gbV9mZWF0dXJlcyAmIFN0cmljdE1vZGVGZWF0dXJlOyB9CiAgICAgICAgIHZvaWQgc2V0 VXNlc0FyZ3VtZW50cygpIHsgbV9mZWF0dXJlcyB8PSBBcmd1bWVudHNGZWF0dXJlOyB9CiAgICAg ICAgIGJvb2wgdXNlc1RoaXMoKSBjb25zdCB7IHJldHVybiBtX2ZlYXR1cmVzICYgVGhpc0ZlYXR1 cmU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAppbmRleCA1NjI5OTdk N2FmODZlMTEyMDAwZWIxOTkzODkwYmM0ZWQxMTlkYjliLi4zMzBlZWM0NmIwZDU4ZTVhNTMwMjM1 MGQ0ZTM2ZTcxOTkyNTg0ZDQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1BhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIu Y3BwCkBAIC0yNzEsOCArMjcxLDcgQEAgU3RyaW5nIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUlu bmVyKCkKIAogICAgIElkZW50aWZpZXJTZXQgY2FwdHVyZWRWYXJpYWJsZXM7CiAgICAgYm9vbCBt b2RpZmllZFBhcmFtZXRlciA9IGZhbHNlOwotICAgIGJvb2wgbW9kaWZpZWRBcmd1bWVudHMgPSBm YWxzZTsKLSAgICBzY29wZS0+Z2V0Q2FwdHVyZWRWYXJpYWJsZXMoY2FwdHVyZWRWYXJpYWJsZXMs IG1vZGlmaWVkUGFyYW1ldGVyLCBtb2RpZmllZEFyZ3VtZW50cyk7CisgICAgc2NvcGUtPmdldENh cHR1cmVkVmFyaWFibGVzKGNhcHR1cmVkVmFyaWFibGVzLCBtb2RpZmllZFBhcmFtZXRlcik7CiAg ICAgCiAgICAgQ29kZUZlYXR1cmVzIGZlYXR1cmVzID0gY29udGV4dC5mZWF0dXJlcygpOwogICAg IGlmIChzY29wZS0+c3RyaWN0TW9kZSgpKQpAQCAtMjgxLDggKzI4MCw3IEBAIFN0cmluZyBQYXJz ZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbm5lcigpCiAgICAgICAgIGZlYXR1cmVzIHw9IFNoYWRvd3NB cmd1bWVudHNGZWF0dXJlOwogICAgIGlmIChtb2RpZmllZFBhcmFtZXRlcikKICAgICAgICAgZmVh dHVyZXMgfD0gTW9kaWZpZWRQYXJhbWV0ZXJGZWF0dXJlOwotICAgIGlmIChtb2RpZmllZEFyZ3Vt ZW50cykKLSAgICAgICAgZmVhdHVyZXMgfD0gTW9kaWZpZWRBcmd1bWVudHNGZWF0dXJlOworICAg IAogICAgIFZlY3RvcjxSZWZQdHI8U3RyaW5nSW1wbD4+IGNsb3NlZFZhcmlhYmxlczsKICAgICBp ZiAobV9wYXJzaW5nQnVpbHRpbikgewogICAgICAgICBSRUxFQVNFX0FTU0VSVCghY2FwdHVyZWRW YXJpYWJsZXMuc2l6ZSgpKTsKQEAgLTI5NCwxMCArMjkyLDYgQEAgU3RyaW5nIFBhcnNlcjxMZXhl clR5cGU+OjpwYXJzZUlubmVyKCkKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKHNjb3Bl LT5oYXNEZWNsYXJlZFBhcmFtZXRlcihJZGVudGlmaWVyKG1fdm0sIHZhcmlhYmxlLmdldCgpKSkp CiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgIGlmICh2YXJpYWJsZSA9 PSBtX3ZtLT5wcm9wZXJ0eU5hbWVzLT5hcmd1bWVudHMuaW1wbCgpKQotICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotCiAgICAgICAgICAgICBjbG9zZWRWYXJpYWJsZXMuYXBwZW5kKHZhcmlhYmxl KTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9w YXJzZXIvUGFyc2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oCmlu ZGV4IDg4ZWZjNGFmZDU3ZDE2MDJlM2Y1ZmJmZjA4NDdhZmQzZjg3ZTM1ODQuLmVjYTIzMDRjMjk4 MzllZDIyNGY4NDcwY2IxYWJiN2UxYzFkZDkzY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9QYXJzZXIuaApAQCAtMjc5LDcgKzI3OSw3IEBAIHN0cnVjdCBTY29wZSB7CiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KIAotICAgIHZvaWQgZ2V0Q2FwdHVyZWRWYXJpYWJsZXMoSWRlbnRp ZmllclNldCYgY2FwdHVyZWRWYXJpYWJsZXMsIGJvb2wmIG1vZGlmaWVkUGFyYW1ldGVyLCBib29s JiBtb2RpZmllZEFyZ3VtZW50cykKKyAgICB2b2lkIGdldENhcHR1cmVkVmFyaWFibGVzKElkZW50 aWZpZXJTZXQmIGNhcHR1cmVkVmFyaWFibGVzLCBib29sJiBtb2RpZmllZFBhcmFtZXRlcikKICAg ICB7CiAgICAgICAgIGlmIChtX25lZWRzRnVsbEFjdGl2YXRpb24gfHwgbV91c2VzRXZhbCkgewog ICAgICAgICAgICAgbW9kaWZpZWRQYXJhbWV0ZXIgPSB0cnVlOwpAQCAtMjkyLDEzICsyOTIsOSBA QCBzdHJ1Y3QgU2NvcGUgewogICAgICAgICAgICAgY2FwdHVyZWRWYXJpYWJsZXMuYWRkKCpwdHIp OwogICAgICAgICB9CiAgICAgICAgIG1vZGlmaWVkUGFyYW1ldGVyID0gZmFsc2U7Ci0gICAgICAg IGlmIChzaGFkb3dzQXJndW1lbnRzKCkpCi0gICAgICAgICAgICBtb2RpZmllZEFyZ3VtZW50cyA9 IHRydWU7CiAgICAgICAgIGlmIChtX2RlY2xhcmVkUGFyYW1ldGVycy5zaXplKCkpIHsKICAgICAg ICAgICAgIElkZW50aWZpZXJTZXQ6Oml0ZXJhdG9yIGVuZCA9IG1fd3JpdHRlblZhcmlhYmxlcy5l bmQoKTsKICAgICAgICAgICAgIGZvciAoSWRlbnRpZmllclNldDo6aXRlcmF0b3IgcHRyID0gbV93 cml0dGVuVmFyaWFibGVzLmJlZ2luKCk7IHB0ciAhPSBlbmQ7ICsrcHRyKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKCpwdHIgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YXJndW1lbnRzLmltcGwoKSkK LSAgICAgICAgICAgICAgICAgICAgbW9kaWZpZWRBcmd1bWVudHMgPSB0cnVlOwogICAgICAgICAg ICAgICAgIGlmICghbV9kZWNsYXJlZFBhcmFtZXRlcnMuY29udGFpbnMoKnB0cikpCiAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIG1vZGlmaWVkUGFyYW1ldGVy ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2Vy TW9kZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaAppbmRl eCAwNjExYjg4ZTcwY2VhNjU4Y2M4MzUyNzhjYjQ2NzBmYTIxMWJlMTE3Li45MzE0YjE5NzkwYTBk NTU4YWU0ZDI0ZjFmYzYyMTE3NWZmZmQ0MjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL1BhcnNlck1vZGVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Bh cnNlci9QYXJzZXJNb2Rlcy5oCkBAIC03NSw3ICs3NSw2IEBAIGNvbnN0IENvZGVGZWF0dXJlcyBU aGlzRmVhdHVyZSA9IDEgPDwgNDsKIGNvbnN0IENvZGVGZWF0dXJlcyBTdHJpY3RNb2RlRmVhdHVy ZSA9IDEgPDwgNTsKIGNvbnN0IENvZGVGZWF0dXJlcyBTaGFkb3dzQXJndW1lbnRzRmVhdHVyZSA9 IDEgPDwgNjsKIGNvbnN0IENvZGVGZWF0dXJlcyBNb2RpZmllZFBhcmFtZXRlckZlYXR1cmUgPSAx IDw8IDc7Ci1jb25zdCBDb2RlRmVhdHVyZXMgTW9kaWZpZWRBcmd1bWVudHNGZWF0dXJlID0gMSA8 PCA4OwogCiBjb25zdCBDb2RlRmVhdHVyZXMgQWxsRmVhdHVyZXMgPSBFdmFsRmVhdHVyZSB8IEFy Z3VtZW50c0ZlYXR1cmUgfCBXaXRoRmVhdHVyZSB8IENhdGNoRmVhdHVyZSB8IFRoaXNGZWF0dXJl IHwgU3RyaWN0TW9kZUZlYXR1cmUgfCBTaGFkb3dzQXJndW1lbnRzRmVhdHVyZSB8IE1vZGlmaWVk UGFyYW1ldGVyRmVhdHVyZTsKIAo=