57369 2011-03-29 11:49:26 -0700 Rename BidiResolver::eor and sor to m_eor and m_sor to match modern style 2011-03-29 23:24:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 57367 1 eric eric abarth commit-queue dglazkov leviw mitz rniwa oldest_to_newest 375606 0 eric 2011-03-29 11:49:26 -0700 Rename BidiResolver::eor and sor to m_eor and m_sor to match modern style 375610 1 87380 eric 2011-03-29 11:51:15 -0700 Created attachment 87380 Patch 375613 2 87380 dglazkov 2011-03-29 11:53:06 -0700 Comment on attachment 87380 Patch m_mmmm. 375839 3 87380 commit-queue 2011-03-29 15:59:17 -0700 Comment on attachment 87380 Patch Rejecting attachment 87380 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-8', 'apply-..." exit_code: 2 Last 500 characters of output: D at 811. Hunk #22 FAILED at 833. Hunk #23 FAILED at 849. Hunk #25 FAILED at 894. Hunk #26 succeeded at 908 with fuzz 1. Hunk #27 FAILED at 918. Hunk #28 FAILED at 933. 18 out of 28 hunks FAILED -- saving rejects to file Source/WebCore/platform/text/BidiResolver.h.rej patching file Source/WebCore/rendering/InlineIterator.h Hunk #1 succeeded at 247 (offset -1 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Dimitri Glazkov', u'--..." exit_code: 1 Full output: http://queues.webkit.org/results/8285514 376058 4 87380 commit-queue 2011-03-29 23:24:50 -0700 Comment on attachment 87380 Patch Clearing flags on attachment: 87380 Committed r82395: <http://trac.webkit.org/changeset/82395> 376059 5 commit-queue 2011-03-29 23:24:56 -0700 All reviewed patches have been landed. Closing bug. 87380 2011-03-29 11:51:15 -0700 2011-03-29 23:24:50 -0700 Patch bug-57369-20110329205109.patch text/plain 17909 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YjAyN2I3ODhmNWE5ZTBi MGI0ODdlOGFkNTZlZTRhMWVhOWMzYmQ4Li4yNjJkMjhhYjQyN2Q1MjgwZWE1YjM2NWYyMDAzMDkw OWUzYjE4OTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjcgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgQmlkaVJlc29sdmVyOjplb3Ig YW5kIHNvciB0byBtX2VvciBhbmQgbV9zb3IgdG8gbWF0Y2ggbW9kZXJuIHN0eWxlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzM2OQorCisgICAgICAg IEkgY29uc2lkZXJlZCByZW5hbWluZyB0aGVzZSB0byBtX2VuZE9mUnVuIGFuZCBtX3N0YXJ0T2ZS dW4gYnV0IGRlY2lkZWQKKyAgICAgICAgdGhhdCB3YXMgdG9vIHZlcmJvc2UgZm9yIG5vdyAoZ2l2 ZW4gaG93IG9mdGVuIHRoZXkncmUgdXNlZCkuICBJIHN1c3BlY3QKKyAgICAgICAgd2l0aCBhIGJp dCBtb3JlIHJlZmFjdG9yaW5nIHdlJ2xsIGZpbmQgdGhleSdyZSBub3QgdXNlZCB2ZXJ5IG9mdGVu IGFuZCBjYW4gYmUgcmVuYW1lZAorICAgICAgICBpZiBzbyBkZXNpcmVkLgorCisgICAgICAgICog cGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6YXBwZW5k UnVuKToKKyAgICAgICAgKFdlYkNvcmU6Ojo6Y2hlY2tEaXJlY3Rpb25Jbkxvd2VyUmFpc2VFbWJl ZGRpbmdMZXZlbCk6CisgICAgICAgIChXZWJDb3JlOjo6Omxvd2VyRXhwbGljaXRFbWJlZGRpbmdM ZXZlbCk6CisgICAgICAgIChXZWJDb3JlOjo6OnJhaXNlRXhwbGljaXRFbWJlZGRpbmdMZXZlbCk6 CisgICAgICAgIChXZWJDb3JlOjo6OmNyZWF0ZUJpZGlSdW5zRm9yTGluZSk6CisgICAgICAgICog cmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVCaWRp UmVzb2x2ZXI6OmFwcGVuZFJ1bik6CisKKzIwMTEtMDMtMjkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAg ICAgIFJlbmFtZSBCaWRpUmVzb2x2ZXI6Omxhc3QgdG8gbV9sYXN0IHRvIG1hdGNoIG1vZGVybiBz dHlsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcz NjcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2 ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKaW5kZXgg N2I2ZGZhYWFiNmQxYjUwNzIzY2QzYzEzYjYyNjc0MDQ0NTU1ZmViZS4uNGY3ZDIwZjVkOTU2ODFl Yjc1NjI2MzhlZWZkMDBkYmJiYWY4NTFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0JpZGlSZXNvbHZlci5oCkBAIC0xODksOCArMTg5LDEwIEBAIHByb3RlY3RlZDoKICAgICB2 b2lkIHJldmVyc2VSdW5zKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpOwogCiAgICAgSXRl cmF0b3IgbV9jdXJyZW50OwotICAgIEl0ZXJhdG9yIHNvcjsKLSAgICBJdGVyYXRvciBlb3I7Cisg ICAgLy8gc29yIGFuZCBlb3IgYXJlICJzdGFydCBvZiBydW4iIGFuZCAiZW5kIG9mIHJ1biIgcmVz cGVjdGl2ZWx5IGFuZCBjb3JyZXBvbmQKKyAgICAvLyB0byBhYnJldmlhdGlvbnMgdXNlZCBpbiBV QkEgc3BlYzogaHR0cDovL3VuaWNvZGUub3JnL3JlcG9ydHMvdHI5LyNCRDcKKyAgICBJdGVyYXRv ciBtX3NvcjsKKyAgICBJdGVyYXRvciBtX2VvcjsKICAgICBJdGVyYXRvciBtX2xhc3Q7CiAgICAg QmlkaVN0YXR1cyBtX3N0YXR1czsKICAgICBXVEY6OlVuaWNvZGU6OkRpcmVjdGlvbiBtX2RpcmVj dGlvbjsKQEAgLTI4OCw5ICsyOTAsOSBAQCBpbmxpbmUgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0 b3IsIFJ1bj46Om1vdmVSdW5Ub0JlZ2lubmluZyhSdW4qIHJ1bikKIHRlbXBsYXRlIDxjbGFzcyBJ dGVyYXRvciwgY2xhc3MgUnVuPgogdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmFw cGVuZFJ1bigpCiB7Ci0gICAgaWYgKCFlbXB0eVJ1biAmJiAhZW9yLmF0RW5kKCkpIHsKLSAgICAg ICAgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSBzb3Iub2Zmc2V0KCk7Ci0gICAgICAgIHVuc2lnbmVk IGVuZE9mZnNldCA9IGVvci5vZmZzZXQoKTsKKyAgICBpZiAoIWVtcHR5UnVuICYmICFtX2Vvci5h dEVuZCgpKSB7CisgICAgICAgIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0ID0gbV9zb3Iub2Zmc2V0KCk7 CisgICAgICAgIHVuc2lnbmVkIGVuZE9mZnNldCA9IG1fZW9yLm9mZnNldCgpOwogCiAgICAgICAg IGlmICghZW5kT2ZMaW5lLmF0RW5kKCkgJiYgZW5kT2Zmc2V0ID49IGVuZE9mTGluZS5vZmZzZXQo KSkgewogICAgICAgICAgICAgbV9yZWFjaGVkRW5kT2ZMaW5lID0gdHJ1ZTsKQEAgLTMwMCw4ICsz MDIsOCBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6YXBwZW5kUnVuKCkKICAg ICAgICAgaWYgKGVuZE9mZnNldCA+PSBzdGFydE9mZnNldCkKICAgICAgICAgICAgIGFkZFJ1bihu ZXcgUnVuKHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQgKyAxLCBjb250ZXh0KCksIG1fZGlyZWN0aW9u KSk7CiAKLSAgICAgICAgZW9yLmluY3JlbWVudCgpOwotICAgICAgICBzb3IgPSBlb3I7CisgICAg ICAgIG1fZW9yLmluY3JlbWVudCgpOworICAgICAgICBtX3NvciA9IG1fZW9yOwogICAgIH0KIAog ICAgIG1fZGlyZWN0aW9uID0gV1RGOjpVbmljb2RlOjpPdGhlck5ldXRyYWw7CkBAIC0zMjIsNyAr MzI0LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNoZWNrRGlyZWN0aW9u SW5Mb3dlclJhaXNlRW1iZWRkaW5nTGV2ZWwoKQogewogICAgIHVzaW5nIG5hbWVzcGFjZSBXVEY6 OlVuaWNvZGU7CiAKLSAgICBBU1NFUlQobV9zdGF0dXMuZW9yICE9IE90aGVyTmV1dHJhbCB8fCBl b3IuYXRFbmQoKSk7CisgICAgQVNTRVJUKG1fc3RhdHVzLmVvciAhPSBPdGhlck5ldXRyYWwgfHwg bV9lb3IuYXRFbmQoKSk7CiAgICAgQVNTRVJUKG1fc3RhdHVzLmxhc3QgIT0gTm9uU3BhY2luZ01h cmsKICAgICAgICAgJiYgbV9zdGF0dXMubGFzdCAhPSBCb3VuZGFyeU5ldXRyYWwKICAgICAgICAg JiYgbV9zdGF0dXMubGFzdCAhPSBSaWdodFRvTGVmdEVtYmVkZGluZwpAQCAtMzM5LDcgKzM0MSw3 IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+Ojpsb3dlckV4cGxpY2l0RW1iZWRk aW5nTGV2ZWwoV1RGOjpVbmljb2RlOjpEaXJlCiB7CiAgICAgdXNpbmcgbmFtZXNwYWNlIFdURjo6 VW5pY29kZTsKIAotICAgIGlmICghZW1wdHlSdW4gJiYgZW9yICE9IG1fbGFzdCkgeworICAgIGlm ICghZW1wdHlSdW4gJiYgbV9lb3IgIT0gbV9sYXN0KSB7CiAgICAgICAgIGNoZWNrRGlyZWN0aW9u SW5Mb3dlclJhaXNlRW1iZWRkaW5nTGV2ZWwoKTsKICAgICAgICAgLy8gYmlkaS5zb3IgLi4uIGJp ZGkuZW9yIC4uLiBiaWRpLmxhc3QgZW9yOyBuZWVkIHRvIGFwcGVuZCB0aGUgYmlkaS5zb3ItYmlk aS5lb3IgcnVuIG9yIGV4dGVuZCBpdCB0aHJvdWdoIGJpZGkubGFzdAogICAgICAgICBpZiAoZnJv bSA9PSBMZWZ0VG9SaWdodCkgewpAQCAtMzYwLDE0ICszNjIsMTQgQEAgdm9pZCBCaWRpUmVzb2x2 ZXI8SXRlcmF0b3IsIFJ1bj46Omxvd2VyRXhwbGljaXRFbWJlZGRpbmdMZXZlbChXVEY6OlVuaWNv ZGU6OkRpcmUKICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgbV9kaXJlY3Rp b24gPSBSaWdodFRvTGVmdDsKICAgICAgICAgfQotICAgICAgICBlb3IgPSBtX2xhc3Q7CisgICAg ICAgIG1fZW9yID0gbV9sYXN0OwogICAgIH0KICAgICBhcHBlbmRSdW4oKTsKICAgICBlbXB0eVJ1 biA9IHRydWU7CiAgICAgLy8gc29yIGZvciB0aGUgbmV3IHJ1biBpcyBkZXRlcm1pbmVkIGJ5IHRo ZSBoaWdoZXIgbGV2ZWwgKHJ1bGUgWDEwKQogICAgIHNldExhc3REaXIoZnJvbSk7CiAgICAgc2V0 TGFzdFN0cm9uZ0Rpcihmcm9tKTsKLSAgICBlb3IgPSBJdGVyYXRvcigpOworICAgIG1fZW9yID0g SXRlcmF0b3IoKTsKIH0KIAogdGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+CkBA IC0zNzUsNyArMzc3LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OnJhaXNl RXhwbGljaXRFbWJlZGRpbmdMZXZlbChXVEY6OlVuaWNvZGU6OkRpcmUKIHsKICAgICB1c2luZyBu YW1lc3BhY2UgV1RGOjpVbmljb2RlOwogCi0gICAgaWYgKCFlbXB0eVJ1biAmJiBlb3IgIT0gbV9s YXN0KSB7CisgICAgaWYgKCFlbXB0eVJ1biAmJiBtX2VvciAhPSBtX2xhc3QpIHsKICAgICAgICAg Y2hlY2tEaXJlY3Rpb25Jbkxvd2VyUmFpc2VFbWJlZGRpbmdMZXZlbCgpOwogICAgICAgICAvLyBi aWRpLnNvciAuLi4gYmlkaS5lb3IgLi4uIGJpZGkubGFzdCBlb3I7IG5lZWQgdG8gYXBwZW5kIHRo ZSBiaWRpLnNvci1iaWRpLmVvciBydW4gb3IgZXh0ZW5kIGl0IHRocm91Z2ggYmlkaS5sYXN0CiAg ICAgICAgIGlmICh0byA9PSBMZWZ0VG9SaWdodCkgewpAQCAtMzk4LDEzICs0MDAsMTMgQEAgdm9p ZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OnJhaXNlRXhwbGljaXRFbWJlZGRpbmdMZXZl bChXVEY6OlVuaWNvZGU6OkRpcmUKICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAg ICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKICAgICAgICAgfQotICAgICAgICBlb3IgPSBt X2xhc3Q7CisgICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgIH0KICAgICBhcHBlbmRSdW4oKTsK ICAgICBlbXB0eVJ1biA9IHRydWU7CiAgICAgc2V0TGFzdERpcih0byk7CiAgICAgc2V0TGFzdFN0 cm9uZ0Rpcih0byk7Ci0gICAgZW9yID0gSXRlcmF0b3IoKTsKKyAgICBtX2VvciA9IEl0ZXJhdG9y KCk7CiB9CiAKIHRlbXBsYXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuPgpAQCAtNTcyLDEw ICs1NzQsMTAgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlS dW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKIAogICAgIGlmIChvdmVycmlkZSAh PSBOb1Zpc3VhbE92ZXJyaWRlKSB7CiAgICAgICAgIGVtcHR5UnVuID0gZmFsc2U7Ci0gICAgICAg IHNvciA9IG1fY3VycmVudDsKLSAgICAgICAgZW9yID0gSXRlcmF0b3IoKTsKKyAgICAgICAgbV9z b3IgPSBtX2N1cnJlbnQ7CisgICAgICAgIG1fZW9yID0gSXRlcmF0b3IoKTsKICAgICAgICAgd2hp bGUgKG1fY3VycmVudCAhPSBlbmQgJiYgIW1fY3VycmVudC5hdEVuZCgpKSB7Ci0gICAgICAgICAg ICBlb3IgPSBtX2N1cnJlbnQ7CisgICAgICAgICAgICBtX2VvciA9IG1fY3VycmVudDsKICAgICAg ICAgICAgIGluY3JlbWVudCgpOwogICAgICAgICB9CiAgICAgICAgIG1fZGlyZWN0aW9uID0gb3Zl cnJpZGUgPT0gVmlzdWFsTGVmdFRvUmlnaHRPdmVycmlkZSA/IExlZnRUb1JpZ2h0IDogUmlnaHRU b0xlZnQ7CkBAIC01ODgsNyArNTkwLDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1 bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKIAogICAg IGVtcHR5UnVuID0gdHJ1ZTsKIAotICAgIGVvciA9IEl0ZXJhdG9yKCk7CisgICAgbV9lb3IgPSBJ dGVyYXRvcigpOwogCiAgICAgbV9sYXN0ID0gbV9jdXJyZW50OwogICAgIGJvb2wgcGFzdEVuZCA9 IGZhbHNlOwpAQCAtNjIyLDcgKzYyNCw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAg ICAgICAgICAgICAgZGlyQ3VycmVudCA9IG1fc3RhdHVzLmxhc3Q7CiAgICAgICAgIH0KIAotICAg ICAgICBBU1NFUlQobV9zdGF0dXMuZW9yICE9IE90aGVyTmV1dHJhbCB8fCBlb3IuYXRFbmQoKSk7 CisgICAgICAgIEFTU0VSVChtX3N0YXR1cy5lb3IgIT0gT3RoZXJOZXV0cmFsIHx8IG1fZW9yLmF0 RW5kKCkpOwogICAgICAgICBzd2l0Y2ggKGRpckN1cnJlbnQpIHsKIAogICAgICAgICAvLyBlbWJl ZGRpbmcgYW5kIG92ZXJyaWRlcyAoWDEtWDkgaW4gdGhlIEJpZGkgc3BlY3MpCkBAIC02NjIsNyAr NjY0LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5z Rm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoY29udGV4 dCgpLT5kaXIoKSAhPSBMZWZ0VG9SaWdodCkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1iZWRkaW5nIGRpcmVjdGlvbiwgd2hpY2gg aXMgUgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlvbiA9IFJpZ2h0VG9MZWZ0OwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB9CkBAIC02NzMsMTQgKzY3NSwxNCBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRv ciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwog ICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAoY29udGV4dCgpLT5kaXIoKSAhPSBMZWZ0VG9SaWdodCkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIHRoZSBuZXV0cmFscyB0YWtlIHRoZSBlbWJlZGRpbmcgZGlyZWN0 aW9uLCB3aGljaCBpcyBSCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9sYXN0 OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gUmlnaHRUb0xlZnQ7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdGF0dXMubGFzdFN0cm9uZyAhPSBM ZWZ0VG9SaWdodCkgewogICAgICAgICAgICAgICAgICAgICAgICAgLy9sYXN0IHN0dWZmIHRha2Vz IGVtYmVkZGluZyBkaXIKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChjb250ZXh0KCktPmRp cigpID09IFJpZ2h0VG9MZWZ0KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0g bV9sYXN0OyAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2VvciA9IG1fbGFzdDsgCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1 bigpOwpAQCAtNjg4LDcgKzY5MCw3IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+ OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAg ICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CisgICAgICAgICAgICBtX2VvciA9IG1f Y3VycmVudDsKICAgICAgICAgICAgIG1fc3RhdHVzLmVvciA9IExlZnRUb1JpZ2h0OwogICAgICAg ICAgICAgbV9zdGF0dXMubGFzdFN0cm9uZyA9IExlZnRUb1JpZ2h0OwogICAgICAgICAgICAgbV9k aXJlY3Rpb24gPSBMZWZ0VG9SaWdodDsKQEAgLTcxMywxOSArNzE1LDE5IEBAIHZvaWQgQmlkaVJl c29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0 b3ImIGVuZCwgVmlzCiAgICAgICAgICAgICAgICAgY2FzZSBPdGhlck5ldXRyYWw6CiAgICAgICAg ICAgICAgICAgICAgIGlmIChtX3N0YXR1cy5lb3IgPT0gRXVyb3BlYW5OdW1iZXIpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChtX3N0YXR1cy5sYXN0U3Ryb25nID09IExlZnRUb1JpZ2h0 ICYmIGNvbnRleHQoKS0+ZGlyKCkgPT0gTGVmdFRvUmlnaHQpCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW9yID0gbV9sYXN0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZW9y ID0gbV9sYXN0OwogICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAg ICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdGF0dXMuZW9yID09IEFyYWJpY051bWJlcikKICAg ICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICBl bHNlIGlmIChtX3N0YXR1cy5sYXN0U3Ryb25nID09IExlZnRUb1JpZ2h0KSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoY29udGV4dCgpLT5kaXIoKSA9PSBMZWZ0VG9SaWdodCkKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV9lb3IgPSBtX2xhc3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRS dW4oKTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGRlZmF1bHQ6CiAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgZW9y ID0gbV9jdXJyZW50OworICAgICAgICAgICAgbV9lb3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAg ICBtX3N0YXR1cy5lb3IgPSBSaWdodFRvTGVmdDsKICAgICAgICAgICAgIG1fc3RhdHVzLmxhc3RT dHJvbmcgPSBkaXJDdXJyZW50OwogICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVm dDsKQEAgLTc0Myw3ICs3NDUsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6 Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAg ICAgICAgICAgICBjYXNlIFJpZ2h0VG9MZWZ0OgogICAgICAgICAgICAgICAgICAgICBjYXNlIFJp Z2h0VG9MZWZ0QXJhYmljOgogICAgICAgICAgICAgICAgICAgICBjYXNlIEFyYWJpY051bWJlcjoK LSAgICAgICAgICAgICAgICAgICAgICAgIGVvciA9IG1fbGFzdDsKKyAgICAgICAgICAgICAgICAg ICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVu KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlvbiA9IEV1cm9wZWFuTnVtYmVy OwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC03NjMsNyArNzY1LDcgQEAgdm9p ZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25z dCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8g VGVybWluYXRlIHRoZSBFTiBydW4uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFw cGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBNYWtlIGFuIFIg cnVuLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX3N0YXR1cy5sYXN0 ID09IEV1cm9wZWFuTnVtYmVyVGVybWluYXRvciA/IGxhc3RCZWZvcmVFVCA6IG1fbGFzdDsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9lb3IgPSBtX3N0YXR1cy5sYXN0ID09IEV1 cm9wZWFuTnVtYmVyVGVybWluYXRvciA/IGxhc3RCZWZvcmVFVCA6IG1fbGFzdDsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVmdDsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCk7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIEJlZ2luIGEgbmV3IEVOIHJ1bi4KQEAgLTc3NCw3ICs3NzYsNyBA QCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5l KGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFw cGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChtX3N0YXR1cy5sYXN0 U3Ryb25nID09IFJpZ2h0VG9MZWZ0IHx8IGNvbnRleHQoKS0+ZGlyKCkgPT0gUmlnaHRUb0xlZnQp IHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gTWFrZSBhbiBSIHJ1bi4KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW9yID0gbV9zdGF0dXMubGFzdCA9PSBFdXJv cGVhbk51bWJlclRlcm1pbmF0b3IgPyBsYXN0QmVmb3JlRVQgOiBtX2xhc3Q7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1fZW9yID0gbV9zdGF0dXMubGFzdCA9PSBFdXJvcGVhbk51 bWJlclRlcm1pbmF0b3IgPyBsYXN0QmVmb3JlRVQgOiBtX2xhc3Q7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fZGlyZWN0aW9uID0gUmlnaHRUb0xlZnQ7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bigpOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBCZWdpbiBhIG5ldyBFTiBydW4uCkBAIC03ODIsNyArNzg0LDcgQEAgdm9pZCBC aWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJ dGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG1fc3RhdHVzLmxhc3RTdHJvbmcgPT0gUmlnaHRU b0xlZnQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBFeHRlbmQgdGhlIFIgcnVu IHRvIGluY2x1ZGUgdGhlIG5ldXRyYWxzLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVv ciA9IG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1iZXJUZXJtaW5hdG9yID8gbGFzdEJlZm9y ZUVUIDogbV9sYXN0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZW9yID0gbV9zdGF0 dXMubGFzdCA9PSBFdXJvcGVhbk51bWJlclRlcm1pbmF0b3IgPyBsYXN0QmVmb3JlRVQgOiBtX2xh c3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBSaWdodFRvTGVm dDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBCZWdpbiBhIG5ldyBFTiBydW4uCkBAIC03OTEsNyArNzkzLDcg QEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGlu ZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoK ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICBlb3IgPSBtX2N1cnJlbnQ7CisgICAgICAgICAgICAgICAgbV9lb3IgPSBtX2N1 cnJlbnQ7CiAgICAgICAgICAgICAgICAgbV9zdGF0dXMuZW9yID0gRXVyb3BlYW5OdW1iZXI7CiAg ICAgICAgICAgICAgICAgaWYgKG1fZGlyZWN0aW9uID09IE90aGVyTmV1dHJhbCkKICAgICAgICAg ICAgICAgICAgICAgbV9kaXJlY3Rpb24gPSBMZWZ0VG9SaWdodDsKQEAgLTgwOSw3ICs4MTEsNyBA QCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5l KGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgIGNhc2UgUmlnaHRUb0xl ZnQ6CiAgICAgICAgICAgICAgICAgY2FzZSBSaWdodFRvTGVmdEFyYWJpYzoKICAgICAgICAgICAg ICAgICBjYXNlIEV1cm9wZWFuTnVtYmVyOgotICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xh c3Q7CisgICAgICAgICAgICAgICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgICAgICAgICAgICAg ICAgICBhcHBlbmRSdW4oKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICAgICAgY2FzZSBDb21tb25OdW1iZXJTZXBhcmF0b3I6CkBAIC04MzEsMTIgKzgzMywxMiBAQCB2 b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNv bnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgICAgICAgICAgICAgbV9kaXJlY3Rp b24gPSBSaWdodFRvTGVmdDsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChtX2RpcmVj dGlvbiA9PSBPdGhlck5ldXRyYWwpCiAgICAgICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlv biA9IG1fc3RhdHVzLmxhc3RTdHJvbmcgPT0gTGVmdFRvUmlnaHQgPyBMZWZ0VG9SaWdodCA6IFJp Z2h0VG9MZWZ0OwotICAgICAgICAgICAgICAgICAgICBlb3IgPSBtX2xhc3Q7CisgICAgICAgICAg ICAgICAgICAgIG1fZW9yID0gbV9sYXN0OwogICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4o KTsKICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVvciA9IG1fY3VycmVudDsKKyAgICAgICAgICAg IG1fZW9yID0gbV9jdXJyZW50OwogICAgICAgICAgICAgbV9zdGF0dXMuZW9yID0gQXJhYmljTnVt YmVyOwogICAgICAgICAgICAgaWYgKG1fZGlyZWN0aW9uID09IE90aGVyTmV1dHJhbCkKICAgICAg ICAgICAgICAgICBtX2RpcmVjdGlvbiA9IEFyYWJpY051bWJlcjsKQEAgLTg0NywxNiArODQ5LDE2 IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0Zvckxp bmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgIGNhc2UgRXVyb3BlYW5OdW1iZXJU ZXJtaW5hdG9yOgogICAgICAgICAgICAgaWYgKG1fc3RhdHVzLmxhc3QgPT0gRXVyb3BlYW5OdW1i ZXIpIHsKICAgICAgICAgICAgICAgICBkaXJDdXJyZW50ID0gRXVyb3BlYW5OdW1iZXI7Ci0gICAg ICAgICAgICAgICAgZW9yID0gbV9jdXJyZW50OworICAgICAgICAgICAgICAgIG1fZW9yID0gbV9j dXJyZW50OwogICAgICAgICAgICAgICAgIG1fc3RhdHVzLmVvciA9IGRpckN1cnJlbnQ7CiAgICAg ICAgICAgICB9IGVsc2UgaWYgKG1fc3RhdHVzLmxhc3QgIT0gRXVyb3BlYW5OdW1iZXJUZXJtaW5h dG9yKQotICAgICAgICAgICAgICAgIGxhc3RCZWZvcmVFVCA9IGVtcHR5UnVuID8gZW9yIDogbV9s YXN0OworICAgICAgICAgICAgICAgIGxhc3RCZWZvcmVFVCA9IGVtcHR5UnVuID8gbV9lb3IgOiBt X2xhc3Q7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAvLyBib3VuZGFyeSBuZXV0cmFs cyBzaG91bGQgYmUgaWdub3JlZAogICAgICAgICBjYXNlIEJvdW5kYXJ5TmV1dHJhbDoKLSAgICAg ICAgICAgIGlmIChlb3IgPT0gbV9sYXN0KQotICAgICAgICAgICAgICAgIGVvciA9IG1fY3VycmVu dDsKKyAgICAgICAgICAgIGlmIChtX2VvciA9PSBtX2xhc3QpCisgICAgICAgICAgICAgICAgbV9l b3IgPSBtX2N1cnJlbnQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIC8vIG5ldXRy YWxzCiAgICAgICAgIGNhc2UgQmxvY2tTZXBhcmF0b3I6CkBAIC04NzMsOSArODc1LDkgQEAgdm9p ZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25z dCBJdGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKHBhc3RFbmQgJiYgZW9yID09IG1fY3VycmVudCkgeworICAgICAgICBpZiAocGFz dEVuZCAmJiBtX2VvciA9PSBtX2N1cnJlbnQpIHsKICAgICAgICAgICAgIGlmICghbV9yZWFjaGVk RW5kT2ZMaW5lKSB7Ci0gICAgICAgICAgICAgICAgZW9yID0gZW5kT2ZMaW5lOworICAgICAgICAg ICAgICAgIG1fZW9yID0gZW5kT2ZMaW5lOwogICAgICAgICAgICAgICAgIHN3aXRjaCAobV9zdGF0 dXMuZW9yKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgTGVmdFRvUmlnaHQ6CiAgICAgICAg ICAgICAgICAgICAgIGNhc2UgUmlnaHRUb0xlZnQ6CkBAIC04OTIsOCArODk0LDggQEAgdm9pZCBC aWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJ dGVyYXRvciYgZW5kLCBWaXMKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG1fY3VycmVudCA9 IGVuZDsKICAgICAgICAgICAgIG1fc3RhdHVzID0gc3RhdGVBdEVuZC5tX3N0YXR1czsKLSAgICAg ICAgICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKLSAgICAgICAgICAgIGVvciA9IHN0YXRlQXRF bmQuZW9yOworICAgICAgICAgICAgbV9zb3IgPSBzdGF0ZUF0RW5kLm1fc29yOyAKKyAgICAgICAg ICAgIG1fZW9yID0gc3RhdGVBdEVuZC5tX2VvcjsKICAgICAgICAgICAgIG1fbGFzdCA9IHN0YXRl QXRFbmQubV9sYXN0OwogICAgICAgICAgICAgbV9yZWFjaGVkRW5kT2ZMaW5lID0gc3RhdGVBdEVu ZC5tX3JlYWNoZWRFbmRPZkxpbmU7CiAgICAgICAgICAgICBsYXN0QmVmb3JlRVQgPSBzdGF0ZUF0 RW5kLmxhc3RCZWZvcmVFVDsKQEAgLTkwNiw3ICs5MDgsNyBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJ dGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQs IFZpcwogICAgICAgICBtX2xhc3QgPSBtX2N1cnJlbnQ7CiAKICAgICAgICAgaWYgKGVtcHR5UnVu KSB7Ci0gICAgICAgICAgICBzb3IgPSBtX2N1cnJlbnQ7CisgICAgICAgICAgICBtX3NvciA9IG1f Y3VycmVudDsKICAgICAgICAgICAgIGVtcHR5UnVuID0gZmFsc2U7CiAgICAgICAgIH0KIApAQCAt OTE2LDggKzkxOCw4IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVC aWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgICAgICAgICBpZiAo Y29tbWl0dGVkICYmIHBhc3RFbmQpIHsKICAgICAgICAgICAgICAgICBtX2N1cnJlbnQgPSBlbmQ7 CiAgICAgICAgICAgICAgICAgbV9zdGF0dXMgPSBzdGF0ZUF0RW5kLm1fc3RhdHVzOwotICAgICAg ICAgICAgICAgIHNvciA9IHN0YXRlQXRFbmQuc29yOyAKLSAgICAgICAgICAgICAgICBlb3IgPSBz dGF0ZUF0RW5kLmVvcjsKKyAgICAgICAgICAgICAgICBtX3NvciA9IHN0YXRlQXRFbmQubV9zb3I7 IAorICAgICAgICAgICAgICAgIG1fZW9yID0gc3RhdGVBdEVuZC5tX2VvcjsKICAgICAgICAgICAg ICAgICBtX2xhc3QgPSBzdGF0ZUF0RW5kLm1fbGFzdDsKICAgICAgICAgICAgICAgICBtX3JlYWNo ZWRFbmRPZkxpbmUgPSBzdGF0ZUF0RW5kLm1fcmVhY2hlZEVuZE9mTGluZTsKICAgICAgICAgICAg ICAgICBsYXN0QmVmb3JlRVQgPSBzdGF0ZUF0RW5kLmxhc3RCZWZvcmVFVDsKQEAgLTkzMSw4ICs5 MzMsOCBAQCB2b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y3JlYXRlQmlkaVJ1bnNG b3JMaW5lKGNvbnN0IEl0ZXJhdG9yJiBlbmQsIFZpcwogICAgICAgICAgICAgaWYgKGVtcHR5UnVu KQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgc3RhdGVBdEVuZC5tX3N0YXR1 cyA9IG1fc3RhdHVzOwotICAgICAgICAgICAgc3RhdGVBdEVuZC5zb3IgPSBzb3I7IAotICAgICAg ICAgICAgc3RhdGVBdEVuZC5lb3IgPSBlb3I7CisgICAgICAgICAgICBzdGF0ZUF0RW5kLm1fc29y ID0gbV9zb3I7CisgICAgICAgICAgICBzdGF0ZUF0RW5kLm1fZW9yID0gbV9lb3I7CiAgICAgICAg ICAgICBzdGF0ZUF0RW5kLm1fbGFzdCA9IG1fbGFzdDsKICAgICAgICAgICAgIHN0YXRlQXRFbmQu bV9yZWFjaGVkRW5kT2ZMaW5lID0gbV9yZWFjaGVkRW5kT2ZMaW5lOwogICAgICAgICAgICAgc3Rh dGVBdEVuZC5sYXN0QmVmb3JlRVQgPSBsYXN0QmVmb3JlRVQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVJdGVyYXRvci5oCmluZGV4IDY4MDVmNzMyYjQ5OTY0Mzc2MDA1NWUyNGQ4Y2U2 ZjhlYjMwZmQzZDIuLmU5YmYxMTMxZTE5M2VjYTAwOTk3YzUxMTRmYjg3NGQ5ZjE2ZDZiODEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCkBAIC0yNDgsMjcgKzI0 OCwyNyBAQCBpbmxpbmUgdm9pZCBJbmxpbmVCaWRpUmVzb2x2ZXI6OmluY3JlbWVudCgpCiB0ZW1w bGF0ZSA8PgogaW5saW5lIHZvaWQgSW5saW5lQmlkaVJlc29sdmVyOjphcHBlbmRSdW4oKQogewot ICAgIGlmICghZW1wdHlSdW4gJiYgIWVvci5hdEVuZCgpKSB7Ci0gICAgICAgIGludCBzdGFydCA9 IHNvci5tX3BvczsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiBvYmogPSBzb3IubV9vYmo7Ci0gICAg ICAgIHdoaWxlIChvYmogJiYgb2JqICE9IGVvci5tX29iaiAmJiBvYmogIT0gZW5kT2ZMaW5lLm1f b2JqKSB7CisgICAgaWYgKCFlbXB0eVJ1biAmJiAhbV9lb3IuYXRFbmQoKSkgeworICAgICAgICBp bnQgc3RhcnQgPSBtX3Nvci5tX3BvczsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBvYmogPSBtX3Nv ci5tX29iajsKKyAgICAgICAgd2hpbGUgKG9iaiAmJiBvYmogIT0gbV9lb3IubV9vYmogJiYgb2Jq ICE9IGVuZE9mTGluZS5tX29iaikgewogICAgICAgICAgICAgUmVuZGVyQmxvY2s6OmFwcGVuZFJ1 bnNGb3JPYmplY3Qoc3RhcnQsIG9iai0+bGVuZ3RoKCksIG9iaiwgKnRoaXMpOyAgICAgICAgCiAg ICAgICAgICAgICBzdGFydCA9IDA7Ci0gICAgICAgICAgICBvYmogPSBiaWRpTmV4dChzb3IubV9i bG9jaywgb2JqKTsKKyAgICAgICAgICAgIG9iaiA9IGJpZGlOZXh0KG1fc29yLm1fYmxvY2ssIG9i aik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG9iaikgewotICAgICAgICAgICAgdW5zaWduZWQg cG9zID0gb2JqID09IGVvci5tX29iaiA/IGVvci5tX3BvcyA6IFVJTlRfTUFYOworICAgICAgICAg ICAgdW5zaWduZWQgcG9zID0gb2JqID09IG1fZW9yLm1fb2JqID8gbV9lb3IubV9wb3MgOiBVSU5U X01BWDsKICAgICAgICAgICAgIGlmIChvYmogPT0gZW5kT2ZMaW5lLm1fb2JqICYmIGVuZE9mTGlu ZS5tX3BvcyA8PSBwb3MpIHsKICAgICAgICAgICAgICAgICBtX3JlYWNoZWRFbmRPZkxpbmUgPSB0 cnVlOwogICAgICAgICAgICAgICAgIHBvcyA9IGVuZE9mTGluZS5tX3BvczsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIC8vIEl0J3MgT0sgdG8gYWRkIHJ1bnMgZm9yIHplcm8tbGVuZ3RoIFJl bmRlck9iamVjdHMsIGp1c3QgZG9uJ3QgbWFrZSB0aGUgcnVuIGxhcmdlciB0aGFuIGl0IHNob3Vs ZCBiZQotICAgICAgICAgICAgaW50IGVuZCA9IG9iai0+bGVuZ3RoKCkgPyBwb3MrMSA6IDA7Cisg ICAgICAgICAgICBpbnQgZW5kID0gb2JqLT5sZW5ndGgoKSA/IHBvcyArIDEgOiAwOwogICAgICAg ICAgICAgUmVuZGVyQmxvY2s6OmFwcGVuZFJ1bnNGb3JPYmplY3Qoc3RhcnQsIGVuZCwgb2JqLCAq dGhpcyk7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIGVvci5pbmNyZW1lbnQoKTsKLSAg ICAgICAgc29yID0gZW9yOworICAgICAgICBtX2Vvci5pbmNyZW1lbnQoKTsKKyAgICAgICAgbV9z b3IgPSBtX2VvcjsKICAgICB9CiAKICAgICBtX2RpcmVjdGlvbiA9IFdURjo6VW5pY29kZTo6T3Ro ZXJOZXV0cmFsOwo=