96729 2012-09-13 23:11:41 -0700 REGRESSION(r128552): Still breaks the test on chromium linux debug. It's quite annoying. (Requested by rniwa on #webkit). 2012-09-13 23:16:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96706 1 webkit.review.bot webkit.review.bot rniwa simon.fraser oldest_to_newest 720341 0 webkit.review.bot 2012-09-13 23:11:41 -0700 http://trac.webkit.org/changeset/128552 broke the build: Still breaks the test on chromium linux debug. It's quite annoying. (Requested by rniwa on #webkit). This is an automatic bug report generated by the sheriff-bot. 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 case pain. "Only you can prevent forest fires." -- Smokey the Bear 720343 1 164053 webkit.review.bot 2012-09-13 23:12:21 -0700 Created attachment 164053 ROLLOUT of r128552 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. 720345 2 164053 webkit.review.bot 2012-09-13 23:16:53 -0700 Comment on attachment 164053 ROLLOUT of r128552 Clearing flags on attachment: 164053 Committed r128559: <http://trac.webkit.org/changeset/128559> 720346 3 webkit.review.bot 2012-09-13 23:16:56 -0700 All reviewed patches have been landed. Closing bug. 164053 2012-09-13 23:12:21 -0700 2012-09-13 23:16:53 -0700 ROLLOUT of r128552 bug-96729-20120914061845.patch text/plain 23206 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4MTkyYTZjMTk0NmJj NjA0MjUxZmM0NmQ4YzA3ODZjNmEzOTg5Ni4uZmZhNTNlNjVjMDk1MWIyYTM3NDRlNWViMmRlZjFj ZDRkZWNmYjJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA5LTEzICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTI4NTUyLgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8xMjg1NTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk2NzI5CisKKyAgICAgICAgU3RpbGwgYnJlYWtzIHRoZSB0ZXN0IG9uIGNocm9t aXVtIGxpbnV4IGRlYnVnLiBJdCdzIHF1aXRlCisgICAgICAgIGFubm95aW5nLiAoUmVxdWVzdGVk IGJ5IHJuaXdhIG9uICN3ZWJraXQpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAg ICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVy Tm9kZTo6cmVtb3ZlQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6cmVt b3ZlQ2hpbGRyZW4pOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6cmVjYWxjU3R5bGUpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmF0dGFjaCk6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50OjpkZXRhY2gpOgorICAgICAgICAqIHBhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc01vdXNlRG93bkV2ZW50VG9XaWRn ZXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgIChXZWJDb3JlOjp3aWRnZXROZXdQYXJlbnRNYXApOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyV2lkZ2V0OjpzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJXaWRnZXQ6OnJlc3VtZVdpZGdldEhpZXJhcmNoeVVwZGF0 ZXMpOgorICAgICAgICAoV2ViQ29yZTo6bW92ZVdpZGdldFRvUGFyZW50U29vbik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlcldpZGdldC5oOgorICAgICAgICAoUmVuZGVyV2lkZ2V0KToKKwog MjAxMi0wOS0xMyAgS2V2aW4gRnVuayAgPGtldmluLmZ1bmtAa2RhYi5jb20+CiAKICAgICAgICAg TWFrZSBjb21waWxlIHdpdGggYm90aCBPUyhXSU5DRSkgYW5kIFBMQVRGT1JNKFFUKSBzdXBwb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKaW5kZXggYTE0NTQ5ZTlhZTZlZjMxZWVhMDBmMGY2YTlhZWM0N2M1ZTVl MDY3MC4uN2QyODljMDY5YTJlNmE0YzZmZjAyZmM2ODFhMDkyNzllZDkyNWVhNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTEzICBTaGVyaWZmIEJvdCAgPHdlYmtp dC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTI4NTUyLgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xMjg1 NTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NzI5 CisKKyAgICAgICAgU3RpbGwgYnJlYWtzIHRoZSB0ZXN0IG9uIGNocm9taXVtIGxpbnV4IGRlYnVn LiBJdCdzIHF1aXRlCisgICAgICAgIGFubm95aW5nLiAoUmVxdWVzdGVkIGJ5IHJuaXdhIG9uICN3 ZWJraXQpLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1b V2ViSFRNTFZpZXcgX2ludmFsaWRhdGVHU3RhdGVzRm9yVHJlZV0pOgorCiAyMDEyLTA5LTEzICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHN1c3BlbmQvcmVzdW1l V2lkZ2V0SGllcmFyY2h5VXBkYXRlcyBzaG91bGQgYmUgYSBSQUlJIG9iamVjdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgppbmRleCBmNjIyZmFhM2U3MGY1YzM5ZTFkZjExYjNiNzBhMGQyYTM3NDFmZmI0Li4z ODNlNWY1ZjFiMTYzNTc4MjJiMzc4Y2YyMTg4YWVjZjYzZGFkMThjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgpAQCAtMTg2LDYgKzE4Niw4IEBAIF9fWk43V2ViQ29yZTEyUHJpbnRDb250ZXh0QzFFUE5T XzVGcmFtZUUKIF9fWk43V2ViQ29yZTEyUHJpbnRDb250ZXh0RDFFdgogX19aTks3V2ViQ29yZTEy UmVuZGVyT2JqZWN0MTZyZXBhaW50UmVjdGFuZ2xlRVJLTlNfMjBGcmFjdGlvbmFsTGF5b3V0UmVj dEViCiBfX1pON1dlYkNvcmUxMlJlbmRlck9iamVjdDE5c2Nyb2xsUmVjdFRvVmlzaWJsZUVSS05T XzIwRnJhY3Rpb25hbExheW91dFJlY3RFUktOU18xNVNjcm9sbEFsaWdubWVudEVTNl8KK19fWk43 V2ViQ29yZTEyUmVuZGVyV2lkZ2V0MjhyZXN1bWVXaWRnZXRIaWVyYXJjaHlVcGRhdGVzRXYKK19f Wk43V2ViQ29yZTEyUmVuZGVyV2lkZ2V0MjlzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlc0V2 CiBfX1pON1dlYkNvcmUxMlNoYXJlZEJ1ZmZlcjEwd3JhcENGRGF0YUVQSzhfX0NGRGF0YQogX19a TjdXZWJDb3JlMTJTaGFyZWRCdWZmZXIxMHdyYXBOU0RhdGFFUDZOU0RhdGEKIF9fWk43V2ViQ29y ZTEyU2hhcmVkQnVmZmVyMTJjcmVhdGVOU0RhdGFFdgpAQCAtNjMyLDggKzYzNCw2IEBAIF9fWk43 V2ViQ29yZTMxQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZTVlbXB0eUV2CiBfX1pON1dl YkNvcmUzMUNyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGU2c2hhcmVkRXYKIF9fWk43V2Vi Q29yZTMycGxhaW5UZXh0VG9NYWxsb2NBbGxvY2F0ZWRCdWZmZXJFUEtOU181UmFuZ2VFUmpiTlNf MjBUZXh0SXRlcmF0b3JCZWhhdmlvckUKIF9fWk43V2ViQ29yZTMzc3RyaXBMZWFkaW5nQW5kVHJh aWxpbmdIVE1MU3BhY2VzRVJLTjNXVEY2U3RyaW5nRQotX19aTjdXZWJDb3JlMzdXaWRnZXRIaWVy YXJjaHlVcGRhdGVzU3VzcGVuc2lvblNjb3BlMTFtb3ZlV2lkZ2V0c0V2Ci1fX1pON1dlYkNvcmUz N1dpZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUzNXNfd2lkZ2V0SGllcmFyY2h5 VXBkYXRlU3VzcGVuZENvdW50RQogX19aTjdXZWJDb3JlM21hY0VSS05TXzEwQ3JlZGVudGlhbEUK IF9fWk43V2ViQ29yZTNtYWNFUktOU18yM0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRQogX19aTjdX ZWJDb3JlNDByZXN0cmljdE1pbmltdW1TY2FsZUZhY3RvclRvVmlld3BvcnRTaXplRVJOU18xOFZp ZXdwb3J0QXR0cmlidXRlc0VOU183SW50U2l6ZUUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Db250YWluZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcAppbmRleCBlYjcxMTU3NGY5NjNiM2FjNzc3NDE1YTEyNGUzYTVkMjEyYzI0NTQyLi4zYWJl ZjZlZmYyYjFhMGUzNDViNTcxNjZkYTQ4MTFiOTFhZTIxYTU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Nv bnRhaW5lck5vZGUuY3BwCkBAIC00MTksMTUgKzQxOSwxNSBAQCBib29sIENvbnRhaW5lck5vZGU6 OnJlbW92ZUNoaWxkKE5vZGUqIG9sZENoaWxkLCBFeGNlcHRpb25Db2RlJiBlYykKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHsKLSAgICAgICAgV2lkZ2V0SGllcmFyY2h5VXBk YXRlc1N1c3BlbnNpb25TY29wZSBzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlczsKLQotICAg ICAgICBOb2RlKiBwcmV2ID0gY2hpbGQtPnByZXZpb3VzU2libGluZygpOwotICAgICAgICBOb2Rl KiBuZXh0ID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7Ci0gICAgICAgIHJlbW92ZUJldHdlZW4ocHJl diwgbmV4dCwgY2hpbGQuZ2V0KCkpOwotICAgICAgICBjaGlsZHJlbkNoYW5nZWQoZmFsc2UsIHBy ZXYsIG5leHQsIC0xKTsKLSAgICAgICAgQ2hpbGROb2RlUmVtb3ZhbE5vdGlmaWVyKHRoaXMpLm5v dGlmeShjaGlsZC5nZXQoKSk7Ci0gICAgfQorICAgIFJlbmRlcldpZGdldDo6c3VzcGVuZFdpZGdl dEhpZXJhcmNoeVVwZGF0ZXMoKTsKKworICAgIE5vZGUqIHByZXYgPSBjaGlsZC0+cHJldmlvdXNT aWJsaW5nKCk7CisgICAgTm9kZSogbmV4dCA9IGNoaWxkLT5uZXh0U2libGluZygpOworICAgIHJl bW92ZUJldHdlZW4ocHJldiwgbmV4dCwgY2hpbGQuZ2V0KCkpOworICAgIGNoaWxkcmVuQ2hhbmdl ZChmYWxzZSwgcHJldiwgbmV4dCwgLTEpOworICAgIENoaWxkTm9kZVJlbW92YWxOb3RpZmllcih0 aGlzKS5ub3RpZnkoY2hpbGQuZ2V0KCkpOworCisgICAgUmVuZGVyV2lkZ2V0OjpyZXN1bWVXaWRn ZXRIaWVyYXJjaHlVcGRhdGVzKCk7CiAgICAgZGlzcGF0Y2hTdWJ0cmVlTW9kaWZpZWRFdmVudCgp OwogCiAgICAgcmV0dXJuIGNoaWxkOwpAQCAtNDk3LDUwICs0OTcsNDkgQEAgdm9pZCBDb250YWlu ZXJOb2RlOjpyZW1vdmVDaGlsZHJlbigpCiAgICAgLy8gYW5kIHJlbW92ZS4uLiBlLmcuIHN0b3Ag bG9hZGluZyBmcmFtZXMsIGZpcmUgdW5sb2FkIGV2ZW50cy4KICAgICB3aWxsUmVtb3ZlQ2hpbGRy ZW4ocHJvdGVjdC5nZXQoKSk7CiAKLSAgICB7Ci0gICAgICAgIFdpZGdldEhpZXJhcmNoeVVwZGF0 ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNoeVVwZGF0ZXM7Ci0gICAgICAg IGZvcmJpZEV2ZW50RGlzcGF0Y2goKTsKLSAgICAgICAgVmVjdG9yPFJlZlB0cjxOb2RlPiwgMTA+ IHJlbW92ZWRDaGlsZHJlbjsKLSAgICAgICAgcmVtb3ZlZENoaWxkcmVuLnJlc2VydmVJbml0aWFs Q2FwYWNpdHkoY2hpbGROb2RlQ291bnQoKSk7Ci0gICAgICAgIHdoaWxlIChSZWZQdHI8Tm9kZT4g biA9IG1fZmlyc3RDaGlsZCkgewotICAgICAgICAgICAgTm9kZSogbmV4dCA9IG4tPm5leHRTaWJs aW5nKCk7Ci0KLSAgICAgICAgICAgIC8vIFJlbW92ZSB0aGUgbm9kZSBmcm9tIHRoZSB0cmVlIGJl Zm9yZSBjYWxsaW5nIGRldGFjaCBvciByZW1vdmVkRnJvbURvY3VtZW50ICg0NDI3MDI0LCA0MTI5 NzQ0KS4KLSAgICAgICAgICAgIC8vIHJlbW92ZUNoaWxkKCkgZG9lcyB0aGlzIGFmdGVyIGNhbGxp bmcgZGV0YWNoKCkuIFRoZXJlIGlzIG5vIGV4cGxhbmF0aW9uIGZvcgotICAgICAgICAgICAgLy8g dGhpcyBkaXNjcmVwYW5jeSBiZXR3ZWVuIHJlbW92ZUNoaWxkKCkgYW5kIGl0cyBvcHRpbWl6ZWQg dmVyc2lvbiByZW1vdmVDaGlsZHJlbigpLgotICAgICAgICAgICAgbi0+c2V0UHJldmlvdXNTaWJs aW5nKDApOwotICAgICAgICAgICAgbi0+c2V0TmV4dFNpYmxpbmcoMCk7Ci0gICAgICAgICAgICBu LT5zZXRQYXJlbnRPckhvc3ROb2RlKDApOwotICAgICAgICAgICAgZG9jdW1lbnQoKS0+YWRvcHRJ Zk5lZWRlZChuLmdldCgpKTsKLQotICAgICAgICAgICAgbV9maXJzdENoaWxkID0gbmV4dDsKLSAg ICAgICAgICAgIGlmIChuID09IG1fbGFzdENoaWxkKQotICAgICAgICAgICAgICAgIG1fbGFzdENo aWxkID0gMDsKLSAgICAgICAgICAgIHJlbW92ZWRDaGlsZHJlbi5hcHBlbmQobi5yZWxlYXNlKCkp OwotICAgICAgICB9CisgICAgUmVuZGVyV2lkZ2V0OjpzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBk YXRlcygpOworICAgIGZvcmJpZEV2ZW50RGlzcGF0Y2goKTsKKyAgICBWZWN0b3I8UmVmUHRyPE5v ZGU+LCAxMD4gcmVtb3ZlZENoaWxkcmVuOworICAgIHJlbW92ZWRDaGlsZHJlbi5yZXNlcnZlSW5p dGlhbENhcGFjaXR5KGNoaWxkTm9kZUNvdW50KCkpOworICAgIHdoaWxlIChSZWZQdHI8Tm9kZT4g biA9IG1fZmlyc3RDaGlsZCkgeworICAgICAgICBOb2RlKiBuZXh0ID0gbi0+bmV4dFNpYmxpbmco KTsKKworICAgICAgICAvLyBSZW1vdmUgdGhlIG5vZGUgZnJvbSB0aGUgdHJlZSBiZWZvcmUgY2Fs bGluZyBkZXRhY2ggb3IgcmVtb3ZlZEZyb21Eb2N1bWVudCAoNDQyNzAyNCwgNDEyOTc0NCkuCisg ICAgICAgIC8vIHJlbW92ZUNoaWxkKCkgZG9lcyB0aGlzIGFmdGVyIGNhbGxpbmcgZGV0YWNoKCku IFRoZXJlIGlzIG5vIGV4cGxhbmF0aW9uIGZvcgorICAgICAgICAvLyB0aGlzIGRpc2NyZXBhbmN5 IGJldHdlZW4gcmVtb3ZlQ2hpbGQoKSBhbmQgaXRzIG9wdGltaXplZCB2ZXJzaW9uIHJlbW92ZUNo aWxkcmVuKCkuCisgICAgICAgIG4tPnNldFByZXZpb3VzU2libGluZygwKTsKKyAgICAgICAgbi0+ c2V0TmV4dFNpYmxpbmcoMCk7CisgICAgICAgIG4tPnNldFBhcmVudE9ySG9zdE5vZGUoMCk7Cisg ICAgICAgIGRvY3VtZW50KCktPmFkb3B0SWZOZWVkZWQobi5nZXQoKSk7CisKKyAgICAgICAgbV9m aXJzdENoaWxkID0gbmV4dDsKKyAgICAgICAgaWYgKG4gPT0gbV9sYXN0Q2hpbGQpCisgICAgICAg ICAgICBtX2xhc3RDaGlsZCA9IDA7CisgICAgICAgIHJlbW92ZWRDaGlsZHJlbi5hcHBlbmQobi5y ZWxlYXNlKCkpOworICAgIH0KIAotICAgICAgICBzaXplX3QgcmVtb3ZlZENoaWxkcmVuQ291bnQg PSByZW1vdmVkQ2hpbGRyZW4uc2l6ZSgpOwotICAgICAgICBzaXplX3QgaTsKLQotICAgICAgICAv LyBEZXRhY2ggdGhlIG5vZGVzIG9ubHkgYWZ0ZXIgcHJvcGVybHkgcmVtb3ZlZCBmcm9tIHRoZSB0 cmVlIGJlY2F1c2UKLSAgICAgICAgLy8gYS4gZGV0YWNoaW5nIHJlcXVpcmVzIGEgcHJvcGVyIERP TSB0cmVlIChmb3IgY291bnRlcnMgYW5kIHF1b3RlcyBmb3IKLSAgICAgICAgLy8gZXhhbXBsZSkg YW5kIGR1cmluZyB0aGUgcHJldmlvdXMgbG9vcCB0aGUgbmV4dCBzaWJsaW5nIHN0aWxsIHBvaW50 cyB0bwotICAgICAgICAvLyB0aGUgbm9kZSBiZWluZyByZW1vdmVkIHdoaWxlIHRoZSBub2RlIGJl aW5nIHJlbW92ZWQgZG9lcyBub3QgcG9pbnQgYmFjawotICAgICAgICAvLyBhbmQgZG9lcyBub3Qg cG9pbnQgdG8gdGhlIHNhbWUgcGFyZW50IGFzIGl0cyBuZXh0IHNpYmxpbmcuCi0gICAgICAgIC8v IGIuIGRlc3Ryb3lpbmcgUmVuZGVyZXJzIG9mIHN0YW5kYWxvbmUgbm9kZXMgaXMgc29tZXRpbWVz IGZhc3Rlci4KLSAgICAgICAgZm9yIChpID0gMDsgaSA8IHJlbW92ZWRDaGlsZHJlbkNvdW50OyAr K2kpIHsKLSAgICAgICAgICAgIE5vZGUqIHJlbW92ZWRDaGlsZCA9IHJlbW92ZWRDaGlsZHJlbltp XS5nZXQoKTsKLSAgICAgICAgICAgIGlmIChyZW1vdmVkQ2hpbGQtPmF0dGFjaGVkKCkpCi0gICAg ICAgICAgICAgICAgcmVtb3ZlZENoaWxkLT5kZXRhY2goKTsKLSAgICAgICAgfQorICAgIHNpemVf dCByZW1vdmVkQ2hpbGRyZW5Db3VudCA9IHJlbW92ZWRDaGlsZHJlbi5zaXplKCk7CisgICAgc2l6 ZV90IGk7CisKKyAgICAvLyBEZXRhY2ggdGhlIG5vZGVzIG9ubHkgYWZ0ZXIgcHJvcGVybHkgcmVt b3ZlZCBmcm9tIHRoZSB0cmVlIGJlY2F1c2UKKyAgICAvLyBhLiBkZXRhY2hpbmcgcmVxdWlyZXMg YSBwcm9wZXIgRE9NIHRyZWUgKGZvciBjb3VudGVycyBhbmQgcXVvdGVzIGZvcgorICAgIC8vIGV4 YW1wbGUpIGFuZCBkdXJpbmcgdGhlIHByZXZpb3VzIGxvb3AgdGhlIG5leHQgc2libGluZyBzdGls bCBwb2ludHMgdG8KKyAgICAvLyB0aGUgbm9kZSBiZWluZyByZW1vdmVkIHdoaWxlIHRoZSBub2Rl IGJlaW5nIHJlbW92ZWQgZG9lcyBub3QgcG9pbnQgYmFjaworICAgIC8vIGFuZCBkb2VzIG5vdCBw b2ludCB0byB0aGUgc2FtZSBwYXJlbnQgYXMgaXRzIG5leHQgc2libGluZy4KKyAgICAvLyBiLiBk ZXN0cm95aW5nIFJlbmRlcmVycyBvZiBzdGFuZGFsb25lIG5vZGVzIGlzIHNvbWV0aW1lcyBmYXN0 ZXIuCisgICAgZm9yIChpID0gMDsgaSA8IHJlbW92ZWRDaGlsZHJlbkNvdW50OyArK2kpIHsKKyAg ICAgICAgTm9kZSogcmVtb3ZlZENoaWxkID0gcmVtb3ZlZENoaWxkcmVuW2ldLmdldCgpOworICAg ICAgICBpZiAocmVtb3ZlZENoaWxkLT5hdHRhY2hlZCgpKQorICAgICAgICAgICAgcmVtb3ZlZENo aWxkLT5kZXRhY2goKTsKKyAgICB9CiAKLSAgICAgICAgY2hpbGRyZW5DaGFuZ2VkKGZhbHNlLCAw LCAwLCAtc3RhdGljX2Nhc3Q8aW50PihyZW1vdmVkQ2hpbGRyZW5Db3VudCkpOworICAgIGNoaWxk cmVuQ2hhbmdlZChmYWxzZSwgMCwgMCwgLXN0YXRpY19jYXN0PGludD4ocmVtb3ZlZENoaWxkcmVu Q291bnQpKTsKIAotICAgICAgICBmb3IgKGkgPSAwOyBpIDwgcmVtb3ZlZENoaWxkcmVuQ291bnQ7 ICsraSkKLSAgICAgICAgICAgIENoaWxkTm9kZVJlbW92YWxOb3RpZmllcih0aGlzKS5ub3RpZnko cmVtb3ZlZENoaWxkcmVuW2ldLmdldCgpKTsKKyAgICBmb3IgKGkgPSAwOyBpIDwgcmVtb3ZlZENo aWxkcmVuQ291bnQ7ICsraSkKKyAgICAgICAgQ2hpbGROb2RlUmVtb3ZhbE5vdGlmaWVyKHRoaXMp Lm5vdGlmeShyZW1vdmVkQ2hpbGRyZW5baV0uZ2V0KCkpOwogCi0gICAgICAgIGFsbG93RXZlbnRE aXNwYXRjaCgpOwotICAgIH0KKyAgICBhbGxvd0V2ZW50RGlzcGF0Y2goKTsKKyAgICBSZW5kZXJX aWRnZXQ6OnJlc3VtZVdpZGdldEhpZXJhcmNoeVVwZGF0ZXMoKTsKIAogICAgIGRpc3BhdGNoU3Vi dHJlZU1vZGlmaWVkRXZlbnQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDMwYjQx OTRjNWZkOTA4ZTZmMzAzNGMwYWRjMGY4NTBhNmU2ZDM4MjguLjNkYTg5ZDdjOTI2NDc2NDViYWI2 NzRjNDYzNzU4NDc4ZjlmMGQ1ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMTgyNSw2 NiArMTgyNSw2NSBAQCB2b2lkIERvY3VtZW50OjpyZWNhbGNTdHlsZShTdHlsZUNoYW5nZSBjaGFu Z2UpCiAKICAgICBtX2luU3R5bGVSZWNhbGMgPSB0cnVlOwogICAgIHN1c3BlbmRQb3N0QXR0YWNo Q2FsbGJhY2tzKCk7Ci0gICAgewotICAgICAgICBXaWRnZXRIaWVyYXJjaHlVcGRhdGVzU3VzcGVu c2lvblNjb3BlIHN1c3BlbmRXaWRnZXRIaWVyYXJjaHlVcGRhdGVzOwotCi0gICAgICAgIFJlZlB0 cjxGcmFtZVZpZXc+IGZyYW1lVmlldyA9IHZpZXcoKTsKLSAgICAgICAgaWYgKGZyYW1lVmlldykg ewotICAgICAgICAgICAgZnJhbWVWaWV3LT5wYXVzZVNjaGVkdWxlZEV2ZW50cygpOwotICAgICAg ICAgICAgZnJhbWVWaWV3LT5iZWdpbkRlZmVycmVkUmVwYWludHMoKTsKLSAgICAgICAgfQotCi0g ICAgICAgIEFTU0VSVCghcmVuZGVyZXIoKSB8fCByZW5kZXJBcmVuYSgpKTsKLSAgICAgICAgaWYg KCFyZW5kZXJlcigpIHx8ICFyZW5kZXJBcmVuYSgpKQotICAgICAgICAgICAgZ290byBiYWlsT3V0 OworICAgIFJlbmRlcldpZGdldDo6c3VzcGVuZFdpZGdldEhpZXJhcmNoeVVwZGF0ZXMoKTsKKyAg ICAKKyAgICBSZWZQdHI8RnJhbWVWaWV3PiBmcmFtZVZpZXcgPSB2aWV3KCk7CisgICAgaWYgKGZy YW1lVmlldykgeworICAgICAgICBmcmFtZVZpZXctPnBhdXNlU2NoZWR1bGVkRXZlbnRzKCk7Cisg ICAgICAgIGZyYW1lVmlldy0+YmVnaW5EZWZlcnJlZFJlcGFpbnRzKCk7CisgICAgfQogCi0gICAg ICAgIGlmIChtX3BlbmRpbmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNlKQotICAgICAgICAgICAgY2hh bmdlID0gRm9yY2U7CisgICAgQVNTRVJUKCFyZW5kZXJlcigpIHx8IHJlbmRlckFyZW5hKCkpOwor ICAgIGlmICghcmVuZGVyZXIoKSB8fCAhcmVuZGVyQXJlbmEoKSkKKyAgICAgICAgZ290byBiYWls X291dDsKIAotICAgICAgICAvLyBSZWNhbGN1bGF0aW5nIHRoZSByb290IHN0eWxlIChvbiB0aGUg ZG9jdW1lbnQpIGlzIG5vdCBuZWVkZWQgaW4gdGhlIGNvbW1vbiBjYXNlLgotICAgICAgICBpZiAo KGNoYW5nZSA9PSBGb3JjZSkgfHwgKHNob3VsZERpc3BsYXlTZWFtbGVzc2x5V2l0aFBhcmVudCgp ICYmIChjaGFuZ2UgPj0gSW5oZXJpdCkpKSB7Ci0gICAgICAgICAgICAvLyBzdHlsZSBzZWxlY3Rv ciBtYXkgc2V0IHRoaXMgYWdhaW4gZHVyaW5nIHJlY2FsYwotICAgICAgICAgICAgbV9oYXNOb2Rl c1dpdGhQbGFjZWhvbGRlclN0eWxlID0gZmFsc2U7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAg IFJlZlB0cjxSZW5kZXJTdHlsZT4gZG9jdW1lbnRTdHlsZSA9IFN0eWxlUmVzb2x2ZXI6OnN0eWxl Rm9yRG9jdW1lbnQodGhpcywgbV9zdHlsZVJlc29sdmVyID8gbV9zdHlsZVJlc29sdmVyLT5mb250 U2VsZWN0b3IoKSA6IDApOwotICAgICAgICAgICAgU3R5bGVDaGFuZ2UgY2ggPSBOb2RlOjpkaWZm KGRvY3VtZW50U3R5bGUuZ2V0KCksIHJlbmRlcmVyKCktPnN0eWxlKCksIHRoaXMpOwotICAgICAg ICAgICAgaWYgKGNoICE9IE5vQ2hhbmdlKQotICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnNl dFN0eWxlKGRvY3VtZW50U3R5bGUucmVsZWFzZSgpKTsKLSAgICAgICAgfQorICAgIGlmIChtX3Bl bmRpbmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNlKQorICAgICAgICBjaGFuZ2UgPSBGb3JjZTsKIAot ICAgICAgICBmb3IgKE5vZGUqIG4gPSBmaXJzdENoaWxkKCk7IG47IG4gPSBuLT5uZXh0U2libGlu ZygpKSB7Ci0gICAgICAgICAgICBpZiAoIW4tPmlzRWxlbWVudE5vZGUoKSkKLSAgICAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2Fz dDxFbGVtZW50Kj4obik7Ci0gICAgICAgICAgICBpZiAoY2hhbmdlID49IEluaGVyaXQgfHwgZWxl bWVudC0+Y2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZWxlbWVudC0+bmVlZHNTdHlsZVJlY2Fs YygpKQotICAgICAgICAgICAgICAgIGVsZW1lbnQtPnJlY2FsY1N0eWxlKGNoYW5nZSk7Ci0gICAg ICAgIH0KKyAgICAvLyBSZWNhbGN1bGF0aW5nIHRoZSByb290IHN0eWxlIChvbiB0aGUgZG9jdW1l bnQpIGlzIG5vdCBuZWVkZWQgaW4gdGhlIGNvbW1vbiBjYXNlLgorICAgIGlmICgoY2hhbmdlID09 IEZvcmNlKSB8fCAoc2hvdWxkRGlzcGxheVNlYW1sZXNzbHlXaXRoUGFyZW50KCkgJiYgKGNoYW5n ZSA+PSBJbmhlcml0KSkpIHsKKyAgICAgICAgLy8gc3R5bGUgc2VsZWN0b3IgbWF5IHNldCB0aGlz IGFnYWluIGR1cmluZyByZWNhbGMKKyAgICAgICAgbV9oYXNOb2Rlc1dpdGhQbGFjZWhvbGRlclN0 eWxlID0gZmFsc2U7CisgICAgICAgIAorICAgICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IGRvY3Vt ZW50U3R5bGUgPSBTdHlsZVJlc29sdmVyOjpzdHlsZUZvckRvY3VtZW50KHRoaXMsIG1fc3R5bGVS ZXNvbHZlciA/IG1fc3R5bGVSZXNvbHZlci0+Zm9udFNlbGVjdG9yKCkgOiAwKTsKKyAgICAgICAg U3R5bGVDaGFuZ2UgY2ggPSBOb2RlOjpkaWZmKGRvY3VtZW50U3R5bGUuZ2V0KCksIHJlbmRlcmVy KCktPnN0eWxlKCksIHRoaXMpOworICAgICAgICBpZiAoY2ggIT0gTm9DaGFuZ2UpCisgICAgICAg ICAgICByZW5kZXJlcigpLT5zZXRTdHlsZShkb2N1bWVudFN0eWxlLnJlbGVhc2UoKSk7CisgICAg fQogCi0gICAgI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICAgICAgaWYgKHZp ZXcoKSkgewotICAgICAgICAgICAgYm9vbCBsYXlvdXRQZW5kaW5nID0gdmlldygpLT5sYXlvdXRQ ZW5kaW5nKCkgfHwgcmVuZGVyZXIoKS0+bmVlZHNMYXlvdXQoKTsKLSAgICAgICAgICAgIC8vIElm IHdlIGRpZG4ndCB1cGRhdGUgY29tcG9zaXRpbmcgbGF5ZXJzIGJlY2F1c2Ugb2YgbGF5b3V0KCks IHdlIG5lZWQgdG8gZG8gc28gaGVyZS4KLSAgICAgICAgICAgIGlmICghbGF5b3V0UGVuZGluZykK LSAgICAgICAgICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTdHls ZUNoYW5nZSgpOwotICAgICAgICB9Ci0gICAgI2VuZGlmCisgICAgZm9yIChOb2RlKiBuID0gZmly c3RDaGlsZCgpOyBuOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkgeworICAgICAgICBpZiAoIW4tPmlz RWxlbWVudE5vZGUoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBFbGVtZW50KiBl bGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG4pOworICAgICAgICBpZiAoY2hhbmdlID49 IEluaGVyaXQgfHwgZWxlbWVudC0+Y2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZWxlbWVudC0+ bmVlZHNTdHlsZVJlY2FsYygpKQorICAgICAgICAgICAgZWxlbWVudC0+cmVjYWxjU3R5bGUoY2hh bmdlKTsKKyAgICB9CiAKLSAgICBiYWlsT3V0OgotICAgICAgICBjbGVhck5lZWRzU3R5bGVSZWNh bGMoKTsKLSAgICAgICAgY2xlYXJDaGlsZE5lZWRzU3R5bGVSZWNhbGMoKTsKLSAgICAgICAgdW5z Y2hlZHVsZVN0eWxlUmVjYWxjKCk7CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQor ICAgIGlmICh2aWV3KCkpIHsKKyAgICAgICAgYm9vbCBsYXlvdXRQZW5kaW5nID0gdmlldygpLT5s YXlvdXRQZW5kaW5nKCkgfHwgcmVuZGVyZXIoKS0+bmVlZHNMYXlvdXQoKTsKKyAgICAgICAgLy8g SWYgd2UgZGlkbid0IHVwZGF0ZSBjb21wb3NpdGluZyBsYXllcnMgYmVjYXVzZSBvZiBsYXlvdXQo KSwgd2UgbmVlZCB0byBkbyBzbyBoZXJlLgorICAgICAgICBpZiAoIWxheW91dFBlbmRpbmcpCisg ICAgICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTdHlsZUNoYW5n ZSgpOworICAgIH0KKyNlbmRpZgogCi0gICAgICAgIG1faW5TdHlsZVJlY2FsYyA9IGZhbHNlOwor YmFpbF9vdXQ6CisgICAgY2xlYXJOZWVkc1N0eWxlUmVjYWxjKCk7CisgICAgY2xlYXJDaGlsZE5l ZWRzU3R5bGVSZWNhbGMoKTsKKyAgICB1bnNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKIAotICAgICAg ICAvLyBQc2V1ZG8gZWxlbWVudCByZW1vdmFsIGFuZCBzaW1pbGFyIG1heSBvbmx5IHdvcmsgd2l0 aCB0aGVzZSBmbGFncyBzdGlsbCBzZXQuIFJlc2V0IHRoZW0gYWZ0ZXIgdGhlIHN0eWxlIHJlY2Fs Yy4KLSAgICAgICAgaWYgKG1fc3R5bGVSZXNvbHZlcikKLSAgICAgICAgICAgIHJlc2V0Q1NTRmVh dHVyZUZsYWdzKCk7CisgICAgbV9pblN0eWxlUmVjYWxjID0gZmFsc2U7CisgICAgCisgICAgLy8g UHNldWRvIGVsZW1lbnQgcmVtb3ZhbCBhbmQgc2ltaWxhciBtYXkgb25seSB3b3JrIHdpdGggdGhl c2UgZmxhZ3Mgc3RpbGwgc2V0LiBSZXNldCB0aGVtIGFmdGVyIHRoZSBzdHlsZSByZWNhbGMuCisg ICAgaWYgKG1fc3R5bGVSZXNvbHZlcikKKyAgICAgICAgcmVzZXRDU1NGZWF0dXJlRmxhZ3MoKTsK IAotICAgICAgICBpZiAoZnJhbWVWaWV3KSB7Ci0gICAgICAgICAgICBmcmFtZVZpZXctPnJlc3Vt ZVNjaGVkdWxlZEV2ZW50cygpOwotICAgICAgICAgICAgZnJhbWVWaWV3LT5lbmREZWZlcnJlZFJl cGFpbnRzKCk7Ci0gICAgICAgIH0KKyAgICBpZiAoZnJhbWVWaWV3KSB7CisgICAgICAgIGZyYW1l Vmlldy0+cmVzdW1lU2NoZWR1bGVkRXZlbnRzKCk7CisgICAgICAgIGZyYW1lVmlldy0+ZW5kRGVm ZXJyZWRSZXBhaW50cygpOwogICAgIH0KKyAgICBSZW5kZXJXaWRnZXQ6OnJlc3VtZVdpZGdldEhp ZXJhcmNoeVVwZGF0ZXMoKTsKICAgICByZXN1bWVQb3N0QXR0YWNoQ2FsbGJhY2tzKCk7CiAKICAg ICAvLyBJZiB3ZSB3YW50ZWQgdG8gY2FsbCBpbXBsaWNpdENsb3NlKCkgZHVyaW5nIHJlY2FsY1N0 eWxlLCBkbyBzbyBub3cgdGhhdCB3ZSdyZSBmaW5pc2hlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApp bmRleCAzYzQwZGYwODJjYWNmNzVlNDUwYmVlYjU1YzNkNjhjODFiMDVjMmU5Li4wZDQ0OGUxMTFk ZDhjZDg4ZTMzNGIzY2M2NzdkMzhmY2NhMTQ3ZjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBA IC0xMDAyLDM2ICsxMDAyLDM2IEBAIHZvaWQgRWxlbWVudDo6cmVtb3ZlZEZyb20oQ29udGFpbmVy Tm9kZSogaW5zZXJ0aW9uUG9pbnQpCiB2b2lkIEVsZW1lbnQ6OmF0dGFjaCgpCiB7CiAgICAgc3Vz cGVuZFBvc3RBdHRhY2hDYWxsYmFja3MoKTsKLSAgICB7Ci0gICAgICAgIFdpZGdldEhpZXJhcmNo eVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNoeVVwZGF0ZXM7Cisg ICAgUmVuZGVyV2lkZ2V0OjpzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlcygpOwogCi0gICAg ICAgIGNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoKTsKLSAgICAgICAgU3R5bGVSZXNvbHZlclBhcmVu dFB1c2hlciBwYXJlbnRQdXNoZXIodGhpcyk7CisgICAgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgp OworICAgIFN0eWxlUmVzb2x2ZXJQYXJlbnRQdXNoZXIgcGFyZW50UHVzaGVyKHRoaXMpOwogCi0g ICAgICAgIGlmIChwYXJlbnRFbGVtZW50KCkgJiYgcGFyZW50RWxlbWVudCgpLT5pc0luQ2FudmFz U3VidHJlZSgpKQotICAgICAgICAgICAgc2V0SXNJbkNhbnZhc1N1YnRyZWUodHJ1ZSk7CisgICAg aWYgKHBhcmVudEVsZW1lbnQoKSAmJiBwYXJlbnRFbGVtZW50KCktPmlzSW5DYW52YXNTdWJ0cmVl KCkpCisgICAgICAgIHNldElzSW5DYW52YXNTdWJ0cmVlKHRydWUpOwogCi0gICAgICAgIC8vIFdo ZW4gYSBzaGFkb3cgcm9vdCBleGlzdHMsIGl0IGRvZXMgdGhlIHdvcmsgb2YgYXR0YWNoaW5nIHRo ZSBjaGlsZHJlbi4KLSAgICAgICAgaWYgKEVsZW1lbnRTaGFkb3cqIHNoYWRvdyA9IHRoaXMtPnNo YWRvdygpKSB7CisgICAgLy8gV2hlbiBhIHNoYWRvdyByb290IGV4aXN0cywgaXQgZG9lcyB0aGUg d29yayBvZiBhdHRhY2hpbmcgdGhlIGNoaWxkcmVuLgorICAgIGlmIChFbGVtZW50U2hhZG93KiBz aGFkb3cgPSB0aGlzLT5zaGFkb3coKSkgeworICAgICAgICBwYXJlbnRQdXNoZXIucHVzaCgpOwor ICAgICAgICBzaGFkb3ctPmF0dGFjaCgpOworICAgICAgICBhdHRhY2hDaGlsZHJlbklmTmVlZGVk KCk7CisgICAgICAgIGF0dGFjaEFzTm9kZSgpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChm aXJzdENoaWxkKCkpCiAgICAgICAgICAgICBwYXJlbnRQdXNoZXIucHVzaCgpOwotICAgICAgICAg ICAgc2hhZG93LT5hdHRhY2goKTsKLSAgICAgICAgICAgIGF0dGFjaENoaWxkcmVuSWZOZWVkZWQo KTsKLSAgICAgICAgICAgIGF0dGFjaEFzTm9kZSgpOwotICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgaWYgKGZpcnN0Q2hpbGQoKSkKLSAgICAgICAgICAgICAgICBwYXJlbnRQdXNoZXIucHVz aCgpOwotICAgICAgICAgICAgQ29udGFpbmVyTm9kZTo6YXR0YWNoKCk7Ci0gICAgICAgIH0KKyAg ICAgICAgQ29udGFpbmVyTm9kZTo6YXR0YWNoKCk7CisgICAgfQogCi0gICAgICAgIGlmIChoYXNS YXJlRGF0YSgpKSB7ICAgCi0gICAgICAgICAgICBFbGVtZW50UmFyZURhdGEqIGRhdGEgPSBlbGVt ZW50UmFyZURhdGEoKTsKLSAgICAgICAgICAgIGlmIChkYXRhLT5uZWVkc0ZvY3VzQXBwZWFyYW5j ZVVwZGF0ZVNvb25BZnRlckF0dGFjaCgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzRm9jdXNh YmxlKCkgJiYgZG9jdW1lbnQoKS0+Zm9jdXNlZE5vZGUoKSA9PSB0aGlzKQotICAgICAgICAgICAg ICAgICAgICBkb2N1bWVudCgpLT51cGRhdGVGb2N1c0FwcGVhcmFuY2VTb29uKGZhbHNlIC8qIGRv bid0IHJlc3RvcmUgc2VsZWN0aW9uICovKTsKLSAgICAgICAgICAgICAgICBkYXRhLT5zZXROZWVk c0ZvY3VzQXBwZWFyYW5jZVVwZGF0ZVNvb25BZnRlckF0dGFjaChmYWxzZSk7Ci0gICAgICAgICAg ICB9CisgICAgaWYgKGhhc1JhcmVEYXRhKCkpIHsgICAKKyAgICAgICAgRWxlbWVudFJhcmVEYXRh KiBkYXRhID0gZWxlbWVudFJhcmVEYXRhKCk7CisgICAgICAgIGlmIChkYXRhLT5uZWVkc0ZvY3Vz QXBwZWFyYW5jZVVwZGF0ZVNvb25BZnRlckF0dGFjaCgpKSB7CisgICAgICAgICAgICBpZiAoaXNG b2N1c2FibGUoKSAmJiBkb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgpID09IHRoaXMpCisgICAgICAg ICAgICAgICAgZG9jdW1lbnQoKS0+dXBkYXRlRm9jdXNBcHBlYXJhbmNlU29vbihmYWxzZSAvKiBk b24ndCByZXN0b3JlIHNlbGVjdGlvbiAqLyk7CisgICAgICAgICAgICBkYXRhLT5zZXROZWVkc0Zv Y3VzQXBwZWFyYW5jZVVwZGF0ZVNvb25BZnRlckF0dGFjaChmYWxzZSk7CiAgICAgICAgIH0KICAg ICB9CisKKyAgICBSZW5kZXJXaWRnZXQ6OnJlc3VtZVdpZGdldEhpZXJhcmNoeVVwZGF0ZXMoKTsK ICAgICByZXN1bWVQb3N0QXR0YWNoQ2FsbGJhY2tzKCk7CiB9CiAKQEAgLTEwNDUsNyArMTA0NSw3 IEBAIHZvaWQgRWxlbWVudDo6dW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnROb2RlKCkKIAogdm9p ZCBFbGVtZW50OjpkZXRhY2goKQogewotICAgIFdpZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5z aW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNoeVVwZGF0ZXM7CisgICAgUmVuZGVyV2lkZ2V0 OjpzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlcygpOwogICAgIHVucmVnaXN0ZXJOYW1lZEZs b3dDb250ZW50Tm9kZSgpOwogICAgIGNhbmNlbEZvY3VzQXBwZWFyYW5jZVVwZGF0ZSgpOwogICAg IGlmIChoYXNSYXJlRGF0YSgpKSB7CkBAIC0xMDU4LDYgKzEwNTgsOCBAQCB2b2lkIEVsZW1lbnQ6 OmRldGFjaCgpCiAgICAgICAgIHNoYWRvdy0+ZGV0YWNoKCk7CiAgICAgfQogICAgIENvbnRhaW5l ck5vZGU6OmRldGFjaCgpOworCisgICAgUmVuZGVyV2lkZ2V0OjpyZXN1bWVXaWRnZXRIaWVyYXJj aHlVcGRhdGVzKCk7CiB9CiAKIGJvb2wgRWxlbWVudDo6cHNldWRvU3R5bGVDYWNoZUlzSW52YWxp ZChjb25zdCBSZW5kZXJTdHlsZSogY3VycmVudFN0eWxlLCBSZW5kZXJTdHlsZSogbmV3U3R5bGUp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KaW5kZXggZDIwMjBj NzcxMDU3MWFjNTNlMGRkMThkYWUyZGFhN2M2Y2U4Y2RkMi4uYmQ4ZWU0NzA0ZTIyM2VkMzQ0MDNi YWE1OGQ0OWQyZjhjYjM5NjZkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMv RXZlbnRIYW5kbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFu ZGxlck1hYy5tbQpAQCAtMjI1LDEwICsyMjUsOSBAQCBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01v dXNlRG93bkV2ZW50VG9XaWRnZXQoV2lkZ2V0KiBwV2lkZ2V0KQogICAgIEFTU0VSVCghbV9zZW5k aW5nRXZlbnRUb1N1YnZpZXcpOwogICAgIG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3ID0gdHJ1ZTsK IAotICAgIHsKLSAgICAgICAgV2lkZ2V0SGllcmFyY2h5VXBkYXRlc1N1c3BlbnNpb25TY29wZSBz dXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRlczsKLSAgICAgICAgW3ZpZXcgbW91c2VEb3duOmN1 cnJlbnROU0V2ZW50KCldOwotICAgIH0KKyAgICBSZW5kZXJXaWRnZXQ6OnN1c3BlbmRXaWRnZXRI aWVyYXJjaHlVcGRhdGVzKCk7CisgICAgW3ZpZXcgbW91c2VEb3duOmN1cnJlbnROU0V2ZW50KCld OworICAgIFJlbmRlcldpZGdldDo6cmVzdW1lV2lkZ2V0SGllcmFyY2h5VXBkYXRlcygpOwogCiAg ICAgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcgPSBmYWxzZTsKICAgICAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAKaW5kZXggMjFkMGMzYWQ2ZjIyZWUyMTlkY2QxYzc0 NDdiMTAxMzRkMzliNjExZi4uOTUzN2VkZjVkMjA4N2Q4NWIzNWQ2ZmVjNWVhZmQ3ODZiYmVmMGU1 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAKQEAgLTQ3LDQy ICs0Nyw1MyBAQCBzdGF0aWMgSGFzaE1hcDxjb25zdCBXaWRnZXQqLCBSZW5kZXJXaWRnZXQqPiYg d2lkZ2V0UmVuZGVyZXJNYXAoKQogICAgIHJldHVybiAqc3RhdGljV2lkZ2V0UmVuZGVyZXJNYXA7 CiB9CiAKLXVuc2lnbmVkIFdpZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGU6OnNf d2lkZ2V0SGllcmFyY2h5VXBkYXRlU3VzcGVuZENvdW50ID0gMDsKK3N0YXRpYyB1bnNpZ25lZCB3 aWRnZXRIaWVyYXJjaHlVcGRhdGVTdXNwZW5kQ291bnQ7CiAKLVdpZGdldEhpZXJhcmNoeVVwZGF0 ZXNTdXNwZW5zaW9uU2NvcGU6OldpZGdldFRvUGFyZW50TWFwJiBXaWRnZXRIaWVyYXJjaHlVcGRh dGVzU3VzcGVuc2lvblNjb3BlOjp3aWRnZXROZXdQYXJlbnRNYXAoKQordHlwZWRlZiBIYXNoTWFw PFJlZlB0cjxXaWRnZXQ+LCBGcmFtZVZpZXcqPiBXaWRnZXRUb1BhcmVudE1hcDsKKworc3RhdGlj IFdpZGdldFRvUGFyZW50TWFwJiB3aWRnZXROZXdQYXJlbnRNYXAoKQogewogICAgIERFRklORV9T VEFUSUNfTE9DQUwoV2lkZ2V0VG9QYXJlbnRNYXAsIG1hcCwgKCkpOwogICAgIHJldHVybiBtYXA7 CiB9CiAKLXZvaWQgV2lkZ2V0SGllcmFyY2h5VXBkYXRlc1N1c3BlbnNpb25TY29wZTo6bW92ZVdp ZGdldHMoKQordm9pZCBSZW5kZXJXaWRnZXQ6OnN1c3BlbmRXaWRnZXRIaWVyYXJjaHlVcGRhdGVz KCkKIHsKLSAgICBXaWRnZXRUb1BhcmVudE1hcCBtYXAgPSB3aWRnZXROZXdQYXJlbnRNYXAoKTsK LSAgICB3aWRnZXROZXdQYXJlbnRNYXAoKS5jbGVhcigpOwotICAgIFdpZGdldFRvUGFyZW50TWFw OjppdGVyYXRvciBlbmQgPSBtYXAuZW5kKCk7Ci0gICAgZm9yIChXaWRnZXRUb1BhcmVudE1hcDo6 aXRlcmF0b3IgaXQgPSBtYXAuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFdp ZGdldCogY2hpbGQgPSBpdC0+Zmlyc3QuZ2V0KCk7Ci0gICAgICAgIFNjcm9sbFZpZXcqIGN1cnJl bnRQYXJlbnQgPSBjaGlsZC0+cGFyZW50KCk7Ci0gICAgICAgIEZyYW1lVmlldyogbmV3UGFyZW50 ID0gaXQtPnNlY29uZDsKLSAgICAgICAgaWYgKG5ld1BhcmVudCAhPSBjdXJyZW50UGFyZW50KSB7 Ci0gICAgICAgICAgICBpZiAoY3VycmVudFBhcmVudCkKLSAgICAgICAgICAgICAgICBjdXJyZW50 UGFyZW50LT5yZW1vdmVDaGlsZChjaGlsZCk7Ci0gICAgICAgICAgICBpZiAobmV3UGFyZW50KQot ICAgICAgICAgICAgICAgIG5ld1BhcmVudC0+YWRkQ2hpbGQoY2hpbGQpOworICAgIHdpZGdldEhp ZXJhcmNoeVVwZGF0ZVN1c3BlbmRDb3VudCsrOworfQorCit2b2lkIFJlbmRlcldpZGdldDo6cmVz dW1lV2lkZ2V0SGllcmFyY2h5VXBkYXRlcygpCit7CisgICAgQVNTRVJUKHdpZGdldEhpZXJhcmNo eVVwZGF0ZVN1c3BlbmRDb3VudCk7CisgICAgaWYgKHdpZGdldEhpZXJhcmNoeVVwZGF0ZVN1c3Bl bmRDb3VudCA9PSAxKSB7CisgICAgICAgIFdpZGdldFRvUGFyZW50TWFwIG1hcCA9IHdpZGdldE5l d1BhcmVudE1hcCgpOworICAgICAgICB3aWRnZXROZXdQYXJlbnRNYXAoKS5jbGVhcigpOworICAg ICAgICBXaWRnZXRUb1BhcmVudE1hcDo6aXRlcmF0b3IgZW5kID0gbWFwLmVuZCgpOworICAgICAg ICBmb3IgKFdpZGdldFRvUGFyZW50TWFwOjppdGVyYXRvciBpdCA9IG1hcC5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKKyAgICAgICAgICAgIFdpZGdldCogY2hpbGQgPSBpdC0+Zmlyc3QuZ2V0 KCk7CisgICAgICAgICAgICBTY3JvbGxWaWV3KiBjdXJyZW50UGFyZW50ID0gY2hpbGQtPnBhcmVu dCgpOworICAgICAgICAgICAgRnJhbWVWaWV3KiBuZXdQYXJlbnQgPSBpdC0+c2Vjb25kOworICAg ICAgICAgICAgaWYgKG5ld1BhcmVudCAhPSBjdXJyZW50UGFyZW50KSB7CisgICAgICAgICAgICAg ICAgaWYgKGN1cnJlbnRQYXJlbnQpCisgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRQYXJlbnQt PnJlbW92ZUNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgICAgICBpZiAobmV3UGFyZW50KQorICAg ICAgICAgICAgICAgICAgICBuZXdQYXJlbnQtPmFkZENoaWxkKGNoaWxkKTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0KKyAgICB3aWRnZXRIaWVyYXJjaHlVcGRhdGVTdXNwZW5kQ291 bnQtLTsKIH0KIAogc3RhdGljIHZvaWQgbW92ZVdpZGdldFRvUGFyZW50U29vbihXaWRnZXQqIGNo aWxkLCBGcmFtZVZpZXcqIHBhcmVudCkKIHsKLSAgICBpZiAoIVdpZGdldEhpZXJhcmNoeVVwZGF0 ZXNTdXNwZW5zaW9uU2NvcGU6OmlzU3VzcGVuZGVkKCkpIHsKKyAgICBpZiAoIXdpZGdldEhpZXJh cmNoeVVwZGF0ZVN1c3BlbmRDb3VudCkgewogICAgICAgICBpZiAocGFyZW50KQogICAgICAgICAg ICAgcGFyZW50LT5hZGRDaGlsZChjaGlsZCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNo aWxkLT5yZW1vdmVGcm9tUGFyZW50KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgV2lk Z2V0SGllcmFyY2h5VXBkYXRlc1N1c3BlbnNpb25TY29wZTo6c2NoZWR1bGVXaWRnZXRUb01vdmUo Y2hpbGQsIHBhcmVudCk7CisgICAgd2lkZ2V0TmV3UGFyZW50TWFwKCkuc2V0KGNoaWxkLCBwYXJl bnQpOwogfQogCiBSZW5kZXJXaWRnZXQ6OlJlbmRlcldpZGdldChOb2RlKiBub2RlKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5oCmluZGV4IGQyMDEyM2E2ODM5NWM4MjRlNTBh ODQyODNmMmM1NDUyNjlhNjMwMDYuLmI3ZGIzYjgwOWM4NGZjMWJjODc1ZGFiYWQyMzE4ZGRjN2Jj YzIwMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmgKQEAgLTI4LDMy ICsyOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgV2lkZ2V0SGllcmFyY2h5 VXBkYXRlc1N1c3BlbnNpb25TY29wZSB7Ci1wdWJsaWM6Ci0gICAgV2lkZ2V0SGllcmFyY2h5VXBk YXRlc1N1c3BlbnNpb25TY29wZSgpCi0gICAgewotICAgICAgICBzX3dpZGdldEhpZXJhcmNoeVVw ZGF0ZVN1c3BlbmRDb3VudCsrOwotICAgIH0KLSAgICB+V2lkZ2V0SGllcmFyY2h5VXBkYXRlc1N1 c3BlbnNpb25TY29wZSgpCi0gICAgewotICAgICAgICBBU1NFUlQoc193aWRnZXRIaWVyYXJjaHlV cGRhdGVTdXNwZW5kQ291bnQpOwotICAgICAgICBpZiAoc193aWRnZXRIaWVyYXJjaHlVcGRhdGVT dXNwZW5kQ291bnQgPT0gMSkKLSAgICAgICAgICAgIG1vdmVXaWRnZXRzKCk7Ci0gICAgICAgIHNf d2lkZ2V0SGllcmFyY2h5VXBkYXRlU3VzcGVuZENvdW50LS07Ci0gICAgfQotCi0gICAgc3RhdGlj IGJvb2wgaXNTdXNwZW5kZWQoKSB7IHJldHVybiBzX3dpZGdldEhpZXJhcmNoeVVwZGF0ZVN1c3Bl bmRDb3VudDsgfQotICAgIHN0YXRpYyB2b2lkIHNjaGVkdWxlV2lkZ2V0VG9Nb3ZlKFdpZGdldCog d2lkZ2V0LCBGcmFtZVZpZXcqIGZyYW1lKSB7IHdpZGdldE5ld1BhcmVudE1hcCgpLnNldCh3aWRn ZXQsIGZyYW1lKTsgfQotCi1wcml2YXRlOgotICAgIHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8V2lk Z2V0PiwgRnJhbWVWaWV3Kj4gV2lkZ2V0VG9QYXJlbnRNYXA7Ci0gICAgc3RhdGljIFdpZGdldFRv UGFyZW50TWFwJiB3aWRnZXROZXdQYXJlbnRNYXAoKTsKLQotICAgIHZvaWQgbW92ZVdpZGdldHMo KTsKLQotICAgIHN0YXRpYyB1bnNpZ25lZCBzX3dpZGdldEhpZXJhcmNoeVVwZGF0ZVN1c3BlbmRD b3VudDsKLX07Ci0gICAgCiBjbGFzcyBSZW5kZXJXaWRnZXQgOiBwdWJsaWMgUmVuZGVyUmVwbGFj ZWQsIHByaXZhdGUgT3ZlcmxhcFRlc3RSZXF1ZXN0Q2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0 dWFsIH5SZW5kZXJXaWRnZXQoKTsKQEAgLTY4LDYgKzQyLDkgQEAgcHVibGljOgogICAgIEludFJl Y3Qgd2luZG93Q2xpcFJlY3QoKSBjb25zdDsKIAogICAgIHZvaWQgbm90aWZ5V2lkZ2V0KFdpZGdl dE5vdGlmaWNhdGlvbik7CisgICAgCisgICAgc3RhdGljIHZvaWQgc3VzcGVuZFdpZGdldEhpZXJh cmNoeVVwZGF0ZXMoKTsKKyAgICBzdGF0aWMgdm9pZCByZXN1bWVXaWRnZXRIaWVyYXJjaHlVcGRh dGVzKCk7CiAKICAgICBSZW5kZXJBcmVuYSogcmVmKCkgeyArK21fcmVmQ291bnQ7IHJldHVybiBy ZW5kZXJBcmVuYSgpOyB9CiAgICAgdm9pZCBkZXJlZihSZW5kZXJBcmVuYSopOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggODI3MTZhNmM5MjljYzU0MWM5ODYz NWYxYjg0ZDE2MzQzYzExYzFiZS4uYmZlZGU4ZGI2ZjllZmI2NWZkMTE1NDE4OThhOGNkMTA4NGUy YjYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC0zMzc2 LDggKzMzNzYsOSBAQCBzdGF0aWMgdm9pZCBzZXRNZW51VGFyZ2V0cyhOU01lbnUqIG1lbnUpCiAg ICAgLy8gZGVzY2VuZGFudHMsIGluY2x1ZGluZyBwbHVnLWluIHZpZXdzLiBUaGlzIGNhbiByZXN1 bHQgaW4gY2FsbHMgb3V0IHRvIHBsdWctaW4gY29kZSBhbmQgYmFjayBpbnRvCiAgICAgLy8gV2Vi Q29yZSB2aWEgSmF2YVNjcmlwdCwgd2hpY2ggY291bGQgbm9ybWFsbHkgbXV0YXRlIHRoZSBOU1Zp ZXcgdHJlZSB3aGlsZSBpdCBpcyBiZWluZyB0cmF2ZXJzZWQuCiAgICAgLy8gRGVmZXIgdGhvc2Ug bXV0YXRpb25zIHdoaWxlIGRlc2NlbmRhbnRzIGFyZSBiZWluZyB0cmF2ZXJlc2VkLgotICAgIFdp ZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNo eVVwZGF0ZXM7CisgICAgUmVuZGVyV2lkZ2V0OjpzdXNwZW5kV2lkZ2V0SGllcmFyY2h5VXBkYXRl cygpOwogICAgIFtzdXBlciBfaW52YWxpZGF0ZUdTdGF0ZXNGb3JUcmVlXTsKKyAgICBSZW5kZXJX aWRnZXQ6OnJlc3VtZVdpZGdldEhpZXJhcmNoeVVwZGF0ZXMoKTsKIH0KIAogLSAoQk9PTClpc0Zs aXBwZWQgCg==