102582 2012-11-16 22:03:21 -0800 [Soup] CredentialStorage should only be used for HTTP-family requests 2012-11-17 00:04:03 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson danw gustavo rakuco webkit.review.bot oldest_to_newest 769890 0 mrobinson 2012-11-16 22:03:21 -0800 This is causing assertion failures on the debug bots. 769900 1 174808 mrobinson 2012-11-16 22:25:42 -0800 Created attachment 174808 Patch 769913 2 174808 gustavo 2012-11-16 23:12:51 -0800 Comment on attachment 174808 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174808&action=review > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:873 > + if (!d->m_user.isEmpty() || !d->m_pass.isEmpty()) { > + // If credentials were specified for this request, add them to the url, > + // so that they will be passed to NetworkRequest. > + KURL urlWithCredentials(firstRequest().url()); > + urlWithCredentials.setUser(d->m_user); > + urlWithCredentials.setPass(d->m_pass); > + d->m_firstRequest.setURL(urlWithCredentials); > + } This is a left over, as we discussed on IRC, otherwise looks good! 769915 3 mrobinson 2012-11-17 00:04:03 -0800 Committed r135040: <http://trac.webkit.org/changeset/135040> 174808 2012-11-16 22:25:42 -0800 2012-11-16 23:12:51 -0800 Patch bug-102582-20121116222337.patch text/plain 8148 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0OTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEyN2IyMmJjZTgwMGNj NzFiZTczY2I3NmQ3YWJmNjg3YWU5YTAxZC4uZDAwMGY0MmM5MTU0ZjQ4MWJlNzBmM2I4M2M4YmQ4 ODM2MDlhNmFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTExLTE2ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbU291cF0gQ3Jl ZGVudGlhbFN0b3JhZ2Ugc2hvdWxkIG9ubHkgYmUgdXNlZCBmb3IgSFRUUC1mYW1pbHkgcmVxdWVz dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjU4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIG5v dCB1c2UgQ3JlZGVudGlhbFN0b3JhZ2Ugd2hlbiBoYW5kbGluZyBub24tSFRUUCBmYW1pbHkgcmVx dWVzdHMuIENyZWRlbnRpYWxTdG9yYWdlCisgICAgICAgIG9ubHkgZXhwZWN0cyB0byBoYW5kbGUg cmVxdWVzdHMgaW4gdGhlIEhUVFAgZmFtaWx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhp cyBpcyBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZUhhbmRsZS5oOgorICAgICAgICAoUmVzb3VyY2VIYW5kbGUpOiBBZGQgYSBz aG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSBoZWxwZXIgdG8gUmVzb3VyY2VIYW5kbGUuIFRoaXMK KyAgICAgICAgaGVscGVyIHJldHVybnMgZmFsc2Ugd2hlbiBmaXJzdFJlcXVlc3QoKSBpcyBhIG5v bi1IVFRQIGZhbWlseSByZXF1ZXN0LgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwbHlBdXRoZW50aWNh dGlvblRvUmVxdWVzdCk6IFVzZSB0aGUgbmV3IGhlbHBlci4KKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZVNvdXBSZXF1ZXN0QW5kTWVzc2FnZUZvckhhbmRsZSk6IERpdHRvLgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGU6OnN0YXJ0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTo6c2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFs bGVuZ2UpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpyZWNlaXZl ZENyZWRlbnRpYWwpOiBEaXR0by4KKwogMjAxMi0xMS0xNiAgTWljaGFlbCBQcnVldHQgIDxtaWNo YWVsQDY4ay5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBQcm9wYWdhdGUgRE9NUmVxdWVzdFN0 YXRlIHRvIEluZGV4ZWREQiBiaW5kaW5nIHV0aWxpdHkgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKaW5kZXggZTgxOGQ4ZDRh YWM3MTcxZmVmZGFjYmU4YjM4M2JmNjAzZDg5ZGUyYS4uYTFjNTBmNTBhZGI0YTliMjZkOTJhODg5 OGZhMmMzOWMzN2NkOTdhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZUhhbmRsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvUmVzb3VyY2VIYW5kbGUuaApAQCAtMTY5LDYgKzE2OSw3IEBAIHB1YmxpYzoKICNpZiBVU0Uo U09VUCkKICAgICB2b2lkIGNvbnRpbnVlRGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KGNvbnN0IENyZWRlbnRpYWwmIGNyZWRlbnRpYWxGcm9tUGVyc2lzdGVudFN0b3JhZ2UpOwogICAg IHZvaWQgc2VuZFBlbmRpbmdSZXF1ZXN0KCk7CisgICAgYm9vbCBzaG91bGRVc2VDcmVkZW50aWFs U3RvcmFnZSgpOwogICAgIHN0YXRpYyBTb3VwU2Vzc2lvbiogZGVmYXVsdFNlc3Npb24oKTsKICAg ICBzdGF0aWMgdWludDY0X3QgZ2V0U291cFJlcXVlc3RJbml0aWFpbmdQYWdlSUQoU291cFJlcXVl c3QqKTsKICAgICBzdGF0aWMgdm9pZCBzZXRIb3N0QWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZShj b25zdCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggYTIyOTA5ODYyNzJiYzFm Y2I4NjI1YzJhYjEyMzg3OGY0YjY3ZDBkYS4uN2ExOTMwNTU5MDMzMDk3NTM2NWM3MjhiZmQwOWJm MTcxNWM4YWRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTMyNyw3ICszMjcsNyBAQCBz dGF0aWMgdm9pZCBhcHBseUF1dGhlbnRpY2F0aW9uVG9SZXF1ZXN0KFJlc291cmNlSGFuZGxlKiBo YW5kbGUsIGJvb2wgcmVkaXJlY3QpCiAgICAgU3RyaW5nIHBhc3N3b3JkID0gZC0+bV9wYXNzOwog CiAgICAgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0ID0gZC0+bV9maXJzdFJlcXVlc3Q7Ci0gICAg aWYgKCFoYW5kbGUtPmNsaWVudCgpIHx8IGhhbmRsZS0+Y2xpZW50KCktPnNob3VsZFVzZUNyZWRl bnRpYWxTdG9yYWdlKGhhbmRsZSkpIHsKKyAgICBpZiAoaGFuZGxlLT5zaG91bGRVc2VDcmVkZW50 aWFsU3RvcmFnZSgpKSB7CiAgICAgICAgIGlmIChkLT5tX3VzZXIuaXNFbXB0eSgpICYmIGQtPm1f cGFzcy5pc0VtcHR5KCkpCiAgICAgICAgICAgICBkLT5tX2luaXRpYWxDcmVkZW50aWFsID0gQ3Jl ZGVudGlhbFN0b3JhZ2U6OmdldChyZXF1ZXN0LnVybCgpKTsKICAgICAgICAgZWxzZSBpZiAoIXJl ZGlyZWN0KSB7CkBAIC04NjMsNiArODYzLDE2IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN0YXJ0 KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9 CiAKKyAgICBpZiAoIWQtPm1fdXNlci5pc0VtcHR5KCkgfHwgIWQtPm1fcGFzcy5pc0VtcHR5KCkp IHsKKyAgICAgICAgLy8gSWYgY3JlZGVudGlhbHMgd2VyZSBzcGVjaWZpZWQgZm9yIHRoaXMgcmVx dWVzdCwgYWRkIHRoZW0gdG8gdGhlIHVybCwKKyAgICAgICAgLy8gc28gdGhhdCB0aGV5IHdpbGwg YmUgcGFzc2VkIHRvIE5ldHdvcmtSZXF1ZXN0LgorICAgICAgICBLVVJMIHVybFdpdGhDcmVkZW50 aWFscyhmaXJzdFJlcXVlc3QoKS51cmwoKSk7CisgICAgICAgIHVybFdpdGhDcmVkZW50aWFscy5z ZXRVc2VyKGQtPm1fdXNlcik7CisgICAgICAgIHVybFdpdGhDcmVkZW50aWFscy5zZXRQYXNzKGQt Pm1fcGFzcyk7CisgICAgICAgIGQtPm1fZmlyc3RSZXF1ZXN0LnNldFVSTCh1cmxXaXRoQ3JlZGVu dGlhbHMpOworICAgIH0KKworCiAgICAgYXBwbHlBdXRoZW50aWNhdGlvblRvUmVxdWVzdCh0aGlz LCBmYWxzZSk7CiAgICAgLy8gVGhlIENGTmV0IGJhY2tlbmQgY2xlYXJzIHRoZXNlLCBzbyB3ZSBk byBhcyB3ZWxsLgogICAgIGQtPm1fdXNlciA9IFN0cmluZygpOwpAQCAtOTEyLDYgKzkyMiwxMSBA QCB2b2lkIFJlc291cmNlSGFuZGxlOjpjYW5jZWwoKQogICAgICAgICBnX2NhbmNlbGxhYmxlX2Nh bmNlbChkLT5tX2NhbmNlbGxhYmxlLmdldCgpKTsKIH0KIAorYm9vbCBSZXNvdXJjZUhhbmRsZTo6 c2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UoKQoreworICAgIHJldHVybiAoIWNsaWVudCgpIHx8 IGNsaWVudCgpLT5zaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSh0aGlzKSkgJiYgZmlyc3RSZXF1 ZXN0KCkudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpOworfQorCiB2b2lkIFJlc291cmNl SGFuZGxlOjpzZXRIb3N0QWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZShjb25zdCBTdHJpbmcmIGhv c3QpCiB7CiAgICAgYWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZUhvc3RzKCkuYWRkKGhvc3QubG93 ZXIoKSk7CkBAIC05NTksMTAgKzk3NCwxMCBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpkaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRpb25DaGFsbAogewog ICAgIEFTU0VSVChkLT5tX2N1cnJlbnRXZWJDaGFsbGVuZ2UuaXNOdWxsKCkpOwogCi0gICAgYm9v bCBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSA9ICFjbGllbnQoKSB8fCBjbGllbnQoKS0+c2hv dWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UodGhpcyk7CisgICAgYm9vbCB1c2VDcmVkZW50aWFsU3Rv cmFnZSA9IHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKCk7CiAgICAgaWYgKCFkLT5tX3VzZXIu aXNOdWxsKCkgJiYgIWQtPm1fcGFzcy5pc051bGwoKSkgewogICAgICAgICBDcmVkZW50aWFsIGNy ZWRlbnRpYWwgPSBDcmVkZW50aWFsKGQtPm1fdXNlciwgZC0+bV9wYXNzLCBDcmVkZW50aWFsUGVy c2lzdGVuY2VGb3JTZXNzaW9uKTsKLSAgICAgICAgaWYgKHNob3VsZFVzZUNyZWRlbnRpYWxTdG9y YWdlKQorICAgICAgICBpZiAodXNlQ3JlZGVudGlhbFN0b3JhZ2UpCiAgICAgICAgICAgICBDcmVk ZW50aWFsU3RvcmFnZTo6c2V0KGNyZWRlbnRpYWwsIGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2Uo KSwgY2hhbGxlbmdlLmZhaWx1cmVSZXNwb25zZSgpLnVybCgpKTsKICAgICAgICAgc291cF9hdXRo X2F1dGhlbnRpY2F0ZShjaGFsbGVuZ2Uuc291cEF1dGgoKSwgY3JlZGVudGlhbC51c2VyKCkudXRm OCgpLmRhdGEoKSwgY3JlZGVudGlhbC5wYXNzd29yZCgpLnV0ZjgoKS5kYXRhKCkpOwogCkBAIC05 NzAsNyArOTg1LDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGwKICAgICB9CiAKICAgICAvLyBG SVhNRTogUGVyIHRoZSBzcGVjaWZpY2F0aW9uLCB0aGUgdXNlciBzaG91bGRuJ3QgYmUgYXNrZWQg Zm9yIGNyZWRlbnRpYWxzIGlmIHRoZXJlIHdlcmUgaW5jb3JyZWN0IG9uZXMgcHJvdmlkZWQgZXhw bGljaXRseS4KLSAgICBpZiAoc2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UpIHsKKyAgICBpZiAo dXNlQ3JlZGVudGlhbFN0b3JhZ2UpIHsKICAgICAgICAgaWYgKCFkLT5tX2luaXRpYWxDcmVkZW50 aWFsLmlzRW1wdHkoKSB8fCBjaGFsbGVuZ2UucHJldmlvdXNGYWlsdXJlQ291bnQoKSkgewogICAg ICAgICAgICAgLy8gVGhlIHN0b3JlZCBjcmVkZW50aWFsIHdhc24ndCBhY2NlcHRlZCwgc3RvcCB1 c2luZyBpdC4gVGhlcmUgaXMgYSByYWNlIGNvbmRpdGlvbgogICAgICAgICAgICAgLy8gaGVyZSwg c2luY2UgYSBkaWZmZXJlbnQgY3JlZGVudGlhbCBtaWdodCBoYXZlIGFscmVhZHkgYmVlbiBzdG9y ZWQgYnkgYW5vdGhlcgpAQCAtMTAwMSw3ICsxMDE2LDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6 ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hh bGwKICAgICAvLyBvZiBhbGwgcmVxdWVzdCBsYXRlbmN5LCB2ZXJzdXMgYSBvbmUtdGltZSBsYXRl bmN5IGZvciB0aGUgc21hbGwgc3Vic2V0IG9mIHJlcXVlc3RzIHRoYXQKICAgICAvLyB1c2UgSFRU UCBhdXRoZW50aWNhdGlvbi4gSW4gdGhlIGVuZCwgdGhpcyBkb2Vzbid0IG1hdHRlciBtdWNoLCBi ZWNhdXNlIHBlcnNpc3RlbnQgY3JlZGVudGlhbHMKICAgICAvLyB3aWxsIGJlY29tZSBzZXNzaW9u IGNyZWRlbnRpYWxzIGFmdGVyIHRoZSBmaXJzdCB1c2UuCi0gICAgaWYgKHNob3VsZFVzZUNyZWRl bnRpYWxTdG9yYWdlKSB7CisgICAgaWYgKHVzZUNyZWRlbnRpYWxTdG9yYWdlKSB7CiAgICAgICAg IGNyZWRlbnRpYWxCYWNraW5nU3RvcmUoKS5jcmVkZW50aWFsRm9yQ2hhbGxlbmdlKGNoYWxsZW5n ZSwgZ2V0Q3JlZGVudGlhbEZyb21QZXJzaXN0ZW50U3RvcmVDYWxsYmFjaywgdGhpcyk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0xMDMyLDE5ICsxMDQ3LDIxIEBAIHZvaWQgUmVzb3VyY2VI YW5kbGU6OnJlY2VpdmVkQ3JlZGVudGlhbChjb25zdCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYg Y2hhbGxlbmdlCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBFdmVudHVhbGx5IHdl IHdpbGwgbWFuYWdlIHBlci1zZXNzaW9uIGNyZWRlbnRpYWxzIG9ubHkgaW50ZXJuYWxseSBvciB1 c2Ugc29tZSBuZXdseS1leHBvc2VkIEFQSSBmcm9tIGxpYnNvdXAsCi0gICAgLy8gYmVjYXVzZSBv bmNlIHdlIGF1dGhlbnRpY2F0ZSB2aWEgbGlic291cCwgdGhlcmUgaXMgbm8gd2F5IHRvIGlnbm9y ZSBpdCBmb3IgYSBwYXJ0aWN1bGFyIHJlcXVlc3QuIFJpZ2h0IG5vdywKLSAgICAvLyB3ZSBwbGFj ZSB0aGUgY3JlZGVudGlhbHMgaW4gdGhlIHN0b3JlIGV2ZW4gdGhvdWdoIGxpYnNvdXAgd2lsbCBu ZXZlciBmaXJlIHRoZSBhdXRoZW50aWNhdGUgc2lnbmFsIGFnYWluIGZvcgotICAgIC8vIHRoaXMg cHJvdGVjdGlvbiBzcGFjZS4KLSAgICBpZiAoY3JlZGVudGlhbC5wZXJzaXN0ZW5jZSgpID09IENy ZWRlbnRpYWxQZXJzaXN0ZW5jZUZvclNlc3Npb24gfHwgY3JlZGVudGlhbC5wZXJzaXN0ZW5jZSgp ID09IENyZWRlbnRpYWxQZXJzaXN0ZW5jZVBlcm1hbmVudCkKLSAgICAgICAgQ3JlZGVudGlhbFN0 b3JhZ2U6OnNldChjcmVkZW50aWFsLCBjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCksIGNoYWxs ZW5nZS5mYWlsdXJlUmVzcG9uc2UoKS51cmwoKSk7CisgICAgaWYgKHNob3VsZFVzZUNyZWRlbnRp YWxTdG9yYWdlKCkpIHsKKyAgICAgICAgLy8gRXZlbnR1YWxseSB3ZSB3aWxsIG1hbmFnZSBwZXIt c2Vzc2lvbiBjcmVkZW50aWFscyBvbmx5IGludGVybmFsbHkgb3IgdXNlIHNvbWUgbmV3bHktZXhw b3NlZCBBUEkgZnJvbSBsaWJzb3VwLAorICAgICAgICAvLyBiZWNhdXNlIG9uY2Ugd2UgYXV0aGVu dGljYXRlIHZpYSBsaWJzb3VwLCB0aGVyZSBpcyBubyB3YXkgdG8gaWdub3JlIGl0IGZvciBhIHBh cnRpY3VsYXIgcmVxdWVzdC4gUmlnaHQgbm93LAorICAgICAgICAvLyB3ZSBwbGFjZSB0aGUgY3Jl ZGVudGlhbHMgaW4gdGhlIHN0b3JlIGV2ZW4gdGhvdWdoIGxpYnNvdXAgd2lsbCBuZXZlciBmaXJl IHRoZSBhdXRoZW50aWNhdGUgc2lnbmFsIGFnYWluIGZvcgorICAgICAgICAvLyB0aGlzIHByb3Rl Y3Rpb24gc3BhY2UuCisgICAgICAgIGlmIChjcmVkZW50aWFsLnBlcnNpc3RlbmNlKCkgPT0gQ3Jl ZGVudGlhbFBlcnNpc3RlbmNlRm9yU2Vzc2lvbiB8fCBjcmVkZW50aWFsLnBlcnNpc3RlbmNlKCkg PT0gQ3JlZGVudGlhbFBlcnNpc3RlbmNlUGVybWFuZW50KQorICAgICAgICAgICAgQ3JlZGVudGlh bFN0b3JhZ2U6OnNldChjcmVkZW50aWFsLCBjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCksIGNo YWxsZW5nZS5mYWlsdXJlUmVzcG9uc2UoKS51cmwoKSk7CiAKICNpZiBQTEFURk9STShHVEspCi0g ICAgaWYgKGNyZWRlbnRpYWwucGVyc2lzdGVuY2UoKSA9PSBDcmVkZW50aWFsUGVyc2lzdGVuY2VQ ZXJtYW5lbnQpIHsKLSAgICAgICAgZC0+bV9jcmVkZW50aWFsRGF0YVRvU2F2ZUluUGVyc2lzdGVu dFN0b3JlLmNyZWRlbnRpYWwgPSBjcmVkZW50aWFsOwotICAgICAgICBkLT5tX2NyZWRlbnRpYWxE YXRhVG9TYXZlSW5QZXJzaXN0ZW50U3RvcmUuY2hhbGxlbmdlID0gY2hhbGxlbmdlOwotICAgIH0K KyAgICAgICAgaWYgKGNyZWRlbnRpYWwucGVyc2lzdGVuY2UoKSA9PSBDcmVkZW50aWFsUGVyc2lz dGVuY2VQZXJtYW5lbnQpIHsKKyAgICAgICAgICAgIGQtPm1fY3JlZGVudGlhbERhdGFUb1NhdmVJ blBlcnNpc3RlbnRTdG9yZS5jcmVkZW50aWFsID0gY3JlZGVudGlhbDsKKyAgICAgICAgICAgIGQt Pm1fY3JlZGVudGlhbERhdGFUb1NhdmVJblBlcnNpc3RlbnRTdG9yZS5jaGFsbGVuZ2UgPSBjaGFs bGVuZ2U7CisgICAgICAgIH0KICNlbmRpZgorICAgIH0KIAogICAgIEFTU0VSVChjaGFsbGVuZ2Uu c291cFNlc3Npb24oKSk7CiAgICAgQVNTRVJUKGNoYWxsZW5nZS5zb3VwTWVzc2FnZSgpKTsK