24804 2009-03-25 10:18:46 -0700 [GTK] 401 responses cause rogue content to be loaded 2009-03-26 04:44:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk, Soup P2 Normal --- 1 gustavo webkit-unassigned oldest_to_newest 115170 0 gustavo 2009-03-25 10:18:46 -0700 Since my change to unspecial-case most responses >= 400, when first loading a page that requires HTTP basic authentication, the error message will be loaded along with the content. This bug is here to track fixing this regression. 115173 1 28934 gustavo 2009-03-25 10:20:11 -0700 Created attachment 28934 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> Reviewed by NOBODY (OOPS!). https://bugs.webkit.org/show_bug.cgi?id=24804 [GTK] 401 responses cause rogue content to be loaded Our soup code handles 401 responses itself, so we should not feed the headers and data of those responses to the loader. * platform/network/soup/ResourceHandleSoup.cpp: (WebCore::gotHeadersCallback): (WebCore::gotChunkCallback): --- WebCore/ChangeLog | 14 ++++++++++++++ .../platform/network/soup/ResourceHandleSoup.cpp | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) 115182 2 28937 gustavo 2009-03-25 11:16:26 -0700 Created attachment 28937 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> Reviewed by NOBODY (OOPS!). https://bugs.webkit.org/show_bug.cgi?id=24804 [GTK] 401 responses cause rogue content to be loaded Our soup code handles 401 responses itself, so we should not feed the headers and data of those responses to the loader. * platform/network/soup/ResourceHandleSoup.cpp: (WebCore::gotHeadersCallback): (WebCore::gotChunkCallback): --- WebCore/ChangeLog | 14 ++++++++ .../platform/network/soup/ResourceHandleSoup.cpp | 33 +++++++++++++++++--- 2 files changed, 42 insertions(+), 5 deletions(-) 115292 3 28937 zecke 2009-03-25 21:30:08 -0700 Comment on attachment 28937 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> > a5cf3ffc4ba04bd9ca5be3cf646f112aee3fe2db > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 03b7af7..a27bbf0 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,17 @@ > +2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=24804 > + [GTK] 401 responses cause rogue content to be loaded > + > + Our soup code handles 401 responses itself, so we should not feed > + the headers and data of those responses to the loader. tabs vs. spaces here? anyway the pre-commit hook would catch these :) > + // For 401, we will accumulate the resource body, and only use it > + // in case authentication with the soup feature doesn't happen > + if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) { > + soup_message_body_set_accumulate(msg->response_body, TRUE); > + return; > + } > + > + // For all the other responses, we handle each chunk ourselves, > + // and we don't need msg->response_body to contain all of the data > + // we got, when we finish downloading. > + soup_message_body_set_accumulate(msg->response_body, FALSE); > + > // The 304 status code (SOUP_STATUS_NOT_MODIFIED) needs to be fed > // into WebCore, as opposed to other kinds of redirections, which > // are handled by soup directly, so we special-case it here and in > // gotChunk. > if (SOUP_STATUS_IS_TRANSPORT_ERROR(msg->status_code) > - || (SOUP_STATUS_IS_REDIRECTION(msg->status_code) && (msg->status_code != SOUP_STATUS_NOT_MODIFIED))) > + || (SOUP_STATUS_IS_REDIRECTION(msg->status_code) && (msg->status_code != SOUP_STATUS_NOT_MODIFIED)) > + || (msg->status_code == SOUP_STATUS_UNAUTHORIZED)) > return; okay, with status->code == SOUP_STATUS_UNAU... we will never reach here... unless soup_message_body_set_accumulate changes the status_code. So can this be removed? > > // We still don't know anything about Content-Type, so we will try > @@ -268,7 +281,8 @@ static void gotHeadersCallback(SoupMessage* msg, gpointer data) > static void gotChunkCallback(SoupMessage* msg, SoupBuffer* chunk, gpointer data) > { > if (SOUP_STATUS_IS_TRANSPORT_ERROR(msg->status_code) > - || (SOUP_STATUS_IS_REDIRECTION(msg->status_code) && (msg->status_code != SOUP_STATUS_NOT_MODIFIED))) > + || (SOUP_STATUS_IS_REDIRECTION(msg->status_code) && (msg->status_code != SOUP_STATUS_NOT_MODIFIED)) > + || (msg->status_code == SOUP_STATUS_UNAUTHORIZED)) > return; what about an ASSERT(msg->status_code != SOUP_STATUS_UNAUTHORIZED)? Or will gotChunkCallback be called regardles of the body accumulate? otherwise, it looks pretty good. 115312 4 28937 zecke 2009-03-26 04:01:59 -0700 Comment on attachment 28937 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> Okay. There is agreement on the first hunk (needles return statement) and uncertainty about the ASSERT. I'm saying r=+ based on this, please try the assert first if that does not work go for the current code in gotChunkCallback. 115314 5 gustavo 2009-03-26 04:44:01 -0700 Landed as r42001; soup will always emit got-chunk at least once, from my reading of the docs/code, so no assert for us. 28934 2009-03-25 10:20:11 -0700 2009-03-25 11:16:57 -0700 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2009-03-25-Gustavo-Noronha-Silva-gustavo.noronha-collabora.co.uk-.patch text/plain 2445 gustavo ZWE2OTRlMmI1NDE1MTMwY2YwZTc1YjdiZDI0YjY3NThkNDhkNTg4NgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwM2I3YWY3Li5hMjdiYmYw IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDA5LTAzLTI1ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0 YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0 ODA0CisJW0dUS10gNDAxIHJlc3BvbnNlcyBjYXVzZSByb2d1ZSBjb250ZW50IHRvIGJlIGxvYWRl ZAorCisgICAgICAgIE91ciBzb3VwIGNvZGUgaGFuZGxlcyA0MDEgcmVzcG9uc2VzIGl0c2VsZiwg c28gd2Ugc2hvdWxkIG5vdCBmZWVkCisgICAgICAgIHRoZSBoZWFkZXJzIGFuZCBkYXRhIG9mIHRo b3NlIHJlc3BvbnNlcyB0byB0aGUgbG9hZGVyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnb3RIZWFk ZXJzQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6Z290Q2h1bmtDYWxsYmFjayk6CisKIDIw MDktMDMtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggYjcyM2M0Yi4uNTNm NDAxYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCkBAIC0yMzcsOSArMjM3LDEwIEBAIHN0YXRpYyB2b2lkIGdvdEhlYWRl cnNDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBncG9pbnRlciBkYXRhKQogICAgIC8vIFRoZSAz MDQgc3RhdHVzIGNvZGUgKFNPVVBfU1RBVFVTX05PVF9NT0RJRklFRCkgbmVlZHMgdG8gYmUgZmVk CiAgICAgLy8gaW50byBXZWJDb3JlLCBhcyBvcHBvc2VkIHRvIG90aGVyIGtpbmRzIG9mIHJlZGly ZWN0aW9ucywgd2hpY2gKICAgICAvLyBhcmUgaGFuZGxlZCBieSBzb3VwIGRpcmVjdGx5LCBzbyB3 ZSBzcGVjaWFsLWNhc2UgaXQgaGVyZSBhbmQgaW4KLSAgICAvLyBnb3RDaHVuay4KKyAgICAvLyBn b3RDaHVuay4gT3VyIHNvdXAgY29kZSBhbHNvIGhhbmRsZXMgNDAxIHJlc3BvbnNlcyBpdHNlbGYu CiAgICAgaWYgKFNPVVBfU1RBVFVTX0lTX1RSQU5TUE9SVF9FUlJPUihtc2ctPnN0YXR1c19jb2Rl KQotICAgICAgICB8fCAoU09VUF9TVEFUVVNfSVNfUkVESVJFQ1RJT04obXNnLT5zdGF0dXNfY29k ZSkgJiYgKG1zZy0+c3RhdHVzX2NvZGUgIT0gU09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSkpCisg ICAgICAgIHx8IChTT1VQX1NUQVRVU19JU19SRURJUkVDVElPTihtc2ctPnN0YXR1c19jb2RlKSAm JiAobXNnLT5zdGF0dXNfY29kZSAhPSBTT1VQX1NUQVRVU19OT1RfTU9ESUZJRUQpKQorICAgICAg ICB8fCAobXNnLT5zdGF0dXNfY29kZSA9PSBTT1VQX1NUQVRVU19VTkFVVEhPUklaRUQpKQogICAg ICAgICByZXR1cm47CiAKICAgICAvLyBXZSBzdGlsbCBkb24ndCBrbm93IGFueXRoaW5nIGFib3V0 IENvbnRlbnQtVHlwZSwgc28gd2Ugd2lsbCB0cnkKQEAgLTI2OCw3ICsyNjksOCBAQCBzdGF0aWMg dm9pZCBnb3RIZWFkZXJzQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkK IHN0YXRpYyB2b2lkIGdvdENodW5rQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgU291cEJ1ZmZl ciogY2h1bmssIGdwb2ludGVyIGRhdGEpCiB7CiAgICAgaWYgKFNPVVBfU1RBVFVTX0lTX1RSQU5T UE9SVF9FUlJPUihtc2ctPnN0YXR1c19jb2RlKQotICAgICAgICB8fCAoU09VUF9TVEFUVVNfSVNf UkVESVJFQ1RJT04obXNnLT5zdGF0dXNfY29kZSkgJiYgKG1zZy0+c3RhdHVzX2NvZGUgIT0gU09V UF9TVEFUVVNfTk9UX01PRElGSUVEKSkpCisgICAgICAgIHx8IChTT1VQX1NUQVRVU19JU19SRURJ UkVDVElPTihtc2ctPnN0YXR1c19jb2RlKSAmJiAobXNnLT5zdGF0dXNfY29kZSAhPSBTT1VQX1NU QVRVU19OT1RfTU9ESUZJRUQpKQorICAgICAgICB8fCAobXNnLT5zdGF0dXNfY29kZSA9PSBTT1VQ X1NUQVRVU19VTkFVVEhPUklaRUQpKQogICAgICAgICByZXR1cm47CiAKICAgICBSZXNvdXJjZUhh bmRsZSogaGFuZGxlID0gc3RhdGljX2Nhc3Q8UmVzb3VyY2VIYW5kbGUqPihkYXRhKTsK 28937 2009-03-25 11:16:26 -0700 2009-03-26 04:01:59 -0700 2009-03-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2009-03-25-Gustavo-Noronha-Silva-gustavo.noronha-collabora.co.uk-.patch text/plain 4091 gustavo YTVjZjNmZmM0YmEwNGJkOWNhNWJlM2NmNjQ2ZjExMmFlZTNmZTJkYgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwM2I3YWY3Li5hMjdiYmYw IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDA5LTAzLTI1ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0 YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0 ODA0CisJW0dUS10gNDAxIHJlc3BvbnNlcyBjYXVzZSByb2d1ZSBjb250ZW50IHRvIGJlIGxvYWRl ZAorCisgICAgICAgIE91ciBzb3VwIGNvZGUgaGFuZGxlcyA0MDEgcmVzcG9uc2VzIGl0c2VsZiwg c28gd2Ugc2hvdWxkIG5vdCBmZWVkCisgICAgICAgIHRoZSBoZWFkZXJzIGFuZCBkYXRhIG9mIHRo b3NlIHJlc3BvbnNlcyB0byB0aGUgbG9hZGVyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnb3RIZWFk ZXJzQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6Z290Q2h1bmtDYWxsYmFjayk6CisKIDIw MDktMDMtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggYjcyM2M0Yi4uZjUw MWE4NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCkBAIC0yMzQsMTIgKzIzNCwyNSBAQCBzdGF0aWMgdm9pZCByZXN0YXJ0 ZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBncG9pbnRlciBkYXRhKQogCiBzdGF0aWMgdm9p ZCBnb3RIZWFkZXJzQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKIHsK KyAgICAvLyBGb3IgNDAxLCB3ZSB3aWxsIGFjY3VtdWxhdGUgdGhlIHJlc291cmNlIGJvZHksIGFu ZCBvbmx5IHVzZSBpdAorICAgIC8vIGluIGNhc2UgYXV0aGVudGljYXRpb24gd2l0aCB0aGUgc291 cCBmZWF0dXJlIGRvZXNuJ3QgaGFwcGVuCisgICAgaWYgKG1zZy0+c3RhdHVzX2NvZGUgPT0gU09V UF9TVEFUVVNfVU5BVVRIT1JJWkVEKSB7CisgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X3NldF9h Y2N1bXVsYXRlKG1zZy0+cmVzcG9uc2VfYm9keSwgVFJVRSk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICAvLyBGb3IgYWxsIHRoZSBvdGhlciByZXNwb25zZXMsIHdlIGhhbmRsZSBlYWNo IGNodW5rIG91cnNlbHZlcywKKyAgICAvLyBhbmQgd2UgZG9uJ3QgbmVlZCBtc2ctPnJlc3BvbnNl X2JvZHkgdG8gY29udGFpbiBhbGwgb2YgdGhlIGRhdGEKKyAgICAvLyB3ZSBnb3QsIHdoZW4gd2Ug ZmluaXNoIGRvd25sb2FkaW5nLgorICAgIHNvdXBfbWVzc2FnZV9ib2R5X3NldF9hY2N1bXVsYXRl KG1zZy0+cmVzcG9uc2VfYm9keSwgRkFMU0UpOworCiAgICAgLy8gVGhlIDMwNCBzdGF0dXMgY29k ZSAoU09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSBuZWVkcyB0byBiZSBmZWQKICAgICAvLyBpbnRv IFdlYkNvcmUsIGFzIG9wcG9zZWQgdG8gb3RoZXIga2luZHMgb2YgcmVkaXJlY3Rpb25zLCB3aGlj aAogICAgIC8vIGFyZSBoYW5kbGVkIGJ5IHNvdXAgZGlyZWN0bHksIHNvIHdlIHNwZWNpYWwtY2Fz ZSBpdCBoZXJlIGFuZCBpbgogICAgIC8vIGdvdENodW5rLgogICAgIGlmIChTT1VQX1NUQVRVU19J U19UUkFOU1BPUlRfRVJST1IobXNnLT5zdGF0dXNfY29kZSkKLSAgICAgICAgfHwgKFNPVVBfU1RB VFVTX0lTX1JFRElSRUNUSU9OKG1zZy0+c3RhdHVzX2NvZGUpICYmIChtc2ctPnN0YXR1c19jb2Rl ICE9IFNPVVBfU1RBVFVTX05PVF9NT0RJRklFRCkpKQorICAgICAgICB8fCAoU09VUF9TVEFUVVNf SVNfUkVESVJFQ1RJT04obXNnLT5zdGF0dXNfY29kZSkgJiYgKG1zZy0+c3RhdHVzX2NvZGUgIT0g U09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSkKKyAgICAgICAgfHwgKG1zZy0+c3RhdHVzX2NvZGUg PT0gU09VUF9TVEFUVVNfVU5BVVRIT1JJWkVEKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8g V2Ugc3RpbGwgZG9uJ3Qga25vdyBhbnl0aGluZyBhYm91dCBDb250ZW50LVR5cGUsIHNvIHdlIHdp bGwgdHJ5CkBAIC0yNjgsNyArMjgxLDggQEAgc3RhdGljIHZvaWQgZ290SGVhZGVyc0NhbGxiYWNr KFNvdXBNZXNzYWdlKiBtc2csIGdwb2ludGVyIGRhdGEpCiBzdGF0aWMgdm9pZCBnb3RDaHVua0Nh bGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIFNvdXBCdWZmZXIqIGNodW5rLCBncG9pbnRlciBkYXRh KQogewogICAgIGlmIChTT1VQX1NUQVRVU19JU19UUkFOU1BPUlRfRVJST1IobXNnLT5zdGF0dXNf Y29kZSkKLSAgICAgICAgfHwgKFNPVVBfU1RBVFVTX0lTX1JFRElSRUNUSU9OKG1zZy0+c3RhdHVz X2NvZGUpICYmIChtc2ctPnN0YXR1c19jb2RlICE9IFNPVVBfU1RBVFVTX05PVF9NT0RJRklFRCkp KQorICAgICAgICB8fCAoU09VUF9TVEFUVVNfSVNfUkVESVJFQ1RJT04obXNnLT5zdGF0dXNfY29k ZSkgJiYgKG1zZy0+c3RhdHVzX2NvZGUgIT0gU09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSkKKyAg ICAgICAgfHwgKG1zZy0+c3RhdHVzX2NvZGUgPT0gU09VUF9TVEFUVVNfVU5BVVRIT1JJWkVEKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IHN0YXRpY19j YXN0PFJlc291cmNlSGFuZGxlKj4oZGF0YSk7CkBAIC0zMjEsNiArMzM1LDE4IEBAIHN0YXRpYyB2 b2lkIGZpbmlzaGVkQ2FsbGJhY2soU291cFNlc3Npb24gKnNlc3Npb24sIFNvdXBNZXNzYWdlKiBt c2csIGdwb2ludGVyIGRhCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAobXNnLT5z dGF0dXNfY29kZSA9PSBTT1VQX1NUQVRVU19VTkFVVEhPUklaRUQpIHsKKyAgICAgICAgZmlsbFJl c3BvbnNlRnJvbU1lc3NhZ2UobXNnLCAmZC0+bV9yZXNwb25zZSk7CisgICAgICAgIGNsaWVudC0+ ZGlkUmVjZWl2ZVJlc3BvbnNlKGhhbmRsZS5nZXQoKSwgZC0+bV9yZXNwb25zZSk7CisKKyAgICAg ICAgLy8gV2ViQ29yZSBtaWdodCBoYXZlIGNhbmNlbGxlZCB0aGUgam9iIGluIHRoZSB3aGlsZQor ICAgICAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgaWYgKG1zZy0+cmVzcG9uc2VfYm9keS0+ZGF0YSkKKyAgICAgICAgICAgIGNsaWVudC0+ZGlk UmVjZWl2ZURhdGEoaGFuZGxlLmdldCgpLCBtc2ctPnJlc3BvbnNlX2JvZHktPmRhdGEsIG1zZy0+ cmVzcG9uc2VfYm9keS0+bGVuZ3RoLCB0cnVlKTsKKyAgICB9CisKICAgICBjbGllbnQtPmRpZEZp bmlzaExvYWRpbmcoaGFuZGxlLmdldCgpKTsKIH0KIApAQCAtNTA3LDkgKzUzMyw2IEBAIGJvb2wg UmVzb3VyY2VIYW5kbGU6OnN0YXJ0SHR0cChTdHJpbmcgdXJsU3RyaW5nKQogICAgIC8vIGJhbGFu Y2VkIGJ5IGEgZGVyZWYoKSBpbiBmaW5pc2hlZENhbGxiYWNrLCB3aGljaCBzaG91bGQgYWx3YXlz IHJ1bgogICAgIHJlZigpOwogCi0gICAgLy8gV2UgaGFuZGxlIGVhY2ggY2h1bmsgb3Vyc2VsdmVz LCBhbmQgd2UgZG9uJ3QgbmVlZCBtc2ctPnJlc3BvbnNlX2JvZHkKLSAgICAvLyB0byBjb250YWlu IGFsbCBvZiB0aGUgZGF0YSB3ZSBnb3QsIHdoZW4gd2UgZmluaXNoIGRvd25sb2FkaW5nLgotICAg IHNvdXBfbWVzc2FnZV9ib2R5X3NldF9hY2N1bXVsYXRlKG1zZy0+cmVzcG9uc2VfYm9keSwgRkFM U0UpOwogICAgIHNvdXBfc2Vzc2lvbl9xdWV1ZV9tZXNzYWdlKHNlc3Npb24sIGQtPm1fbXNnLCBm aW5pc2hlZENhbGxiYWNrLCB0aGlzKTsKIAogICAgIHJldHVybiB0cnVlOwo=