138666 2014-11-12 13:45:52 -0800 REGRESSION(r175806): Capturing CString is not thread safe (Requested by anttik on #webkit). 2014-11-12 13:48:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138018 1 commit-queue commit-queue andersca zan oldest_to_newest 1048243 0 commit-queue 2014-11-12 13:45:52 -0800 http://trac.webkit.org/changeset/175806 broke the build: Capturing CString is not thread safe (Requested by anttik 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. 1048245 1 241439 commit-queue 2014-11-12 13:46:17 -0800 Created attachment 241439 ROLLOUT of r175806 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. 1048246 2 241439 commit-queue 2014-11-12 13:48:49 -0800 Comment on attachment 241439 ROLLOUT of r175806 Clearing flags on attachment: 241439 Committed r176036: <http://trac.webkit.org/changeset/176036> 1048247 3 commit-queue 2014-11-12 13:48:52 -0800 All reviewed patches have been landed. Closing bug. 241439 2014-11-12 13:46:17 -0800 2014-11-12 13:48:49 -0800 ROLLOUT of r175806 bug-138666-20141112134622.patch text/plain 10171 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzY1ZDgyNjIyYTY2MTEy ZDdlZjc2OTM0NjkxNGZkZjYxMzFjMmZkNy4uMDBlZDE2ZmU5NWNlMWQ4N2FkZDg2NWU2NGEwYjc1 ZmI1YWYxZWU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTExLTEyICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTc1ODA2LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4NjY2CisKKyAgICAgICAgQ2FwdHVyaW5nIENTdHJpbmcgaXMgbm90 IHRocmVhZCBzYWZlIChSZXF1ZXN0ZWQgYnkgYW50dGlrIG9uCisgICAgICAgICN3ZWJraXQpLgor CisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiW1dLMl0gVXNlIEMrKyBs YW1iZGFzIGluIElQQzo6Q29ubmVjdGlvbiIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzODAxOAorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8xNzU4MDYKKwogMjAxNC0xMS0xMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9y dG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIGFjdGlvbiBtZW51cyBtdWNoIG1vcmUgcmVs aWFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9u LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcAppbmRleCAy NDI2MDFiNzVlY2JkOWE1YjI1YTNhN2Y3YTVlZTRhNDM2MGNlNDFiLi4wY2M1NDgzYTNiM2MzMDY5 N2I0ZjMyNzNjZWExYzk4ZmY4NmIyNzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBD L0Nvbm5lY3Rpb24uY3BwCkBAIC0xNjQsMTMgKzE2NCw4IEBAIGJvb2wgQ29ubmVjdGlvbjo6U3lu Y01lc3NhZ2VTdGF0ZTo6cHJvY2Vzc0luY29taW5nTWVzc2FnZShDb25uZWN0aW9uKiBjb25uZWN0 aW9uCiAgICAgewogICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9tdXRleCk7CiAgICAgICAg IAotICAgICAgICBpZiAobV9kaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrU2V0LmFkZChj b25uZWN0aW9uKS5pc05ld0VudHJ5KSB7Ci0gICAgICAgICAgICBSZWZQdHI8U3luY01lc3NhZ2VT dGF0ZT4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKLSAgICAgICAgICAgIFJlZlB0cjxDb25uZWN0aW9u PiBwcm90ZWN0ZWRDb25uZWN0aW9uKGNvbm5lY3Rpb24pOwotICAgICAgICAgICAgbV9ydW5Mb29w LmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzLCBwcm90ZWN0ZWRDb25uZWN0aW9uXSB7Ci0gICAgICAg ICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlzcGF0Y2hNZXNzYWdlQW5kUmVzZXREaWRTY2hlZHVs ZURpc3BhdGNoTWVzc2FnZXNGb3JDb25uZWN0aW9uKHByb3RlY3RlZENvbm5lY3Rpb24uZ2V0KCkp OwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKG1fZGlkU2NoZWR1bGVE aXNwYXRjaE1lc3NhZ2VzV29ya1NldC5hZGQoY29ubmVjdGlvbikuaXNOZXdFbnRyeSkKKyAgICAg ICAgICAgIG1fcnVuTG9vcC5kaXNwYXRjaChiaW5kKCZTeW5jTWVzc2FnZVN0YXRlOjpkaXNwYXRj aE1lc3NhZ2VBbmRSZXNldERpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc0ZvckNvbm5lY3Rpb24s IHRoaXMsIFJlZlB0cjxDb25uZWN0aW9uPihjb25uZWN0aW9uKSkpOwogCiAgICAgICAgIG1fbWVz c2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LmFwcGVuZChXVEY6Om1vdmUo Y29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZSkpOwogICAgIH0KQEAgLTMwMSw4ICsyOTYsMTAg QEAgdm9pZCBDb25uZWN0aW9uOjpyZW1vdmVXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoU3RyaW5n UmVmZXJlbmNlIG1lc3NhZ2VSZWNlaXZlck4KICAgICB9KTsKIH0KIAotdm9pZCBDb25uZWN0aW9u OjpkaXNwYXRjaFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlck1lc3NhZ2UoV29ya1F1ZXVlTWVzc2Fn ZVJlY2VpdmVyKiB3b3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIsIE1lc3NhZ2VEZWNvZGVyKiBkZWNv ZGVyKQordm9pZCBDb25uZWN0aW9uOjpkaXNwYXRjaFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlck1l c3NhZ2UoV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKiB3b3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIs IE1lc3NhZ2VEZWNvZGVyKiBpbmNvbWluZ01lc3NhZ2VEZWNvZGVyKQogeworICAgIHN0ZDo6dW5p cXVlX3B0cjxNZXNzYWdlRGVjb2Rlcj4gZGVjb2RlcihpbmNvbWluZ01lc3NhZ2VEZWNvZGVyKTsK KwogICAgIGlmICghZGVjb2Rlci0+aXNTeW5jTWVzc2FnZSgpKSB7CiAgICAgICAgIHdvcmtRdWV1 ZU1lc3NhZ2VSZWNlaXZlci0+ZGlkUmVjZWl2ZU1lc3NhZ2UodGhpcywgKmRlY29kZXIpOwogICAg ICAgICByZXR1cm47CkBAIC0zNDMsMTIgKzM0MCw5IEBAIHZvaWQgQ29ubmVjdGlvbjo6aW52YWxp ZGF0ZSgpCiAgICAgfQogICAgIAogICAgIC8vIFJlc2V0IHRoZSBjbGllbnQuCi0gICAgbV9jbGll bnQgPSBudWxscHRyOworICAgIG1fY2xpZW50ID0gMDsKIAotICAgIFJlZlB0cjxDb25uZWN0aW9u PiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIG1fY29ubmVjdGlvblF1ZXVlLT5kaXNwYXRjaChb cHJvdGVjdGVkVGhpc10gewotICAgICAgICBwcm90ZWN0ZWRUaGlzLT5wbGF0Zm9ybUludmFsaWRh dGUoKTsKLSAgICB9KTsKKyAgICBtX2Nvbm5lY3Rpb25RdWV1ZS0+ZGlzcGF0Y2goV1RGOjpiaW5k KCZDb25uZWN0aW9uOjpwbGF0Zm9ybUludmFsaWRhdGUsIHRoaXMpKTsKIH0KIAogdm9pZCBDb25u ZWN0aW9uOjptYXJrQ3VycmVudGx5RGlzcGF0Y2hlZE1lc3NhZ2VBc0ludmFsaWQoKQpAQCAtMzg3 LDEwICszODEsNyBAQCBib29sIENvbm5lY3Rpb246OnNlbmRNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0 cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciwgdW5zaWduZWQgbQogICAgIH0KICAgICAKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIGFkZCBhIGJvb2xlYW4gZmxhZyBzbyB3ZSBkb24ndCBjYWxsIHRo aXMgd2hlbiB3b3JrIGhhcyBhbHJlYWR5IGJlZW4gc2NoZWR1bGVkLgotICAgIFJlZlB0cjxDb25u ZWN0aW9uPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIG1fY29ubmVjdGlvblF1ZXVlLT5kaXNw YXRjaChbcHJvdGVjdGVkVGhpc10gewotICAgICAgICBwcm90ZWN0ZWRUaGlzLT5zZW5kT3V0Z29p bmdNZXNzYWdlcygpOwotICAgIH0pOworICAgIG1fY29ubmVjdGlvblF1ZXVlLT5kaXNwYXRjaChX VEY6OmJpbmQoJkNvbm5lY3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2VzLCB0aGlzKSk7CiAgICAg cmV0dXJuIHRydWU7CiB9CiAKQEAgLTYzOCwyNyArNjI5LDIzIEBAIHZvaWQgQ29ubmVjdGlvbjo6 cHJvY2Vzc0luY29taW5nTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8TWVzc2FnZURlY29kZXI+IG1l c3NhZ2UpCiAgICAgfQogCiAgICAgaWYgKCFtX3dvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcnMuaXNW YWxpZEtleShtZXNzYWdlLT5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkpKSB7Ci0gICAgICAgIC8vIFNv bWV0aGluZyBtaWdodCBoYXZlIGdvbmUgd3Jvbmcgd2hlbiBkZWNvZGluZyB0aGUgbWVzc2FnZS4g SW4gdGhhdCBjYXNlLCBlbmNvZGUgdGhlIG1lc3NhZ2UgbGVuZ3RoCi0gICAgICAgIC8vIHNvIHdl IGNhbiBmaWd1cmUgb3V0IGlmIHRoaXMgaGFwcGVucyBmb3IgY2VydGFpbiBtZXNzYWdlIGxlbmd0 aHMuCi0gICAgICAgIENTdHJpbmcgbWVzc2FnZVJlY2VpdmVyTmFtZSA9IG1lc3NhZ2UtPm1lc3Nh Z2VSZWNlaXZlck5hbWUoKS5pc0VtcHR5KCkgPyAiPHVua25vd24gbWVzc2FnZT4iIDogbWVzc2Fn ZS0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCk7Ci0gICAgICAgIENTdHJpbmcgbWVz c2FnZU5hbWUgPSBtZXNzYWdlLT5tZXNzYWdlTmFtZSgpLmlzRW1wdHkoKSA/IFN0cmluZzo6Zm9y bWF0KCI8bWVzc2FnZSBsZW5ndGg6ICV6dSBieXRlcz4iLCBtZXNzYWdlLT5sZW5ndGgoKSkudXRm OCgpIDogbWVzc2FnZS0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCk7Ci0KLSAgICAg ICAgUmVmUHRyPENvbm5lY3Rpb24+IHByb3RlY3RlZFRoaXModGhpcyk7Ci0gICAgICAgIG1fY2xp ZW50UnVuTG9vcC5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcywgbWVzc2FnZVJlY2VpdmVyTmFtZSwg bWVzc2FnZU5hbWVdIHsKLSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmRpc3BhdGNoRGlkUmVj ZWl2ZUludmFsaWRNZXNzYWdlKG1lc3NhZ2VSZWNlaXZlck5hbWUsIG1lc3NhZ2VOYW1lKTsKLSAg ICAgICAgfSk7CisgICAgICAgIGlmIChtZXNzYWdlLT5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkuaXNF bXB0eSgpICYmIG1lc3NhZ2UtPm1lc3NhZ2VOYW1lKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAg ICAvLyBTb21ldGhpbmcgd2VudCB3cm9uZyB3aGVuIGRlY29kaW5nIHRoZSBtZXNzYWdlLiBFbmNv ZGUgdGhlIG1lc3NhZ2UgbGVuZ3RoIHNvIHdlIGNhbiBmaWd1cmUgb3V0IGlmIHRoaXMKKyAgICAg ICAgICAgIC8vIGhhcHBlbnMgZm9yIGNlcnRhaW4gbWVzc2FnZSBsZW5ndGhzLgorICAgICAgICAg ICAgQ1N0cmluZyBtZXNzYWdlUmVjZWl2ZXJOYW1lID0gIjx1bmtub3duIG1lc3NhZ2U+IjsKKyAg ICAgICAgICAgIENTdHJpbmcgbWVzc2FnZU5hbWUgPSBTdHJpbmc6OmZvcm1hdCgiPG1lc3NhZ2Ug bGVuZ3RoOiAlenUgYnl0ZXM+IiwgbWVzc2FnZS0+bGVuZ3RoKCkpLnV0ZjgoKTsKKworICAgICAg ICAgICAgbV9jbGllbnRSdW5Mb29wLmRpc3BhdGNoKGJpbmQoJkNvbm5lY3Rpb246OmRpc3BhdGNo RGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlLCB0aGlzLCBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBtZXNz YWdlTmFtZSkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbV9j bGllbnRSdW5Mb29wLmRpc3BhdGNoKGJpbmQoJkNvbm5lY3Rpb246OmRpc3BhdGNoRGlkUmVjZWl2 ZUludmFsaWRNZXNzYWdlLCB0aGlzLCBtZXNzYWdlLT5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9T dHJpbmcoKSwgbWVzc2FnZS0+bWVzc2FnZU5hbWUoKS50b1N0cmluZygpKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKICAgICBhdXRvIGl0ID0gbV93b3JrUXVldWVNZXNzYWdlUmVjZWl2ZXJz LmZpbmQobWVzc2FnZS0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKICAgICBpZiAoaXQgIT0gbV93 b3JrUXVldWVNZXNzYWdlUmVjZWl2ZXJzLmVuZCgpKSB7Ci0gICAgICAgIFJlZlB0cjxDb25uZWN0 aW9uPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgICAgICBSZWZQdHI8V29ya1F1ZXVlTWVzc2Fn ZVJlY2VpdmVyPiYgd29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyID0gaXQtPnZhbHVlLnNlY29uZDsK LSAgICAgICAgTWVzc2FnZURlY29kZXIqIGRlY29kZXJQdHIgPSBtZXNzYWdlLnJlbGVhc2UoKTsK LSAgICAgICAgaXQtPnZhbHVlLmZpcnN0LT5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcywgd29ya1F1 ZXVlTWVzc2FnZVJlY2VpdmVyLCBkZWNvZGVyUHRyXSB7Ci0gICAgICAgICAgICBzdGQ6OnVuaXF1 ZV9wdHI8TWVzc2FnZURlY29kZXI+IGRlY29kZXIoZGVjb2RlclB0cik7Ci0gICAgICAgICAgICBw cm90ZWN0ZWRUaGlzLT5kaXNwYXRjaFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlck1lc3NhZ2Uod29y a1F1ZXVlTWVzc2FnZVJlY2VpdmVyLmdldCgpLCBkZWNvZGVyLmdldCgpKTsKLSAgICAgICAgfSk7 CisgICAgICAgIGl0LT52YWx1ZS5maXJzdC0+ZGlzcGF0Y2goYmluZCgmQ29ubmVjdGlvbjo6ZGlz cGF0Y2hXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXJNZXNzYWdlLCB0aGlzLCBpdC0+dmFsdWUuc2Vj b25kLCBtZXNzYWdlLnJlbGVhc2UoKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC04 MTQsMTAgKzgwMSw3IEBAIHZvaWQgQ29ubmVjdGlvbjo6ZW5xdWV1ZUluY29taW5nTWVzc2FnZShz dGQ6OnVuaXF1ZV9wdHI8TWVzc2FnZURlY29kZXI+IGluY29taW5nCiAgICAgICAgIG1faW5jb21p bmdNZXNzYWdlcy5hcHBlbmQoV1RGOjptb3ZlKGluY29taW5nTWVzc2FnZSkpOwogICAgIH0KIAot ICAgIFJlZlB0cjxDb25uZWN0aW9uPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIG1fY2xpZW50 UnVuTG9vcC5kaXNwYXRjaChbcHJvdGVjdGVkVGhpc10gewotICAgICAgICBwcm90ZWN0ZWRUaGlz LT5kaXNwYXRjaE9uZU1lc3NhZ2UoKTsKLSAgICB9KTsKKyAgICBtX2NsaWVudFJ1bkxvb3AuZGlz cGF0Y2goV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpkaXNwYXRjaE9uZU1lc3NhZ2UsIHRoaXMpKTsK IH0KIAogdm9pZCBDb25uZWN0aW9uOjpkaXNwYXRjaE1lc3NhZ2UoTWVzc2FnZURlY29kZXImIGRl Y29kZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nvbm5l Y3Rpb25NYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nvbm5lY3Rpb25N YWMubW0KaW5kZXggM2I3NWU4ZWY0MjBhZjc5NzE0ODk5Y2NlZTg5M2JjNzJhZjk0MTg2YS4uYzA4 NDVlY2VhOTcyZjkwOTM3MDA2M2I5YjJlY2YxNDVmYzNlNjk0OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vSVBDL21hYy9Db25uZWN0aW9uTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0lQQy9tYWMvQ29ubmVjdGlvbk1hYy5tbQpAQCAtMzYxLDExICszNjEs NyBAQCBib29sIENvbm5lY3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRy PE1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyKQogdm9pZCBDb25uZWN0aW9uOjppbml0aWFsaXplRGVh ZE5hbWVTb3VyY2UoKQogewogICAgIG1fZGVhZE5hbWVTb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2Vf Y3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX01BQ0hfU0VORCwgbV9zZW5kUG9ydCwgMCwgbV9j b25uZWN0aW9uUXVldWUtPmRpc3BhdGNoUXVldWUoKSk7Ci0KLSAgICBSZWZQdHI8Q29ubmVjdGlv bj4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKLSAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hh bmRsZXIobV9kZWFkTmFtZVNvdXJjZSwgXnsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+Y29ubmVj dGlvbkRpZENsb3NlKCk7Ci0gICAgfSk7CisgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9o YW5kbGVyKG1fZGVhZE5hbWVTb3VyY2UsIGJpbmQoJkNvbm5lY3Rpb246OmNvbm5lY3Rpb25EaWRD bG9zZSwgdGhpcykpOwogCiAgICAgbWFjaF9wb3J0X3Qgc2VuZFBvcnQgPSBtX3NlbmRQb3J0Owog ICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfY2FuY2VsX2hhbmRsZXIobV9kZWFkTmFtZVNvdXJjZSwg XnsKQEAgLTUwOCwxMiArNTA0LDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWNlaXZlU291cmNlRXZl bnRIYW5kbGVyKCkKICAgICBpZiAoZGVjb2Rlci0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpID09ICJJ UEMiICYmIGRlY29kZXItPm1lc3NhZ2VOYW1lKCkgPT0gIlNldEV4Y2VwdGlvblBvcnQiKSB7CiAg ICAgICAgIGlmIChtX2lzU2VydmVyKSB7CiAgICAgICAgICAgICAvLyBTZXJ2ZXIgY29ubmVjdGlv bnMgYXJlbid0IHN1cHBvc2VkIHRvIGhhdmUgdGhlaXIgZXhjZXB0aW9uIHBvcnRzIG92ZXJyaWRl bi4gVHJlYXQgdGhpcyBhcyBhbiBpbnZhbGlkIG1lc3NhZ2UuCi0gICAgICAgICAgICBSZWZQdHI8 Q29ubmVjdGlvbj4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKLSAgICAgICAgICAgIENTdHJpbmcgbWVz c2FnZVJlY2VpdmVyTmFtZVN0cmluZyA9IGRlY29kZXItPm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50 b1N0cmluZygpOwotICAgICAgICAgICAgQ1N0cmluZyBtZXNzYWdlTmFtZVN0cmluZyA9IGRlY29k ZXItPm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKTsKLSAgICAgICAgICAgIG1fY2xpZW50UnVuTG9v cC5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcywgbWVzc2FnZVJlY2VpdmVyTmFtZVN0cmluZywgbWVz c2FnZU5hbWVTdHJpbmddIHsKLSAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5kaXNwYXRj aERpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZShtZXNzYWdlUmVjZWl2ZXJOYW1lU3RyaW5nLCBtZXNz YWdlTmFtZVN0cmluZyk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIG1fY2xpZW50UnVu TG9vcC5kaXNwYXRjaChiaW5kKCZDb25uZWN0aW9uOjpkaXNwYXRjaERpZFJlY2VpdmVJbnZhbGlk TWVzc2FnZSwgdGhpcywgZGVjb2Rlci0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCks IGRlY29kZXItPm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKSkpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgICAgIE1hY2hQb3J0IGV4Y2VwdGlvblBvcnQ7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKaW5kZXgg NGRkOTVmZDBkOTIzYTYyMzg3YjBjZTM5ZTQ2MGFlZmRjMzUxNTdmOS4uMTZiZTAxNGU4NzM5ZmFj NGQ5NzA0NDliZmExNGQwNjE5NDk4ZGI4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcApAQCAtMzg4LDI3ICszODgsMjcgQEAg Ym9vbCBDb25uZWN0aW9uOjpvcGVuKCkKICAgICAgICAgfQogICAgIH0KIAotICAgIFJlZlB0cjxD b25uZWN0aW9uPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwogICAgIG1faXNDb25uZWN0ZWQgPSB0cnVl OwogI2lmIFBMQVRGT1JNKEdUSykKKyAgICBSZWZQdHI8Q29ubmVjdGlvbj4gcHJvdGVjdG9yKHRo aXMpOwogICAgIG1fY29ubmVjdGlvblF1ZXVlLT5yZWdpc3RlclNvY2tldEV2ZW50SGFuZGxlciht X3NvY2tldERlc2NyaXB0b3IsCi0gICAgICAgIFtwcm90ZWN0ZWRUaGlzXSB7Ci0gICAgICAgICAg ICBwcm90ZWN0ZWRUaGlzLT5yZWFkeVJlYWRIYW5kbGVyKCk7CisgICAgICAgIFs9XSB7CisgICAg ICAgICAgICBwcm90ZWN0b3ItPnJlYWR5UmVhZEhhbmRsZXIoKTsKICAgICAgICAgfSwKLSAgICAg ICAgW3Byb3RlY3RlZFRoaXNdIHsKLSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmNvbm5lY3Rp b25EaWRDbG9zZSgpOworICAgICAgICBbPV0geworICAgICAgICAgICAgcHJvdGVjdG9yLT5jb25u ZWN0aW9uRGlkQ2xvc2UoKTsKICAgICAgICAgfSk7CiAjZWxpZiBQTEFURk9STShFRkwpCisgICAg UmVmUHRyPENvbm5lY3Rpb24+IHByb3RlY3Rvcih0aGlzKTsKICAgICBtX2Nvbm5lY3Rpb25RdWV1 ZS0+cmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIobV9zb2NrZXREZXNjcmlwdG9yLAotICAgICAg ICBbcHJvdGVjdGVkVGhpc10gewotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+cmVhZHlSZWFk SGFuZGxlcigpOworICAgICAgICBbcHJvdGVjdG9yXSB7CisgICAgICAgICAgICBwcm90ZWN0b3It PnJlYWR5UmVhZEhhbmRsZXIoKTsKICAgICAgICAgfSk7CiAjZW5kaWYKIAotICAgIC8vIFNjaGVk dWxlIGEgY2FsbCB0byByZWFkeVJlYWRIYW5kbGVyLiBEYXRhIG1heSBoYXZlIGFycml2ZWQgYmVm b3JlIGluc3RhbGxhdGlvbiBvZiB0aGUgc2lnbmFsIGhhbmRsZXIuCi0gICAgbV9jb25uZWN0aW9u UXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzXSB7Ci0gICAgICAgIHByb3RlY3RlZFRoaXMt PnJlYWR5UmVhZEhhbmRsZXIoKTsKLSAgICB9KTsKKyAgICAvLyBTY2hlZHVsZSBhIGNhbGwgdG8g cmVhZHlSZWFkSGFuZGxlci4gRGF0YSBtYXkgaGF2ZSBhcnJpdmVkIGJlZm9yZSBpbnN0YWxsYXRp b24gb2YgdGhlIHNpZ25hbAorICAgIC8vIGhhbmRsZXIuCisgICAgbV9jb25uZWN0aW9uUXVldWUt PmRpc3BhdGNoKFdURjo6YmluZCgmQ29ubmVjdGlvbjo6cmVhZHlSZWFkSGFuZGxlciwgdGhpcykp OwogCiAgICAgcmV0dXJuIHRydWU7CiB9Cg==