112965 2013-03-21 14:33:47 -0700 Prefer 'KURL(ParsedURLString, String)' when dealing with known-good data. 2013-04-05 03:04:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mkwst mkwst ap esprehn+autocc mkwst+watchlist ojan.autocc webkit.review.bot oldest_to_newest 860706 0 mkwst 2013-03-21 14:33:47 -0700 Prefer 'KURL(ParsedURLString, String)' when dealing with known-good data. 860708 1 194340 mkwst 2013-03-21 14:39:30 -0700 Created attachment 194340 Patch 861018 2 194340 ap 2013-03-21 20:00:11 -0700 Comment on attachment 194340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194340&action=review We still don't have a class that wraps a known good string without KURL size overhead? > Source/WebCore/page/SecurityOrigin.cpp:532 > + return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port))); This isn't normalized to append a slash? Please watch KURL based debug testers. > Source/WebCore/page/SecurityOrigin.cpp:540 > + return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port))); Ditto. 861229 3 mkwst 2013-03-22 01:46:10 -0700 (In reply to comment #2) > (From update of attachment 194340 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=194340&action=review > > We still don't have a class that wraps a known good string without KURL size overhead? > > > Source/WebCore/page/SecurityOrigin.cpp:532 > > + return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port))); > > This isn't normalized to append a slash? Please watch KURL based debug testers. > > > Source/WebCore/page/SecurityOrigin.cpp:540 > > + return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port))); > > Ditto. Good eye, thank you. I've added a trailing slash to both, which I think is indeed necessary. I'll CQ the patch, but keep my finger on the revert button if it chokes a bot. 861231 4 194471 mkwst 2013-03-22 01:46:59 -0700 Created attachment 194471 Patch for landing 861257 5 194471 webkit.review.bot 2013-03-22 02:23:13 -0700 Comment on attachment 194471 Patch for landing Clearing flags on attachment: 194471 Committed r146580: <http://trac.webkit.org/changeset/146580> 861258 6 webkit.review.bot 2013-03-22 02:23:16 -0700 All reviewed patches have been landed. Closing bug. 869369 7 ap 2013-04-04 14:33:52 -0700 This has caused bug 113961. 869671 8 mkwst 2013-04-05 03:04:58 -0700 (In reply to comment #7) > This has caused bug 113961. Thank you for fixing the crash, and apologies that I missed that case. :/ 194340 2013-03-21 14:39:30 -0700 2013-03-22 01:46:54 -0700 Patch bug-112965-20130321223516.patch text/plain 5193 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRmODllNzRjMGQxMTE4 NThjOWRlYjZiZTkzMTE2YzAxNGNmODhiOS4uNTI2OTI4MTBjMGZjYTMyN2ZjYzQ4OTU5ZmFhOTMw YzhkNmM3N2QzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEzLTAzLTIxICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUHJlZmVyICdLVVJMKFBhcnNl ZFVSTFN0cmluZywgU3RyaW5nKScgd2hlbiBkZWFsaW5nIHdpdGgga25vd24tZ29vZCBkYXRhLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyOTY1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjc4MyNjNiwgQWRhbSBub3RlZCB0 aGF0CisgICAgICAgIGl0IHdvdWxkIGJlIHBvc3NpYmxlIHRvIHVzZSAnS1VSTChQYXJzZWRVUkxT dHJpbmcsIFt1cmxdKScgcmF0aGVyIHRoYW4KKyAgICAgICAgJ0tVUkwoS1VSTCgpLCBbdXJsXSkn LCBzaW5jZSB3ZSBrbmV3IHRoYXQgdGhlIFVSTCBpbiBxdWVzdGlvbiBpcyBhCisgICAgICAgIHZh bHVlIGFuZCBhYnNvbHV0ZSBVUkwuIFRoaXMgcGF0Y2ggZml4ZXMgdGhlIG9idmlvdXMgaW5zdGFu Y2VzIG9mIHRoaXMKKyAgICAgICAgcGF0dGVybjsgdGhlcmUgYXJlIHNldmVyYWwgbW9yZSAnS1VS TChLVVJMKCksIFN0cmluZyknIGNhbGxzIGluCisgICAgICAgIFdlYkNvcmUgYnV0IHRoZXNlIHdl cmUgdGhlIG9ubHkgcGxhY2VzIEkgd2FzIHJlYXNvbmFibHkgc3VyZSB0aGF0IGJhZAorICAgICAg ICBkYXRhIGNvdWxkbid0IGNyZWVwIGluLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVCYXNlVVJMKToKKyAgICAgICAgICAg ICdkb2N1bWVudFVSSScgaXMgcHVsbGVkIGZyb20gJ3VybCgpLT5zdHJpbmcoKScuIEl0J3Mgc2Fm ZS4KKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpnYXRoZXJTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50RGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydFZpb2xhdGlvbik6CisgICAg ICAgICAgICAnQ2FsbEZyYW1lOjpzb3VyY2VVUkwoKScgaXMgYSBrbm93biB2YWxpZC9hYnNvbHV0 ZSBVUkwuCisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcik6CisgICAg ICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKToKKyAgICAgICAgICAgIFRoZSBz dHJpbmdzIGNvbnN0cnVjdGVkIGhlcmUgYXJlIGNlcnRhaW5seSB2YWxpZC4KKworMjAxMy0wMy0y MSAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIENTUCAxLjE6IEZp cmUgYSBTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50IHdoZW4gdmlvbGF0aW9ucyBvY2N1ci4K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjc4Mwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBkNDhjOTE3MDMwNjIwZDE4ZjcwNjdmMDJmMWU1 NGIwN2FhOGNkZGRkLi5hNjZmZjUyMmI5OTZlZGY1MDU2Mjc5ODRiNTlhNGUzMzY5NmFmMjMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTI2NzksNyArMjY3OSw3IEBAIHZvaWQgRG9jdW1l bnQ6OnVwZGF0ZUJhc2VVUkwoKQogICAgICAgICAvLyBUaGUgZG9jdW1lbnRVUkkgYXR0cmlidXRl IGlzIHJlYWQtb25seSBmcm9tIEphdmFTY3JpcHQsIGJ1dCB3cml0YWJsZSBmcm9tIE9iamVjdGl2 ZSBDLCBzbyB3ZSBuZWVkIHRvIHJldGFpbgogICAgICAgICAvLyB0aGlzIGZhbGxiYWNrIGJlaGF2 aW9yLiBXZSB1c2UgYSBudWxsIGJhc2UgVVJMLCBzaW5jZSB0aGUgZG9jdW1lbnRVUkkgYXR0cmli dXRlIGlzIGFuIGFyYml0cmFyeSBzdHJpbmcKICAgICAgICAgLy8gYW5kIERPTSAzIENvcmUgZG9l cyBub3Qgc3BlY2lmeSBob3cgaXQgc2hvdWxkIGJlIHJlc29sdmVkLgotICAgICAgICBtX2Jhc2VV UkwgPSBLVVJMKEtVUkwoKSwgZG9jdW1lbnRVUkkoKSk7CisgICAgICAgIG1fYmFzZVVSTCA9IEtV UkwoUGFyc2VkVVJMU3RyaW5nLCBkb2N1bWVudFVSSSgpKTsKICAgICB9CiAgICAgc2VsZWN0b3JR dWVyeUNhY2hlKCktPmludmFsaWRhdGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IGM5Y2Q0MDZjODgwNDA3ZjM3Y2RhYWIzNDk3MmE2 NTRjYjQxYmZjZDQuLmM0MTY2NTJmNzFiN2VhMjY1YWQyYWRjY2ZjMzZhYzZmMWFlNWNjMjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTE2 OTEsNyArMTY5MSw3IEBAIHN0YXRpYyB2b2lkIGdhdGhlclNlY3VyaXR5UG9saWN5VmlvbGF0aW9u RXZlbnREYXRhKFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnRJCiAgICAgY29uc3QgU2NyaXB0 Q2FsbEZyYW1lJiBjYWxsRnJhbWUgPSBnZXRGaXJzdE5vbk5hdGl2ZUZyYW1lKHN0YWNrKTsKIAog ICAgIGlmIChjYWxsRnJhbWUubGluZU51bWJlcigpKSB7Ci0gICAgICAgIEtVUkwgc291cmNlID0g S1VSTChLVVJMKCksIGNhbGxGcmFtZS5zb3VyY2VVUkwoKSk7CisgICAgICAgIEtVUkwgc291cmNl ID0gS1VSTChQYXJzZWRVUkxTdHJpbmcsIGNhbGxGcmFtZS5zb3VyY2VVUkwoKSk7CiAgICAgICAg IGluaXQuc291cmNlVVJMID0gc291cmNlLnN0cmluZygpOwogICAgICAgICBpbml0LmxpbmVOdW1i ZXIgPSBjYWxsRnJhbWUubGluZU51bWJlcigpOwogICAgIH0KQEAgLTE3NTksNyArMTc1OSw3IEBA IHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5n JiBkaXJlY3RpdmVUZXh0LCBjb25zdCBTCiAgICAgICAgIGNvbnN0IFNjcmlwdENhbGxGcmFtZSYg Y2FsbEZyYW1lID0gZ2V0Rmlyc3ROb25OYXRpdmVGcmFtZShzdGFjayk7CiAKICAgICAgICAgaWYg KGNhbGxGcmFtZS5saW5lTnVtYmVyKCkpIHsKLSAgICAgICAgICAgIEtVUkwgc291cmNlID0gS1VS TChLVVJMKCksIGNhbGxGcmFtZS5zb3VyY2VVUkwoKSk7CisgICAgICAgICAgICBLVVJMIHNvdXJj ZSA9IEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBjYWxsRnJhbWUuc291cmNlVVJMKCkpOwogICAgICAg ICAgICAgY3NwUmVwb3J0LT5zZXRTdHJpbmcoInNvdXJjZS1maWxlIiwgZG9jdW1lbnQtPnNlY3Vy aXR5T3JpZ2luKCktPmNhblJlcXVlc3Qoc291cmNlKSA/IHNvdXJjZS5zdHJpcHBlZEZvclVzZUFz UmVmZXJyZXIoKSA6IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoc291cmNlKS0+dG9TdHJpbmcoKSk7 CiAgICAgICAgICAgICBjc3BSZXBvcnQtPnNldE51bWJlcigibGluZS1udW1iZXIiLCBjYWxsRnJh bWUubGluZU51bWJlcigpKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3Jp Z2luLmNwcAppbmRleCBjMjA1N2RmOTViNzhmN2Q0ZGY2NDhkZDUzYmI3Mjk0MDk4M2Y2OGQyLi5h YjBlOWE5ZDg0OTQxYjY1MGU2M2NmYWE1NjAyMDBkNzg0NjNhNmM0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtNTI5LDcgKzUyOSw3IEBAIFBhc3NSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVy KGNvbnN0IFN0CiAgICAgU3RyaW5nIGhvc3QgPSBkYXRhYmFzZUlkZW50aWZpZXIuc3Vic3RyaW5n KHNlcGFyYXRvcjEgKyAxLCBzZXBhcmF0b3IyIC0gc2VwYXJhdG9yMSAtIDEpOwogICAgIAogICAg IGhvc3QgPSBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoaG9zdCk7Ci0gICAgcmV0dXJuIGNyZWF0 ZShLVVJMKEtVUkwoKSwgcHJvdG9jb2wgKyAiOi8vIiArIGhvc3QgKyAiOiIgKyBTdHJpbmc6Om51 bWJlcihwb3J0KSkpOworICAgIHJldHVybiBjcmVhdGUoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHBy b3RvY29sICsgIjovLyIgKyBob3N0ICsgIjoiICsgU3RyaW5nOjpudW1iZXIocG9ydCkpKTsKIH0K IAogUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShjb25z dCBTdHJpbmcmIHByb3RvY29sLCBjb25zdCBTdHJpbmcmIGhvc3QsIGludCBwb3J0KQpAQCAtNTM3 LDcgKzUzNyw3IEBAIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpj cmVhdGUoY29uc3QgU3RyaW5nJiBwcm90b2NvbCwgY29uc3QKICAgICBpZiAocG9ydCA8IDAgfHwg cG9ydCA+IE1heEFsbG93ZWRQb3J0KQogICAgICAgICBjcmVhdGVVbmlxdWUoKTsKICAgICBTdHJp bmcgZGVjb2RlZEhvc3QgPSBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoaG9zdCk7Ci0gICAgcmV0 dXJuIGNyZWF0ZShLVVJMKEtVUkwoKSwgcHJvdG9jb2wgKyAiOi8vIiArIGhvc3QgKyAiOiIgKyBT dHJpbmc6Om51bWJlcihwb3J0KSkpOworICAgIHJldHVybiBjcmVhdGUoS1VSTChQYXJzZWRVUkxT dHJpbmcsIHByb3RvY29sICsgIjovLyIgKyBob3N0ICsgIjoiICsgU3RyaW5nOjpudW1iZXIocG9y dCkpKTsKIH0KIAogU3RyaW5nIFNlY3VyaXR5T3JpZ2luOjpkYXRhYmFzZUlkZW50aWZpZXIoKSBj b25zdCAK 194471 2013-03-22 01:46:59 -0700 2013-03-22 02:23:13 -0700 Patch for landing bug-112965-20130322094246.patch text/plain 5140 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYxMzE5NTU0MDdkY2I2 NDZlNWQxOTZiZjM0NmVlMmJiZjMzN2MxMi4uODQ2YjlmZjg0NDkwOGFkNzdkNTdiYmJhMDUzMzMx MGIzYTZhNmQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAzLTIyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUHJlZmVyICdLVVJMKFBhcnNl ZFVSTFN0cmluZywgU3RyaW5nKScgd2hlbiBkZWFsaW5nIHdpdGgga25vd24tZ29vZCBkYXRhLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyOTY1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBJbiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNzgzI2M2LCBBZGFtIG5v dGVkIHRoYXQKKyAgICAgICAgaXQgd291bGQgYmUgcG9zc2libGUgdG8gdXNlICdLVVJMKFBhcnNl ZFVSTFN0cmluZywgW3VybF0pJyByYXRoZXIgdGhhbgorICAgICAgICAnS1VSTChLVVJMKCksIFt1 cmxdKScsIHNpbmNlIHdlIGtuZXcgdGhhdCB0aGUgVVJMIGluIHF1ZXN0aW9uIGlzIGEKKyAgICAg ICAgdmFsdWUgYW5kIGFic29sdXRlIFVSTC4gVGhpcyBwYXRjaCBmaXhlcyB0aGUgb2J2aW91cyBp bnN0YW5jZXMgb2YgdGhpcworICAgICAgICBwYXR0ZXJuOyB0aGVyZSBhcmUgc2V2ZXJhbCBtb3Jl ICdLVVJMKEtVUkwoKSwgU3RyaW5nKScgY2FsbHMgaW4KKyAgICAgICAgV2ViQ29yZSBidXQgdGhl c2Ugd2VyZSB0aGUgb25seSBwbGFjZXMgSSB3YXMgcmVhc29uYWJseSBzdXJlIHRoYXQgYmFkCisg ICAgICAgIGRhdGEgY291bGRuJ3QgY3JlZXAgaW4uCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVwZGF0ZUJhc2VVUkwpOgorICAgICAg ICAgICAgJ2RvY3VtZW50VVJJJyBpcyBwdWxsZWQgZnJvbSAndXJsKCktPnN0cmluZygpJy4gSXQn cyBzYWZlLgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmdhdGhlclNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnREYXRhKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKToK KyAgICAgICAgICAgICdDYWxsRnJhbWU6OnNvdXJjZVVSTCgpJyBpcyBhIGtub3duIHZhbGlkL2Fi c29sdXRlIFVSTC4KKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyKToK KyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUpOgorICAgICAgICAgICAg VGhlIHN0cmluZ3MgY29uc3RydWN0ZWQgaGVyZSBhcmUgY2VydGFpbmx5IHZhbGlkLgorCiAyMDEz LTAzLTIyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQ2NTM0IGFuZCByMTQ2NTY1LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKaW5kZXggZDQ4YzkxNzAzMDYyMGQxOGY3MDY3ZjAyZjFlNTRiMDdhYThj ZGRkZC4uYTY2ZmY1MjJiOTk2ZWRmNTA1NjI3OTg0YjU5YTRlMzM2OTZhZjIzMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCkBAIC0yNjc5LDcgKzI2NzksNyBAQCB2b2lkIERvY3VtZW50Ojp1cGRh dGVCYXNlVVJMKCkKICAgICAgICAgLy8gVGhlIGRvY3VtZW50VVJJIGF0dHJpYnV0ZSBpcyByZWFk LW9ubHkgZnJvbSBKYXZhU2NyaXB0LCBidXQgd3JpdGFibGUgZnJvbSBPYmplY3RpdmUgQywgc28g d2UgbmVlZCB0byByZXRhaW4KICAgICAgICAgLy8gdGhpcyBmYWxsYmFjayBiZWhhdmlvci4gV2Ug dXNlIGEgbnVsbCBiYXNlIFVSTCwgc2luY2UgdGhlIGRvY3VtZW50VVJJIGF0dHJpYnV0ZSBpcyBh biBhcmJpdHJhcnkgc3RyaW5nCiAgICAgICAgIC8vIGFuZCBET00gMyBDb3JlIGRvZXMgbm90IHNw ZWNpZnkgaG93IGl0IHNob3VsZCBiZSByZXNvbHZlZC4KLSAgICAgICAgbV9iYXNlVVJMID0gS1VS TChLVVJMKCksIGRvY3VtZW50VVJJKCkpOworICAgICAgICBtX2Jhc2VVUkwgPSBLVVJMKFBhcnNl ZFVSTFN0cmluZywgZG9jdW1lbnRVUkkoKSk7CiAgICAgfQogICAgIHNlbGVjdG9yUXVlcnlDYWNo ZSgpLT5pbnZhbGlkYXRlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcAppbmRleCBjOWNkNDA2Yzg4MDQwN2YzN2NkYWFiMzQ5NzJhNjU0Y2I0MWJm Y2Q0Li5jNDE2NjUyZjcxYjdlYTI2NWFkMmFkY2NmYzM2YWM2ZjFhZTVjYzI1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC0xNjkxLDcgKzE2 OTEsNyBAQCBzdGF0aWMgdm9pZCBnYXRoZXJTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50RGF0 YShTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50SQogICAgIGNvbnN0IFNjcmlwdENhbGxGcmFt ZSYgY2FsbEZyYW1lID0gZ2V0Rmlyc3ROb25OYXRpdmVGcmFtZShzdGFjayk7CiAKICAgICBpZiAo Y2FsbEZyYW1lLmxpbmVOdW1iZXIoKSkgewotICAgICAgICBLVVJMIHNvdXJjZSA9IEtVUkwoS1VS TCgpLCBjYWxsRnJhbWUuc291cmNlVVJMKCkpOworICAgICAgICBLVVJMIHNvdXJjZSA9IEtVUkwo UGFyc2VkVVJMU3RyaW5nLCBjYWxsRnJhbWUuc291cmNlVVJMKCkpOwogICAgICAgICBpbml0LnNv dXJjZVVSTCA9IHNvdXJjZS5zdHJpbmcoKTsKICAgICAgICAgaW5pdC5saW5lTnVtYmVyID0gY2Fs bEZyYW1lLmxpbmVOdW1iZXIoKTsKICAgICB9CkBAIC0xNzU5LDcgKzE3NTksNyBAQCB2b2lkIENv bnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0 aXZlVGV4dCwgY29uc3QgUwogICAgICAgICBjb25zdCBTY3JpcHRDYWxsRnJhbWUmIGNhbGxGcmFt ZSA9IGdldEZpcnN0Tm9uTmF0aXZlRnJhbWUoc3RhY2spOwogCiAgICAgICAgIGlmIChjYWxsRnJh bWUubGluZU51bWJlcigpKSB7Ci0gICAgICAgICAgICBLVVJMIHNvdXJjZSA9IEtVUkwoS1VSTCgp LCBjYWxsRnJhbWUuc291cmNlVVJMKCkpOworICAgICAgICAgICAgS1VSTCBzb3VyY2UgPSBLVVJM KFBhcnNlZFVSTFN0cmluZywgY2FsbEZyYW1lLnNvdXJjZVVSTCgpKTsKICAgICAgICAgICAgIGNz cFJlcG9ydC0+c2V0U3RyaW5nKCJzb3VyY2UtZmlsZSIsIGRvY3VtZW50LT5zZWN1cml0eU9yaWdp bigpLT5jYW5SZXF1ZXN0KHNvdXJjZSkgPyBzb3VyY2Uuc3RyaXBwZWRGb3JVc2VBc1JlZmVycmVy KCkgOiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHNvdXJjZSktPnRvU3RyaW5nKCkpOwogICAgICAg ICAgICAgY3NwUmVwb3J0LT5zZXROdW1iZXIoImxpbmUtbnVtYmVyIiwgY2FsbEZyYW1lLmxpbmVO dW1iZXIoKSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAK aW5kZXggYzIwNTdkZjk1Yjc4ZjdkNGRmNjQ4ZGQ1M2JiNzI5NDA5ODNmNjhkMi4uOWY2MTM0NTli NzQ1OTVjODY2MmYyZTUyMDYwNDI2ZmQ2NWQwZWIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5jcHAKQEAgLTUyOSw3ICs1MjksNyBAQCBQYXNzUmVmUHRyPFNlY3VyaXR5T3Jp Z2luPiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcihjb25zdCBT dAogICAgIFN0cmluZyBob3N0ID0gZGF0YWJhc2VJZGVudGlmaWVyLnN1YnN0cmluZyhzZXBhcmF0 b3IxICsgMSwgc2VwYXJhdG9yMiAtIHNlcGFyYXRvcjEgLSAxKTsKICAgICAKICAgICBob3N0ID0g ZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGhvc3QpOwotICAgIHJldHVybiBjcmVhdGUoS1VSTChL VVJMKCksIHByb3RvY29sICsgIjovLyIgKyBob3N0ICsgIjoiICsgU3RyaW5nOjpudW1iZXIocG9y dCkpKTsKKyAgICByZXR1cm4gY3JlYXRlKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBwcm90b2NvbCAr ICI6Ly8iICsgaG9zdCArICI6IiArIFN0cmluZzo6bnVtYmVyKHBvcnQpICsgIi8iKSk7CiB9CiAK IFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoY29uc3Qg U3RyaW5nJiBwcm90b2NvbCwgY29uc3QgU3RyaW5nJiBob3N0LCBpbnQgcG9ydCkKQEAgLTUzNyw3 ICs1MzcsNyBAQCBQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlKGNvbnN0IFN0cmluZyYgcHJvdG9jb2wsIGNvbnN0CiAgICAgaWYgKHBvcnQgPCAwIHx8IHBv cnQgPiBNYXhBbGxvd2VkUG9ydCkKICAgICAgICAgY3JlYXRlVW5pcXVlKCk7CiAgICAgU3RyaW5n IGRlY29kZWRIb3N0ID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGhvc3QpOwotICAgIHJldHVy biBjcmVhdGUoS1VSTChLVVJMKCksIHByb3RvY29sICsgIjovLyIgKyBob3N0ICsgIjoiICsgU3Ry aW5nOjpudW1iZXIocG9ydCkpKTsKKyAgICByZXR1cm4gY3JlYXRlKEtVUkwoUGFyc2VkVVJMU3Ry aW5nLCBwcm90b2NvbCArICI6Ly8iICsgaG9zdCArICI6IiArIFN0cmluZzo6bnVtYmVyKHBvcnQp ICsgIi8iKSk7CiB9CiAKIFN0cmluZyBTZWN1cml0eU9yaWdpbjo6ZGF0YWJhc2VJZGVudGlmaWVy KCkgY29uc3QgCg==