106789 2013-01-14 06:34:30 -0800 [SOUP] work around a glib bug exposed by the new redirect code 2013-09-09 05:31:56 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danw webkit-unassigned berto gustavo laszlo.gombos mrobinson rakuco svillar webkit.review.bot xan.lopez oldest_to_newest 806320 0 danw 2013-01-14 06:34:30 -0800 qv https://bugzilla.gnome.org/show_bug.cgi?id=691489 Since it will presumably be a while before we depend on a new-enough glib to have the fix, work around this by using read_async() rather than skip_async(). (I'm not 100% sure that this completely fixes the bug there, because I had a hard time reproducing it reliably. So, testing welcome. Note that if you're testing with epiphany, you need to rm -rf ~/.cache/epiphany/ after it crashes.) 806322 1 182567 danw 2013-01-14 06:37:35 -0800 Created attachment 182567 patch to use read_async instead of skip_async (intentionally not setting cq? because I'd like people to test it and confirm that it does help first...) 806733 2 182567 mrobinson 2013-01-14 16:13:14 -0800 Comment on attachment 182567 patch to use read_async instead of skip_async View in context: https://bugs.webkit.org/attachment.cgi?id=182567&action=review Looks reasonable to me. > Source/WebCore/ChangeLog:5 > + https://bugzilla.gnome.org/show_bug.cgi?id=691489 I'm a little worried that this might confuse the tools which parse ChangeLogs, so probably better to put this into the description. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:671 > + // This can switch to using skip_async after we depend on glib > 2.35.4 Probably good to put a link to the bug. 807272 3 182763 danw 2013-01-15 07:23:41 -0800 Created attachment 182763 updated for comments This removes the bgo URL form ChangeLog and adds it to ResourceHandleSoup.cpp. If we're going to put out a point release to deal with bug 106903 we should probably get this in too. 812178 4 182763 danw 2013-01-21 08:18:45 -0800 Comment on attachment 182763 updated for comments ok, well, not sure anyone is actually testing this, but at least no one has said "i tested with it and it didn't fix the bug", so let's commit it 812185 5 182763 webkit.review.bot 2013-01-21 08:24:41 -0800 Comment on attachment 182763 updated for comments Clearing flags on attachment: 182763 Committed r140338: <http://trac.webkit.org/changeset/140338> 812186 6 webkit.review.bot 2013-01-21 08:24:45 -0800 All reviewed patches have been landed. Closing bug. 813286 7 svillar 2013-01-22 11:53:30 -0800 Dan I think we need to revert it. The current libsoup stack does not handle the G_MAXSIZE value for count in read_async as it tries to create a buffer of that size. 813290 8 svillar 2013-01-22 11:57:14 -0800 (In reply to comment #7) > Dan I think we need to revert it. The current libsoup stack does not handle the G_MAXSIZE value for count in read_async as it tries to create a buffer of that size. The problem is actually located in read_internal() in gconverterinputstream.c the first time it tries to read something from the underlying string. 813292 9 danw 2013-01-22 12:00:00 -0800 ugh, the G_MAXSSIZE should have changed to READ_BUFFER_SIZE... The code now would be a buffer overrun if someone returned a redirect response that was larger than READ_BUFFER_SIZE. (Which the test suite never does... actually, that might be a good test...) 926662 10 berto 2013-09-09 05:31:56 -0700 This has already been reverted in http://trac.webkit.org/changeset/151013 Since we depend on a glib version that doesn't have this bug we can close this. 182567 2013-01-14 06:37:35 -0800 2013-01-15 07:23:41 -0800 patch to use read_async instead of skip_async 0001-Soup-Work-around-a-glib-bug.patch text/plain 4095 danw RnJvbSBiNmFiN2NhNWJhZTEwNWE1ODE1NTgwZTQwMTNhNzk4YjI5ZmYzZGEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW4gV2luc2hpcCA8ZGFud0Bnbm9tZS5vcmc+CkRhdGU6IE1v biwgMTQgSmFuIDIwMTMgMDk6MzE6NTQgLTA1MDAKU3ViamVjdDogW1BBVENIXSBbU291cF0gV29y ayBhcm91bmQgYSBnbGliIGJ1ZwoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICB8IDIyICsrKysrKysrKysrKysrKysrKysrKysKIC4uLi9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCAgIHwgMTEgKysrKysrLS0t LS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggYTMwYWUzOS4uMWE1YzU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTAxLTE0ICBEYW4gV2luc2hpcCAgPGRhbndAZ25vbWUub3JnPgorCisgICAgICAgIFtT b3VwXSBXb3JrIGFyb3VuZCBhIGdsaWIgYnVnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY3ODkKKyAgICAgICAgaHR0cHM6Ly9idWd6aWxsYS5nbm9t ZS5vcmcvc2hvd19idWcuY2dpP2lkPTY5MTQ4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIGdsaWIgPD0gMi4zNS40LCBnX2lucHV0X3N0cmVhbV9z a2lwX2FzeW5jKCkgYXBwbGllZCB0byBhCisgICAgICAgIGxpYnNvdXAgcmVzcG9uc2Ugc3RyZWFt IHdpbGwgZG8gYSBzeW5jaHJvbm91cyBza2lwKCkgaW4gYW5vdGhlcgorICAgICAgICB0aHJlYWQs IHdoaWNoIGxpYnNvdXAgaXNuJ3QgZXhwZWN0aW5nIGFuZCBkb2Vzbid0IGhhdmUgcHJvcGVyCisg ICAgICAgIGxvY2tpbmcgZm9yLiBXb3JrIGFyb3VuZCB0aGlzIHVudGlsIHRoZSBuZXh0IHRpbWUg d2UgYnVtcCB0aGUgZ2xpYgorICAgICAgICByZXF1aXJlbWVudCBieSB1c2luZyByZWFkX2FzeW5j KCkgKGFuZCB0aHJvd2luZyBhd2F5IHRoZSByZXN1bHQpCisgICAgICAgIGluc3RlYWQgb2Ygc2tp cF9hc3luYygpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czsgZml4ZXMgYSByYWNlIGNvbmRpdGlv biBpbiBleGlzdGluZyB0ZXN0cyB3aXRoIG9sZGVyCisgICAgICAgIGdsaWIKKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAo V2ViQ29yZTo6cmVkaXJlY3RTa2lwQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6c2VuZFJl cXVlc3RDYWxsYmFjayk6CisKIDIwMTMtMDEtMTEgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBIZWFwLXVzZS1hZnRlci1mcmVlIGluIFdlYkNvcmU6OlJl bmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAu Y3BwCmluZGV4IGM3YWMwMzQuLjAwM2E1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC01 MDgsNyArNTA4LDcgQEAgc3RhdGljIHZvaWQgcmVkaXJlY3RTa2lwQ2FsbGJhY2soR09iamVjdCos IEdBc3luY1Jlc3VsdCogYXN5bmNSZXN1bHQsIGdwb2ludGVyIGQKICAgICB9CiAKICAgICBHT3du UHRyPEdFcnJvcj4gZXJyb3I7Ci0gICAgZ3NzaXplIGJ5dGVzU2tpcHBlZCA9IGdfaW5wdXRfc3Ry ZWFtX3NraXBfZmluaXNoKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGFzeW5jUmVzdWx0LCAmZXJy b3Iub3V0UHRyKCkpOworICAgIGdzc2l6ZSBieXRlc1NraXBwZWQgPSBnX2lucHV0X3N0cmVhbV9y ZWFkX2ZpbmlzaChkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBhc3luY1Jlc3VsdCwgJmVycm9yLm91 dFB0cigpKTsKICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgY2xpZW50LT5kaWRGYWlsKGhhbmRs ZS5nZXQoKSwgUmVzb3VyY2VFcnJvcjo6Z2VuZXJpY0lPRXJyb3IoZXJyb3IuZ2V0KCksIGQtPm1f c291cFJlcXVlc3QuZ2V0KCkpKTsKICAgICAgICAgY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9u KGhhbmRsZS5nZXQoKSk7CkBAIC01MTYsNyArNTE2LDcgQEAgc3RhdGljIHZvaWQgcmVkaXJlY3RT a2lwQ2FsbGJhY2soR09iamVjdCosIEdBc3luY1Jlc3VsdCogYXN5bmNSZXN1bHQsIGdwb2ludGVy IGQKICAgICB9CiAKICAgICBpZiAoYnl0ZXNTa2lwcGVkID4gMCkgewotICAgICAgICBnX2lucHV0 X3N0cmVhbV9za2lwX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIEdfTUFYU1NJWkUsIEdf UFJJT1JJVFlfREVGQVVMVCwKKyAgICAgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhkLT5t X2lucHV0U3RyZWFtLmdldCgpLCBkLT5tX2J1ZmZlciwgR19NQVhTU0laRSwgR19QUklPUklUWV9E RUZBVUxULAogICAgICAgICAgICAgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgcmVkaXJlY3RTa2lw Q2FsbGJhY2ssIGhhbmRsZS5nZXQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02NjMs MTAgKzY2MywxMyBAQCBzdGF0aWMgdm9pZCBzZW5kUmVxdWVzdENhbGxiYWNrKEdPYmplY3QqLCBH QXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorICAgIGQtPm1fYnVmZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGdfc2xpY2VfYWxsb2Mo UkVBRF9CVUZGRVJfU0laRSkpOworCiAgICAgaWYgKHNvdXBNZXNzYWdlKSB7CiAgICAgICAgIGlm IChTT1VQX1NUQVRVU19JU19SRURJUkVDVElPTihzb3VwTWVzc2FnZS0+c3RhdHVzX2NvZGUpICYm IHNob3VsZFJlZGlyZWN0KGhhbmRsZS5nZXQoKSkpIHsKICAgICAgICAgICAgIGQtPm1faW5wdXRT dHJlYW0gPSBpbnB1dFN0cmVhbTsKLSAgICAgICAgICAgIGdfaW5wdXRfc3RyZWFtX3NraXBfYXN5 bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgR19NQVhTU0laRSwgR19QUklPUklUWV9ERUZBVUxU LAorICAgICAgICAgICAgLy8gVGhpcyBjYW4gc3dpdGNoIHRvIHVzaW5nIHNraXBfYXN5bmMgYWZ0 ZXIgd2UgZGVwZW5kIG9uIGdsaWIgPiAyLjM1LjQKKyAgICAgICAgICAgIGdfaW5wdXRfc3RyZWFt X3JlYWRfYXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgZC0+bV9idWZmZXIsIEdfTUFYU1NJ WkUsIEdfUFJJT1JJVFlfREVGQVVMVCwKICAgICAgICAgICAgICAgICBkLT5tX2NhbmNlbGxhYmxl LmdldCgpLCByZWRpcmVjdFNraXBDYWxsYmFjaywgaGFuZGxlLmdldCgpKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQpAQCAtNjk3LDggKzcwMCw2IEBAIHN0YXRpYyB2b2lkIHNlbmRS ZXF1ZXN0Q2FsbGJhY2soR09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciBk YXRhKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZC0+bV9idWZmZXIgPSBzdGF0aWNf Y2FzdDxjaGFyKj4oZ19zbGljZV9hbGxvYyhSRUFEX0JVRkZFUl9TSVpFKSk7Ci0KICAgICBpZiAo c291cE1lc3NhZ2UgJiYgZC0+bV9yZXNwb25zZS5pc011bHRpcGFydCgpKSB7CiAgICAgICAgIGQt Pm1fbXVsdGlwYXJ0SW5wdXRTdHJlYW0gPSBhZG9wdEdSZWYoc291cF9tdWx0aXBhcnRfaW5wdXRf c3RyZWFtX25ldyhzb3VwTWVzc2FnZSwgaW5wdXRTdHJlYW0uZ2V0KCkpKTsKICAgICAgICAgc291 cF9tdWx0aXBhcnRfaW5wdXRfc3RyZWFtX25leHRfcGFydF9hc3luYyhkLT5tX211bHRpcGFydElu cHV0U3RyZWFtLmdldCgpLCBHX1BSSU9SSVRZX0RFRkFVTFQsCi0tIAoxLjguMQoK 182763 2013-01-15 07:23:41 -0800 2013-01-21 08:24:41 -0800 updated for comments 0001-Soup-Work-around-a-glib-bug.patch text/plain 4149 danw RnJvbSA4Mjg2NTZkZTRmZmVkNDEyZjE2Y2E1ZjAzNWFmMmY3MjY3OGRjMzY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW4gV2luc2hpcCA8ZGFud0Bnbm9tZS5vcmc+CkRhdGU6IE1v biwgMTQgSmFuIDIwMTMgMDk6MzE6NTQgLTA1MDAKU3ViamVjdDogW1BBVENIXSBbU291cF0gV29y ayBhcm91bmQgYSBnbGliIGJ1ZwoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAyMSArKysrKysrKysrKysrKysrKysrKysKIC4uLi9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCAgICB8IDEzICsrKysrKysr LS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYTMwYWUzOS4uNWRmZDA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEzLTAxLTE0ICBEYW4gV2luc2hpcCAgPGRhbndAZ25vbWUub3JnPgorCisgICAgICAg IFtTb3VwXSBXb3JrIGFyb3VuZCBhIGdsaWIgYnVnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY3ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbiBnbGliIDw9IDIuMzUuNCwgZ19pbnB1dF9zdHJlYW1f c2tpcF9hc3luYygpIGFwcGxpZWQgdG8gYQorICAgICAgICBsaWJzb3VwIHJlc3BvbnNlIHN0cmVh bSB3aWxsIGRvIGEgc3luY2hyb25vdXMgc2tpcCgpIGluIGFub3RoZXIKKyAgICAgICAgdGhyZWFk LCB3aGljaCBsaWJzb3VwIGlzbid0IGV4cGVjdGluZyBhbmQgZG9lc24ndCBoYXZlIHByb3Blcgor ICAgICAgICBsb2NraW5nIGZvci4gV29yayBhcm91bmQgdGhpcyB1bnRpbCB0aGUgbmV4dCB0aW1l IHdlIGJ1bXAgdGhlIGdsaWIKKyAgICAgICAgcmVxdWlyZW1lbnQgYnkgdXNpbmcgcmVhZF9hc3lu YygpIChhbmQgdGhyb3dpbmcgYXdheSB0aGUgcmVzdWx0KQorICAgICAgICBpbnN0ZWFkIG9mIHNr aXBfYXN5bmMoKS4KKworICAgICAgICBObyBuZXcgdGVzdHM7IGZpeGVzIGEgcmFjZSBjb25kaXRp b24gaW4gZXhpc3RpbmcgdGVzdHMgd2l0aCBvbGRlcgorICAgICAgICBnbGliCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnJlZGlyZWN0U2tpcENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnNlbmRS ZXF1ZXN0Q2FsbGJhY2spOgorCiAyMDEzLTAxLTExICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgSGVhcC11c2UtYWZ0ZXItZnJlZSBpbiBXZWJDb3JlOjpS ZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3Vw LmNwcAppbmRleCBjN2FjMDM0Li40ODFjMzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAt NTA4LDcgKzUwOCw3IEBAIHN0YXRpYyB2b2lkIHJlZGlyZWN0U2tpcENhbGxiYWNrKEdPYmplY3Qq LCBHQXN5bmNSZXN1bHQqIGFzeW5jUmVzdWx0LCBncG9pbnRlciBkCiAgICAgfQogCiAgICAgR093 blB0cjxHRXJyb3I+IGVycm9yOwotICAgIGdzc2l6ZSBieXRlc1NraXBwZWQgPSBnX2lucHV0X3N0 cmVhbV9za2lwX2ZpbmlzaChkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBhc3luY1Jlc3VsdCwgJmVy cm9yLm91dFB0cigpKTsKKyAgICBnc3NpemUgYnl0ZXNTa2lwcGVkID0gZ19pbnB1dF9zdHJlYW1f cmVhZF9maW5pc2goZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgYXN5bmNSZXN1bHQsICZlcnJvci5v dXRQdHIoKSk7CiAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgIGNsaWVudC0+ZGlkRmFpbChoYW5k bGUuZ2V0KCksIFJlc291cmNlRXJyb3I6OmdlbmVyaWNJT0Vycm9yKGVycm9yLmdldCgpLCBkLT5t X3NvdXBSZXF1ZXN0LmdldCgpKSk7CiAgICAgICAgIGNsZWFudXBTb3VwUmVxdWVzdE9wZXJhdGlv bihoYW5kbGUuZ2V0KCkpOwpAQCAtNTE2LDcgKzUxNiw3IEBAIHN0YXRpYyB2b2lkIHJlZGlyZWN0 U2tpcENhbGxiYWNrKEdPYmplY3QqLCBHQXN5bmNSZXN1bHQqIGFzeW5jUmVzdWx0LCBncG9pbnRl ciBkCiAgICAgfQogCiAgICAgaWYgKGJ5dGVzU2tpcHBlZCA+IDApIHsKLSAgICAgICAgZ19pbnB1 dF9zdHJlYW1fc2tpcF9hc3luYyhkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBHX01BWFNTSVpFLCBH X1BSSU9SSVRZX0RFRkFVTFQsCisgICAgICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMoZC0+ bV9pbnB1dFN0cmVhbS5nZXQoKSwgZC0+bV9idWZmZXIsIEdfTUFYU1NJWkUsIEdfUFJJT1JJVFlf REVGQVVMVCwKICAgICAgICAgICAgIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHJlZGlyZWN0U2tp cENhbGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNjYz LDEwICs2NjMsMTUgQEAgc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFjayhHT2JqZWN0Kiwg R0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIGRhdGEpCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICBkLT5tX2J1ZmZlciA9IHN0YXRpY19jYXN0PGNoYXIqPihnX3NsaWNlX2FsbG9j KFJFQURfQlVGRkVSX1NJWkUpKTsKKwogICAgIGlmIChzb3VwTWVzc2FnZSkgewogICAgICAgICBp ZiAoU09VUF9TVEFUVVNfSVNfUkVESVJFQ1RJT04oc291cE1lc3NhZ2UtPnN0YXR1c19jb2RlKSAm JiBzaG91bGRSZWRpcmVjdChoYW5kbGUuZ2V0KCkpKSB7CiAgICAgICAgICAgICBkLT5tX2lucHV0 U3RyZWFtID0gaW5wdXRTdHJlYW07Ci0gICAgICAgICAgICBnX2lucHV0X3N0cmVhbV9za2lwX2Fz eW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIEdfTUFYU1NJWkUsIEdfUFJJT1JJVFlfREVGQVVM VCwKKyAgICAgICAgICAgIC8vIFdlIHVzZSByZWFkX2FzeW5jKCkgcmF0aGVyIHRoYW4gc2tpcF9h c3luYygpIHRvIHdvcmsgYXJvdW5kCisgICAgICAgICAgICAvLyBodHRwczovL2J1Z3ppbGxhLmdu b21lLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkxNDg5IHVudGlsIHdlIGNhbgorICAgICAgICAgICAg Ly8gZGVwZW5kIG9uIGdsaWIgPiAyLjM1LjQKKyAgICAgICAgICAgIGdfaW5wdXRfc3RyZWFtX3Jl YWRfYXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgZC0+bV9idWZmZXIsIEdfTUFYU1NJWkUs IEdfUFJJT1JJVFlfREVGQVVMVCwKICAgICAgICAgICAgICAgICBkLT5tX2NhbmNlbGxhYmxlLmdl dCgpLCByZWRpcmVjdFNraXBDYWxsYmFjaywgaGFuZGxlLmdldCgpKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQpAQCAtNjk3LDggKzcwMiw2IEBAIHN0YXRpYyB2b2lkIHNlbmRSZXF1 ZXN0Q2FsbGJhY2soR09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciBkYXRh KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZC0+bV9idWZmZXIgPSBzdGF0aWNfY2Fz dDxjaGFyKj4oZ19zbGljZV9hbGxvYyhSRUFEX0JVRkZFUl9TSVpFKSk7Ci0KICAgICBpZiAoc291 cE1lc3NhZ2UgJiYgZC0+bV9yZXNwb25zZS5pc011bHRpcGFydCgpKSB7CiAgICAgICAgIGQtPm1f bXVsdGlwYXJ0SW5wdXRTdHJlYW0gPSBhZG9wdEdSZWYoc291cF9tdWx0aXBhcnRfaW5wdXRfc3Ry ZWFtX25ldyhzb3VwTWVzc2FnZSwgaW5wdXRTdHJlYW0uZ2V0KCkpKTsKICAgICAgICAgc291cF9t dWx0aXBhcnRfaW5wdXRfc3RyZWFtX25leHRfcGFydF9hc3luYyhkLT5tX211bHRpcGFydElucHV0 U3RyZWFtLmdldCgpLCBHX1BSSU9SSVRZX0RFRkFVTFQsCi0tIAoxLjguMQoK