136541 2014-09-04 12:42:22 -0700 Use WTFString::find(char) in more places 2014-09-04 14:07:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned commit-queue dbates esprehn+autocc gyuyoung.kim oldest_to_newest 1033273 0 joepeck 2014-09-04 12:42:22 -0700 Instead of WTFString::find(const char *) or variants which do extra work. 1033274 1 237639 joepeck 2014-09-04 12:43:27 -0700 Created attachment 237639 [PATCH] Proposed Fix 1033275 2 commit-queue 2014-09-04 12:45:27 -0700 Attachment 237639 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1033280 3 237641 joepeck 2014-09-04 12:55:32 -0700 Created attachment 237641 [PATCH] Proposed Fix 1033300 4 237641 commit-queue 2014-09-04 14:07:15 -0700 Comment on attachment 237641 [PATCH] Proposed Fix Clearing flags on attachment: 237641 Committed r173278: <http://trac.webkit.org/changeset/173278> 1033301 5 commit-queue 2014-09-04 14:07:19 -0700 All reviewed patches have been landed. Closing bug. 237639 2014-09-04 12:43:27 -0700 2014-09-04 12:55:32 -0700 [PATCH] Proposed Fix find.patch text/plain 5537 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYWYxYmRkLi44Y2FkM2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTQtMDktMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBVc2UgV1RGU3RyaW5nOjpmaW5kKGNoYXIpIGluIG1vcmUgcGxhY2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY1NDEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9P UFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvcGx1Z2lucy9Zb3VUdWJlUGx1Z2luUmVwbGFjZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cXVlcnlLZXlzQW5kVmFsdWVzKToKKyAgICAgICAg KiBodG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVtYmVk RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAqIGh0bWwvSFRNTE9iamVjdEVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9iamVjdEVsZW1lbnQ6OnBhcmFtZXRlcnNG b3JQbHVnaW4pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6WFNTQXVkaXRvcjo6ZGVjb2RlZFNuaXBwZXRGb3JBdHRyaWJ1dGUpOgorICAg ICAgICAqIHBhZ2UvVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlVzZXJDb250ZW50VVJMUGF0dGVybjo6cGFyc2UpOgorCiAyMDE0LTA5LTA0ICBFdmEgQmFsYXpz ZmFsdmkgIDxldmFiLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUmVt b3ZlIENTU19GSUxURVJTIGZsYWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv cGx1Z2lucy9Zb3VUdWJlUGx1Z2luUmVwbGFjZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9wbHVnaW5zL1lvdVR1YmVQbHVnaW5SZXBsYWNlbWVudC5jcHAKaW5kZXggOGEwZTIwOS4u NWRmNTM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVnaW5zL1lvdVR1 YmVQbHVnaW5SZXBsYWNlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVn aW5zL1lvdVR1YmVQbHVnaW5SZXBsYWNlbWVudC5jcHAKQEAgLTEyOCw3ICsxMjgsNyBAQCBzdGF0 aWMgWW91VHViZVBsdWdpblJlcGxhY2VtZW50OjpLZXlWYWx1ZU1hcCBxdWVyeUtleXNBbmRWYWx1 ZXMoY29uc3QgU3RyaW5nJiBxdQogICAgIHdoaWxlIChlcXVhbFNlYXJjaExvY2F0aW9uIDwgcXVl cnlMZW5ndGggLSAxICYmIGVxdWFsU2VhcmNoTGVuZ3RoKSB7CiAgICAgICAgIAogICAgICAgICAv LyBTZWFyY2ggZm9yICI9Ii4KLSAgICAgICAgc2l6ZV90IGVxdWFsTG9jYXRpb24gPSBxdWVyeVN0 cmluZy5maW5kKCI9IiwgZXF1YWxTZWFyY2hMb2NhdGlvbik7CisgICAgICAgIHNpemVfdCBlcXVh bExvY2F0aW9uID0gcXVlcnlTdHJpbmcuZmluZCgnPScsIGVxdWFsU2VhcmNoTG9jYXRpb24pOwog ICAgICAgICBpZiAoZXF1YWxMb2NhdGlvbiA9PSBub3RGb3VuZCkKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAKQEAgLTE0MSw3ICsxNDEsNyBAQCBzdGF0aWMgWW91VHViZVBsdWdpblJlcGxh Y2VtZW50OjpLZXlWYWx1ZU1hcCBxdWVyeUtleXNBbmRWYWx1ZXMoY29uc3QgU3RyaW5nJiBxdQog ICAgICAgICBzaXplX3Qga2V5TGVuZ3RoID0gZXF1YWxMb2NhdGlvbiAtIGVxdWFsU2VhcmNoTG9j YXRpb247CiAgICAgICAgIAogICAgICAgICAvLyBTZWFjaCBmb3IgdGhlIGFtcGVyc2FuZC4KLSAg ICAgICAgc2l6ZV90IGFtcGVyc2FuZExvY2F0aW9uID0gcXVlcnlTdHJpbmcuZmluZCgiJiIsIGlu ZGV4QWZ0ZXJFcXVhbCk7CisgICAgICAgIHNpemVfdCBhbXBlcnNhbmRMb2NhdGlvbiA9IHF1ZXJ5 U3RyaW5nLmZpbmQoJyYnLCBpbmRleEFmdGVyRXF1YWwpOwogICAgICAgICAKICAgICAgICAgLy8g R2V0IHRoZSB2YWx1ZSBhZnRlciB0aGUgIj0iLCBiZWZvcmUgdGhlIGFtcGVyc2FuZC4KICAgICAg ICAgc2l6ZV90IHZhbHVlTG9jYXRpb24gPSBpbmRleEFmdGVyRXF1YWw7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAppbmRleCAwNDUxNTVkLi42NDZmMTdlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKQEAgLTEwMSw3ICsxMDEsNyBAQCB2 b2lkIEhUTUxFbWJlZEVsZW1lbnQ6OmNvbGxlY3RTdHlsZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0 ZShjb25zdCBRdWFsaWZpZWROYW1lJgogdm9pZCBIVE1MRW1iZWRFbGVtZW50OjpwYXJzZUF0dHJp YnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVl KQogewogICAgIGlmIChuYW1lID09IHR5cGVBdHRyKSB7Ci0gICAgICAgIG1fc2VydmljZVR5cGUg PSB2YWx1ZS5zdHJpbmcoKS5sZWZ0KHZhbHVlLmZpbmQoIjsiKSkubG93ZXIoKTsKKyAgICAgICAg bV9zZXJ2aWNlVHlwZSA9IHZhbHVlLnN0cmluZygpLmxlZnQodmFsdWUuZmluZCgnOycpKS5sb3dl cigpOwogICAgICAgICAvLyBGSVhNRTogVGhlIG9ubHkgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoaXMg YW5kIEhUTUxPYmplY3RFbGVtZW50J3MgY29ycmVzcG9uZGluZwogICAgICAgICAvLyBjb2RlIGlz IHRoYXQgSFRNTE9iamVjdEVsZW1lbnQgZG9lcyBzZXROZWVkc1dpZGdldFVwZGF0ZSh0cnVlKS4g Q29uc2lkZXIgbW92aW5nCiAgICAgICAgIC8vIHRoaXMgdXAgdG8gdGhlIEhUTUxQbHVnSW5JbWFn ZUVsZW1lbnQgdG8gYmUgc2hhcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVt ZW50LmNwcAppbmRleCBhYjkxYmJjLi41MDJlZmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxPYmplY3RFbGVtZW50LmNwcApAQCAtMTgwLDcgKzE4MCw3IEBAIHZvaWQgSFRNTE9iamVjdEVs ZW1lbnQ6OnBhcmFtZXRlcnNGb3JQbHVnaW4oVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIFZl Y3RvcjxTCiAgICAgICAgIC8vIEZJWE1FOiBzZXJ2aWNlVHlwZSBjYWxjdWxhdGlvbiBkb2VzIG5v dCBiZWxvbmcgaW4gdGhpcyBmdW5jdGlvbi4KICAgICAgICAgaWYgKHNlcnZpY2VUeXBlLmlzRW1w dHkoKSAmJiBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAidHlwZSIpKSB7CiAgICAgICAgICAgICBz ZXJ2aWNlVHlwZSA9IHBhcmFtLnZhbHVlKCk7Ci0gICAgICAgICAgICBzaXplX3QgcG9zID0gc2Vy dmljZVR5cGUuZmluZCgiOyIpOworICAgICAgICAgICAgc2l6ZV90IHBvcyA9IHNlcnZpY2VUeXBl LmZpbmQoJzsnKTsKICAgICAgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCiAgICAgICAgICAg ICAgICAgc2VydmljZVR5cGUgPSBzZXJ2aWNlVHlwZS5sZWZ0KHBvcyk7CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAKaW5kZXggMjVkNGJmZi4uY2Q5 MDljMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAKQEAgLTYx OCw3ICs2MTgsNyBAQCBTdHJpbmcgWFNTQXVkaXRvcjo6ZGVjb2RlZFNuaXBwZXRGb3JBdHRyaWJ1 dGUoY29uc3QgRmlsdGVyVG9rZW5SZXF1ZXN0JiByZXF1ZXN0LAogICAgICAgICAvLyAhLS0gZm9s bG93aW5nIGEgbGVzcy10aGFuIHNpZ24uIFdlIHN0b3AgaW5zdGVhZCBvbiBhbnkgYW1wZXJzYW5k CiAgICAgICAgIC8vIHNsYXNoLCBvciBsZXNzLXRoYW4gc2lnbi4KICAgICAgICAgc2l6ZV90IHBv c2l0aW9uID0gMDsKLSAgICAgICAgaWYgKChwb3NpdGlvbiA9IGRlY29kZWRTbmlwcGV0LmZpbmQo Ij0iKSkgIT0gbm90Rm91bmQKKyAgICAgICAgaWYgKChwb3NpdGlvbiA9IGRlY29kZWRTbmlwcGV0 LmZpbmQoJz0nKSkgIT0gbm90Rm91bmQKICAgICAgICAgICAgICYmIChwb3NpdGlvbiA9IGRlY29k ZWRTbmlwcGV0LmZpbmQoaXNOb3RIVE1MU3BhY2UsIHBvc2l0aW9uICsgMSkpICE9IG5vdEZvdW5k CiAgICAgICAgICAgICAmJiAocG9zaXRpb24gPSBkZWNvZGVkU25pcHBldC5maW5kKGlzVGVybWlu YXRpbmdDaGFyYWN0ZXIsIGlzSFRNTFF1b3RlKGRlY29kZWRTbmlwcGV0W3Bvc2l0aW9uXSkgPyBw b3NpdGlvbiArIDEgOiBwb3NpdGlvbikpICE9IG5vdEZvdW5kKSB7CiAgICAgICAgICAgICBkZWNv ZGVkU25pcHBldC50cnVuY2F0ZShwb3NpdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1VzZXJDb250ZW50VVJMUGF0dGVybi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Vz ZXJDb250ZW50VVJMUGF0dGVybi5jcHAKaW5kZXggMWQ2NzRiOS4uZGY3NzA2ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudFVSTFBhdHRlcm4uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmNwcApAQCAtODEsNyArODEs NyBAQCBib29sIFVzZXJDb250ZW50VVJMUGF0dGVybjo6cGFyc2UoY29uc3QgU3RyaW5nJiBwYXR0 ZXJuKQogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShtX3NjaGVtZSwgImZpbGUiKSkKICAgICAg ICAgcGF0aFN0YXJ0UG9zID0gaG9zdFN0YXJ0UG9zOwogICAgIGVsc2UgewotICAgICAgICBzaXpl X3QgaG9zdEVuZFBvcyA9IHBhdHRlcm4uZmluZCgiLyIsIGhvc3RTdGFydFBvcyk7CisgICAgICAg IHNpemVfdCBob3N0RW5kUG9zID0gcGF0dGVybi5maW5kKCcvJywgaG9zdFN0YXJ0UG9zKTsKICAg ICAgICAgaWYgKGhvc3RFbmRQb3MgPT0gbm90Rm91bmQpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAKQEAgLTk5LDcgKzk5LDcgQEAgYm9vbCBVc2VyQ29udGVudFVSTFBhdHRlcm46OnBhcnNl KGNvbnN0IFN0cmluZyYgcGF0dGVybikKICAgICAgICAgfQogCiAgICAgICAgIC8vIE5vIG90aGVy ICcqJyBjYW4gb2NjdXIgaW4gdGhlIGhvc3QuCi0gICAgICAgIGlmIChtX2hvc3QuZmluZCgiKiIp ICE9IG5vdEZvdW5kKQorICAgICAgICBpZiAobV9ob3N0LmZpbmQoJyonKSAhPSBub3RGb3VuZCkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBwYXRoU3RhcnRQb3MgPSBob3N0 RW5kUG9zOwo= 237641 2014-09-04 12:55:32 -0700 2014-09-04 14:07:15 -0700 [PATCH] Proposed Fix improved.patch text/plain 5504 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYWYxYmRkLi5lYTc5MDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDktMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBVc2UgV1RGU3RyaW5nOjpmaW5kKGNoYXIpIGluIG1vcmUgcGxhY2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY1NDEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvcGx1Z2lu cy9Zb3VUdWJlUGx1Z2luUmVwbGFjZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cXVlcnlL ZXlzQW5kVmFsdWVzKToKKyAgICAgICAgKiBodG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEVtYmVkRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAg ICAqIGh0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9i amVjdEVsZW1lbnQ6OnBhcmFtZXRlcnNGb3JQbHVnaW4pOgorICAgICAgICAqIGh0bWwvcGFyc2Vy L1hTU0F1ZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WFNTQXVkaXRvcjo6ZGVjb2RlZFNu aXBwZXRGb3JBdHRyaWJ1dGUpOgorICAgICAgICAqIHBhZ2UvVXNlckNvbnRlbnRVUkxQYXR0ZXJu LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250ZW50VVJMUGF0dGVybjo6cGFyc2UpOgor CiAyMDE0LTA5LTA0ICBFdmEgQmFsYXpzZmFsdmkgIDxldmFiLnUtc3plZ2VkQHBhcnRuZXIuc2Ft c3VuZy5jb20+CiAKICAgICAgICAgUmVtb3ZlIENTU19GSUxURVJTIGZsYWcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGx1Z2lucy9Zb3VUdWJlUGx1Z2luUmVwbGFjZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVnaW5zL1lvdVR1YmVQbHVnaW5SZXBsYWNl bWVudC5jcHAKaW5kZXggOGEwZTIwOS4uNWRmNTM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9wbHVnaW5zL1lvdVR1YmVQbHVnaW5SZXBsYWNlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVnaW5zL1lvdVR1YmVQbHVnaW5SZXBsYWNlbWVudC5jcHAK QEAgLTEyOCw3ICsxMjgsNyBAQCBzdGF0aWMgWW91VHViZVBsdWdpblJlcGxhY2VtZW50OjpLZXlW YWx1ZU1hcCBxdWVyeUtleXNBbmRWYWx1ZXMoY29uc3QgU3RyaW5nJiBxdQogICAgIHdoaWxlIChl cXVhbFNlYXJjaExvY2F0aW9uIDwgcXVlcnlMZW5ndGggLSAxICYmIGVxdWFsU2VhcmNoTGVuZ3Ro KSB7CiAgICAgICAgIAogICAgICAgICAvLyBTZWFyY2ggZm9yICI9Ii4KLSAgICAgICAgc2l6ZV90 IGVxdWFsTG9jYXRpb24gPSBxdWVyeVN0cmluZy5maW5kKCI9IiwgZXF1YWxTZWFyY2hMb2NhdGlv bik7CisgICAgICAgIHNpemVfdCBlcXVhbExvY2F0aW9uID0gcXVlcnlTdHJpbmcuZmluZCgnPScs IGVxdWFsU2VhcmNoTG9jYXRpb24pOwogICAgICAgICBpZiAoZXF1YWxMb2NhdGlvbiA9PSBub3RG b3VuZCkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAKQEAgLTE0MSw3ICsxNDEsNyBAQCBz dGF0aWMgWW91VHViZVBsdWdpblJlcGxhY2VtZW50OjpLZXlWYWx1ZU1hcCBxdWVyeUtleXNBbmRW YWx1ZXMoY29uc3QgU3RyaW5nJiBxdQogICAgICAgICBzaXplX3Qga2V5TGVuZ3RoID0gZXF1YWxM b2NhdGlvbiAtIGVxdWFsU2VhcmNoTG9jYXRpb247CiAgICAgICAgIAogICAgICAgICAvLyBTZWFj aCBmb3IgdGhlIGFtcGVyc2FuZC4KLSAgICAgICAgc2l6ZV90IGFtcGVyc2FuZExvY2F0aW9uID0g cXVlcnlTdHJpbmcuZmluZCgiJiIsIGluZGV4QWZ0ZXJFcXVhbCk7CisgICAgICAgIHNpemVfdCBh bXBlcnNhbmRMb2NhdGlvbiA9IHF1ZXJ5U3RyaW5nLmZpbmQoJyYnLCBpbmRleEFmdGVyRXF1YWwp OwogICAgICAgICAKICAgICAgICAgLy8gR2V0IHRoZSB2YWx1ZSBhZnRlciB0aGUgIj0iLCBiZWZv cmUgdGhlIGFtcGVyc2FuZC4KICAgICAgICAgc2l6ZV90IHZhbHVlTG9jYXRpb24gPSBpbmRleEFm dGVyRXF1YWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAppbmRleCAw NDUxNTVkLi42NDZmMTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJl ZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5j cHAKQEAgLTEwMSw3ICsxMDEsNyBAQCB2b2lkIEhUTUxFbWJlZEVsZW1lbnQ6OmNvbGxlY3RTdHls ZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJgogdm9pZCBIVE1M RW1iZWRFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBj b25zdCBBdG9taWNTdHJpbmcmIHZhbHVlKQogewogICAgIGlmIChuYW1lID09IHR5cGVBdHRyKSB7 Ci0gICAgICAgIG1fc2VydmljZVR5cGUgPSB2YWx1ZS5zdHJpbmcoKS5sZWZ0KHZhbHVlLmZpbmQo IjsiKSkubG93ZXIoKTsKKyAgICAgICAgbV9zZXJ2aWNlVHlwZSA9IHZhbHVlLnN0cmluZygpLmxl ZnQodmFsdWUuZmluZCgnOycpKS5sb3dlcigpOwogICAgICAgICAvLyBGSVhNRTogVGhlIG9ubHkg ZGlmZmVyZW5jZSBiZXR3ZWVuIHRoaXMgYW5kIEhUTUxPYmplY3RFbGVtZW50J3MgY29ycmVzcG9u ZGluZwogICAgICAgICAvLyBjb2RlIGlzIHRoYXQgSFRNTE9iamVjdEVsZW1lbnQgZG9lcyBzZXRO ZWVkc1dpZGdldFVwZGF0ZSh0cnVlKS4gQ29uc2lkZXIgbW92aW5nCiAgICAgICAgIC8vIHRoaXMg dXAgdG8gdGhlIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQgdG8gYmUgc2hhcmVkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCBhYjkxYmJjLi41MDJlZmZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMTgwLDcgKzE4 MCw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnBhcmFtZXRlcnNGb3JQbHVnaW4oVmVjdG9y PFN0cmluZz4mIHBhcmFtTmFtZXMsIFZlY3RvcjxTCiAgICAgICAgIC8vIEZJWE1FOiBzZXJ2aWNl VHlwZSBjYWxjdWxhdGlvbiBkb2VzIG5vdCBiZWxvbmcgaW4gdGhpcyBmdW5jdGlvbi4KICAgICAg ICAgaWYgKHNlcnZpY2VUeXBlLmlzRW1wdHkoKSAmJiBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAi dHlwZSIpKSB7CiAgICAgICAgICAgICBzZXJ2aWNlVHlwZSA9IHBhcmFtLnZhbHVlKCk7Ci0gICAg ICAgICAgICBzaXplX3QgcG9zID0gc2VydmljZVR5cGUuZmluZCgiOyIpOworICAgICAgICAgICAg c2l6ZV90IHBvcyA9IHNlcnZpY2VUeXBlLmZpbmQoJzsnKTsKICAgICAgICAgICAgIGlmIChwb3Mg IT0gbm90Rm91bmQpCiAgICAgICAgICAgICAgICAgc2VydmljZVR5cGUgPSBzZXJ2aWNlVHlwZS5s ZWZ0KHBvcyk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL1hTU0F1ZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRv ci5jcHAKaW5kZXggMjVkNGJmZi4uY2Q5MDljMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvWFNTQXVkaXRvci5jcHAKQEAgLTYxOCw3ICs2MTgsNyBAQCBTdHJpbmcgWFNTQXVkaXRvcjo6 ZGVjb2RlZFNuaXBwZXRGb3JBdHRyaWJ1dGUoY29uc3QgRmlsdGVyVG9rZW5SZXF1ZXN0JiByZXF1 ZXN0LAogICAgICAgICAvLyAhLS0gZm9sbG93aW5nIGEgbGVzcy10aGFuIHNpZ24uIFdlIHN0b3Ag aW5zdGVhZCBvbiBhbnkgYW1wZXJzYW5kCiAgICAgICAgIC8vIHNsYXNoLCBvciBsZXNzLXRoYW4g c2lnbi4KICAgICAgICAgc2l6ZV90IHBvc2l0aW9uID0gMDsKLSAgICAgICAgaWYgKChwb3NpdGlv biA9IGRlY29kZWRTbmlwcGV0LmZpbmQoIj0iKSkgIT0gbm90Rm91bmQKKyAgICAgICAgaWYgKChw b3NpdGlvbiA9IGRlY29kZWRTbmlwcGV0LmZpbmQoJz0nKSkgIT0gbm90Rm91bmQKICAgICAgICAg ICAgICYmIChwb3NpdGlvbiA9IGRlY29kZWRTbmlwcGV0LmZpbmQoaXNOb3RIVE1MU3BhY2UsIHBv c2l0aW9uICsgMSkpICE9IG5vdEZvdW5kCiAgICAgICAgICAgICAmJiAocG9zaXRpb24gPSBkZWNv ZGVkU25pcHBldC5maW5kKGlzVGVybWluYXRpbmdDaGFyYWN0ZXIsIGlzSFRNTFF1b3RlKGRlY29k ZWRTbmlwcGV0W3Bvc2l0aW9uXSkgPyBwb3NpdGlvbiArIDEgOiBwb3NpdGlvbikpICE9IG5vdEZv dW5kKSB7CiAgICAgICAgICAgICBkZWNvZGVkU25pcHBldC50cnVuY2F0ZShwb3NpdGlvbik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50VVJMUGF0dGVybi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50VVJMUGF0dGVybi5jcHAKaW5kZXggMWQ2 NzRiOS4uZGY3NzA2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVu dFVSTFBhdHRlcm4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmNwcApAQCAtODEsNyArODEsNyBAQCBib29sIFVzZXJDb250ZW50VVJMUGF0dGVybjo6 cGFyc2UoY29uc3QgU3RyaW5nJiBwYXR0ZXJuKQogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSht X3NjaGVtZSwgImZpbGUiKSkKICAgICAgICAgcGF0aFN0YXJ0UG9zID0gaG9zdFN0YXJ0UG9zOwog ICAgIGVsc2UgewotICAgICAgICBzaXplX3QgaG9zdEVuZFBvcyA9IHBhdHRlcm4uZmluZCgiLyIs IGhvc3RTdGFydFBvcyk7CisgICAgICAgIHNpemVfdCBob3N0RW5kUG9zID0gcGF0dGVybi5maW5k KCcvJywgaG9zdFN0YXJ0UG9zKTsKICAgICAgICAgaWYgKGhvc3RFbmRQb3MgPT0gbm90Rm91bmQp CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTk5LDcgKzk5LDcgQEAgYm9vbCBVc2Vy Q29udGVudFVSTFBhdHRlcm46OnBhcnNlKGNvbnN0IFN0cmluZyYgcGF0dGVybikKICAgICAgICAg fQogCiAgICAgICAgIC8vIE5vIG90aGVyICcqJyBjYW4gb2NjdXIgaW4gdGhlIGhvc3QuCi0gICAg ICAgIGlmIChtX2hvc3QuZmluZCgiKiIpICE9IG5vdEZvdW5kKQorICAgICAgICBpZiAobV9ob3N0 LmZpbmQoJyonKSAhPSBub3RGb3VuZCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg ICAgICBwYXRoU3RhcnRQb3MgPSBob3N0RW5kUG9zOwo=