50083 2010-11-25 08:08:51 -0800 [Gtk] ASSERT(d->m_response.isNull()) in contentSniffedCallback 2010-11-26 07:52:55 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 svillar webkit-unassigned commit-queue xan.lopez oldest_to_newest 313774 0 svillar 2010-11-25 08:08:51 -0800 We are easily reaching that assertion since 72695. The problem is located in soup-request-http.c. We're emitting the "content-sniffed" callback without even considering that the sniffing was not enabled for each particular message (see startHttp in ResourceHandleSoup.cpp) 313777 1 74881 svillar 2010-11-25 08:14:19 -0800 Created attachment 74881 Fix for the bug This should be "the right thing". We should not emit the content-sniffed callback if it was disabled for that particular SoupMessage. The problem is that soup_message_disables_feature is not in the public API of SoupMessage. My proposal would be to just apply the changes in ResourceHandleSoup.cpp (i.e. do not connect to the "content-sniffed" signal) because: * it's correct anyway * it'll fix the bug * the invalid signal emission is located in the soup imported code, and thus, when moved there the soup_message_disables_feature could be easily added then (we can add that code as a comment) 313784 2 svillar 2010-11-25 08:37:24 -0800 Adding Mr. Lopez (a.k.a SoupCache bug hunter) 313990 3 74881 xan.lopez 2010-11-26 06:12:48 -0800 Comment on attachment 74881 Fix for the bug View in context: https://bugs.webkit.org/attachment.cgi?id=74881&action=review > WebCore/platform/network/soup/ResourceHandleSoup.cpp:591 > As discussed yesterday in person this is logically wrong, should go in an else block. Other than that the patch makes sense to me (let's get it in ASAP, it ASSERTs really frequently). 314005 4 74934 svillar 2010-11-26 06:51:46 -0800 Created attachment 74934 Fix for the bug Final version of the patch: * connect to content-sniffed signal if handle->shouldContentSniff() * fixed an potential early finalization of an object * added comments with the "proper" fix inside the cache code to be migrated to libsoup 314013 5 74934 xan.lopez 2010-11-26 07:16:01 -0800 Comment on attachment 74934 Fix for the bug r=me 314021 6 74934 commit-queue 2010-11-26 07:52:50 -0800 Comment on attachment 74934 Fix for the bug Clearing flags on attachment: 74934 Committed r72762: <http://trac.webkit.org/changeset/72762> 314022 7 commit-queue 2010-11-26 07:52:55 -0800 All reviewed patches have been landed. Closing bug. 74881 2010-11-25 08:14:19 -0800 2010-11-26 06:51:46 -0800 Fix for the bug 50083.patch text/plain 3323 svillar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNv dXAuY3BwCmluZGV4IGU1NzhhOGQuLjkyNDY1MDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNTg0LDEyICs1ODQs MTMgQEAgc3RhdGljIGJvb2wgc3RhcnRIdHRwKFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiAgICAg U291cE1lc3NhZ2UqIHNvdXBNZXNzYWdlID0gZC0+bV9zb3VwTWVzc2FnZS5nZXQoKTsKICAgICBy ZXF1ZXN0LnVwZGF0ZVNvdXBNZXNzYWdlKHNvdXBNZXNzYWdlKTsKIAotICAgIGlmICghaGFuZGxl LT5zaG91bGRDb250ZW50U25pZmYoKSkKKyAgICBpZiAoIWhhbmRsZS0+c2hvdWxkQ29udGVudFNu aWZmKCkpIHsKICAgICAgICAgc291cF9tZXNzYWdlX2Rpc2FibGVfZmVhdHVyZShzb3VwTWVzc2Fn ZSwgU09VUF9UWVBFX0NPTlRFTlRfU05JRkZFUik7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qo c291cE1lc3NhZ2UsICJjb250ZW50LXNuaWZmZWQiLCBHX0NBTExCQUNLKGNvbnRlbnRTbmlmZmVk Q2FsbGJhY2spLCBoYW5kbGUpOworICAgIH0KIAogICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc291cE1l c3NhZ2UsICJyZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3RhcnRlZENhbGxiYWNrKSwgaGFuZGxl KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAiZ290LWhlYWRlcnMiLCBHX0NB TExCQUNLKGdvdEhlYWRlcnNDYWxsYmFjayksIGhhbmRsZSk7Ci0gICAgZ19zaWduYWxfY29ubmVj dChzb3VwTWVzc2FnZSwgImNvbnRlbnQtc25pZmZlZCIsIEdfQ0FMTEJBQ0soY29udGVudFNuaWZm ZWRDYWxsYmFjayksIGhhbmRsZSk7CiAgICAgZC0+bV9nb3RDaHVua0hhbmRsZXIgPSBnX3NpZ25h bF9jb25uZWN0KHNvdXBNZXNzYWdlLCAiZ290LWNodW5rIiwgR19DQUxMQkFDSyhnb3RDaHVua0Nh bGxiYWNrKSwgaGFuZGxlKTsKIAogI2lmZGVmIEhBVkVfTElCU09VUF8yXzI5XzkwCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9jYWNoZS9zb3VwLXJlcXVlc3QtaHR0 cC5jIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvY2FjaGUvc291cC1yZXF1ZXN0LWh0 dHAuYwppbmRleCBmMTU3Y2ZjLi42ZGQ3YTIxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9jYWNoZS9zb3VwLXJlcXVlc3QtaHR0cC5jCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL2NhY2hlL3NvdXAtcmVxdWVzdC1odHRwLmMKQEAgLTE0NiwxMyAr MTQ2LDE0IEBAIGNvbmRpdGlvbmFsX2dldF9yZWFkeV9jYiAoU291cFNlc3Npb24gKnNlc3Npb24s IFNvdXBNZXNzYWdlICptc2csIGdwb2ludGVyIHVzZXJfCiAKIAkJaHR0cHN0cmVhbSA9IChXZWJL aXRTb3VwSFRUUElucHV0U3RyZWFtICopd2Via2l0X3NvdXBfY2FjaGVfc2VuZF9yZXNwb25zZSAo Y2FjaGUsIG1zZyk7CiAJCWlmIChodHRwc3RyZWFtKSB7Ci0JCQljb25zdCBnY2hhciAqY29udGVu dF90eXBlOwotCiAJCQlnX3NpbXBsZV9hc3luY19yZXN1bHRfc2V0X29wX3Jlc19ncG9pbnRlciAo c2ltcGxlLCBodHRwc3RyZWFtLCBnX29iamVjdF91bnJlZik7CiAKIAkJCXNvdXBfbWVzc2FnZV9n b3RfaGVhZGVycyAoaGVscGVyLT5vcmlnaW5hbCk7Ci0JCQljb250ZW50X3R5cGUgPSBzb3VwX21l c3NhZ2VfaGVhZGVyc19nZXRfY29udGVudF90eXBlIChtc2ctPnJlc3BvbnNlX2hlYWRlcnMsIE5V TEwpOwotCQkJc291cF9tZXNzYWdlX2NvbnRlbnRfc25pZmZlZCAoaGVscGVyLT5vcmlnaW5hbCwg Y29udGVudF90eXBlLCBOVUxMKTsKKworCQkJaWYgKCFzb3VwX21lc3NhZ2VfZGlzYWJsZXNfZmVh dHVyZShtc2csIFNPVVBfVFlQRV9DT05URU5UX1NOSUZGRVIpKSB7CisJCQkJY29uc3QgZ2NoYXIg KmNvbnRlbnRfdHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9jb250ZW50X3R5cGUgKG1z Zy0+cmVzcG9uc2VfaGVhZGVycywgTlVMTCk7CisJCQkJc291cF9tZXNzYWdlX2NvbnRlbnRfc25p ZmZlZCAoaGVscGVyLT5vcmlnaW5hbCwgY29udGVudF90eXBlLCBOVUxMKTsKKwkJCX0KIAogCQkJ Z19zaW1wbGVfYXN5bmNfcmVzdWx0X2NvbXBsZXRlIChzaW1wbGUpOwogCkBAIC0yMDMsOCArMjA0 LDYgQEAgc2VuZF9hc3luY19jYiAoZ3BvaW50ZXIgZGF0YSkKIAlodHRwc3RyZWFtID0gKFdlYktp dFNvdXBIVFRQSW5wdXRTdHJlYW0gKil3ZWJraXRfc291cF9jYWNoZV9zZW5kX3Jlc3BvbnNlIChj YWNoZSwgU09VUF9NRVNTQUdFIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZykpOwogCiAJaWYgKGh0 dHBzdHJlYW0pIHsKLQkJY29uc3QgZ2NoYXIgKmNvbnRlbnRfdHlwZTsKLQogCQlzaW1wbGUgPSBn X3NpbXBsZV9hc3luY19yZXN1bHRfbmV3IChHX09CSkVDVCAoaGVscGVyLT5odHRwKSwKIAkJCQkJ CSAgICBoZWxwZXItPmNhbGxiYWNrLCBoZWxwZXItPnVzZXJfZGF0YSwKIAkJCQkJCSAgICB3ZWJr aXRfc291cF9yZXF1ZXN0X2h0dHBfc2VuZF9hc3luYyk7CkBAIC0yMTUsOCArMjE0LDExIEBAIHNl bmRfYXN5bmNfY2IgKGdwb2ludGVyIGRhdGEpCiAKIAkJLyogSXNzdWUgc2lnbmFscyAgKi8KIAkJ c291cF9tZXNzYWdlX2dvdF9oZWFkZXJzIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZyk7Ci0JCWNv bnRlbnRfdHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9jb250ZW50X3R5cGUgKGhlbHBl ci0+aHR0cC0+cHJpdi0+bXNnLT5yZXNwb25zZV9oZWFkZXJzLCBOVUxMKTsKLQkJc291cF9tZXNz YWdlX2NvbnRlbnRfc25pZmZlZCAoaGVscGVyLT5odHRwLT5wcml2LT5tc2csIGNvbnRlbnRfdHlw ZSwgTlVMTCk7CisKKwkJaWYgKCFzb3VwX21lc3NhZ2VfZGlzYWJsZXNfZmVhdHVyZShoZWxwZXIt Pmh0dHAtPnByaXYtPm1zZywgU09VUF9UWVBFX0NPTlRFTlRfU05JRkZFUikpIHsKKwkJCWNvbnN0 IGdjaGFyICpjb250ZW50X3R5cGUgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfY29udGVudF90 eXBlIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZy0+cmVzcG9uc2VfaGVhZGVycywgTlVMTCk7CisJ CQlzb3VwX21lc3NhZ2VfY29udGVudF9zbmlmZmVkIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZywg Y29udGVudF90eXBlLCBOVUxMKTsKKwkJfQogCiAJCWdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9jb21w bGV0ZSAoc2ltcGxlKTsKIAo= 74934 2010-11-26 06:51:46 -0800 2010-11-26 07:52:50 -0800 Fix for the bug 0001-Fix-for-50083.patch text/plain 4855 svillar RnJvbSA1NDA1MTE2N2I0NDQyYjE5ZGZkYjZiMjMzOTllYzAxZGY2NDZmNDdhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTZXJnaW8gVmlsbGFyIFNlbmluIDxzdmlsbGFyQGlnYWxpYS5j b20+CkRhdGU6IFRodSwgMjUgTm92IDIwMTAgMTc6MTY6MDEgKzAxMDAKU3ViamVjdDogW1BBVENI XSBGaXggZm9yIDUwMDgzCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKysrKysrKysrKwogLi4uL3BsYXRmb3Jt L25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwICAgfCAgICAzICsrLQogLi4uL25l dHdvcmsvc291cC9jYWNoZS9zb3VwLXJlcXVlc3QtaHR0cC5jICAgICAgICAgfCAgIDE3ICsrKysr KysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBmMDk4MWEwLi4xZDU4YTgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTExLTI2ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEFTU0VSVChkLT5tX3Jlc3BvbnNl LmlzTnVsbCgpKSBpbiBjb250ZW50U25pZmZlZENhbGxiYWNrCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDA4MworCisgICAgICAgIFJlc291cmNlSGFu ZGxlU291cCBzaG91bGQgbm90IGxpc3RlbiB0byBjb250ZW50LXNuaWZmZWQgc2lnbmFsCisgICAg ICAgIHdoZW4gY29udGVudCBzbmlmZmluZyBpcyBub3QgZW5hYmxlZC4gVGhpcyB3aWxsIHByZXZl bnQgdXMKKyAgICAgICAgcmVhY2hpbmcgYW4gYXNzZXJ0aW9uIG9uIGNvbnRlbnQtc25pZmZlZCBj YWxsYmFjaworCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdGFydEh0dHApOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvc291cC9jYWNoZS9zb3VwLXJlcXVlc3QtaHR0cC5jOgorICAgICAgICAoY29u ZGl0aW9uYWxfZ2V0X3JlYWR5X2NiKTogYWRkZWQgYSBjb21tZW50IHdpdGggdGhlCisgICAgICAg IHBvc3NpYmxlIGZpeCBmb3IgYSBwdXJlIGxpYnNvdXAgSFRUUCBjYWNoZS4KKyAgICAgICAgKHNl bmRfYXN5bmNfY2IpOiBwcmV2ZW50IGFuIGVhcmx5IG9iamVjdCBmaW5hbGl6YXRpb24gYWRkaW5n IGEKKyAgICAgICAgcmVmZXJlbmNlLgorICAgICAgICAod2Via2l0X3NvdXBfcmVxdWVzdF9odHRw X3NlbmRfYXN5bmMpOiBEaXR0by4KKwogMjAxMC0xMS0yNSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgWGFuIExvcGV6 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5k bGVTb3VwLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHAKaW5kZXggZTU3OGE4ZC4uYzE5MzNlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC01ODYsMTAgKzU4 NiwxMSBAQCBzdGF0aWMgYm9vbCBzdGFydEh0dHAoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKIAog ICAgIGlmICghaGFuZGxlLT5zaG91bGRDb250ZW50U25pZmYoKSkKICAgICAgICAgc291cF9tZXNz YWdlX2Rpc2FibGVfZmVhdHVyZShzb3VwTWVzc2FnZSwgU09VUF9UWVBFX0NPTlRFTlRfU05JRkZF Uik7CisgICAgZWxzZQorICAgICAgICBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAiY29u dGVudC1zbmlmZmVkIiwgR19DQUxMQkFDSyhjb250ZW50U25pZmZlZENhbGxiYWNrKSwgaGFuZGxl KTsKIAogICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc291cE1lc3NhZ2UsICJyZXN0YXJ0ZWQiLCBHX0NB TExCQUNLKHJlc3RhcnRlZENhbGxiYWNrKSwgaGFuZGxlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0 KHNvdXBNZXNzYWdlLCAiZ290LWhlYWRlcnMiLCBHX0NBTExCQUNLKGdvdEhlYWRlcnNDYWxsYmFj ayksIGhhbmRsZSk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVzc2FnZSwgImNvbnRlbnQt c25pZmZlZCIsIEdfQ0FMTEJBQ0soY29udGVudFNuaWZmZWRDYWxsYmFjayksIGhhbmRsZSk7CiAg ICAgZC0+bV9nb3RDaHVua0hhbmRsZXIgPSBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAi Z290LWNodW5rIiwgR19DQUxMQkFDSyhnb3RDaHVua0NhbGxiYWNrKSwgaGFuZGxlKTsKIAogI2lm ZGVmIEhBVkVfTElCU09VUF8yXzI5XzkwCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9jYWNoZS9zb3VwLXJlcXVlc3QtaHR0cC5jIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvY2FjaGUvc291cC1yZXF1ZXN0LWh0dHAuYwppbmRleCBmMTU3Y2ZjLi5mM2Zl MmVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9jYWNoZS9zb3Vw LXJlcXVlc3QtaHR0cC5jCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL2NhY2hl L3NvdXAtcmVxdWVzdC1odHRwLmMKQEAgLTE1MSw2ICsxNTEsMTMgQEAgY29uZGl0aW9uYWxfZ2V0 X3JlYWR5X2NiIChTb3VwU2Vzc2lvbiAqc2Vzc2lvbiwgU291cE1lc3NhZ2UgKm1zZywgZ3BvaW50 ZXIgdXNlcl8KIAkJCWdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9zZXRfb3BfcmVzX2dwb2ludGVyIChz aW1wbGUsIGh0dHBzdHJlYW0sIGdfb2JqZWN0X3VucmVmKTsKIAogCQkJc291cF9tZXNzYWdlX2dv dF9oZWFkZXJzIChoZWxwZXItPm9yaWdpbmFsKTsKKworCQkJLyogRklYTUU6IFVuY29tbWVudCB0 aGlzIHdoZW4gdGhpcyBiZWNvbWVzIHBhcnQgb2YgbGlic291cAorCQkJICogaWYgKCFzb3VwX21l c3NhZ2VfZGlzYWJsZXNfZmVhdHVyZShoZWxwZXItPm9yaWdpbmFsLCBTT1VQX1RZUEVfQ09OVEVO VF9TTklGRkVSKSkgeworCQkJICogCWNvbnN0IGdjaGFyICpjb250ZW50X3R5cGUgPSBzb3VwX21l c3NhZ2VfaGVhZGVyc19nZXRfY29udGVudF90eXBlIChtc2ctPnJlc3BvbnNlX2hlYWRlcnMsIE5V TEwpOworCQkJICogCXNvdXBfbWVzc2FnZV9jb250ZW50X3NuaWZmZWQgKGhlbHBlci0+b3JpZ2lu YWwsIGNvbnRlbnRfdHlwZSwgTlVMTCk7CisJCQkgKiB9CisJCQkgKi8KIAkJCWNvbnRlbnRfdHlw ZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9jb250ZW50X3R5cGUgKG1zZy0+cmVzcG9uc2Vf aGVhZGVycywgTlVMTCk7CiAJCQlzb3VwX21lc3NhZ2VfY29udGVudF9zbmlmZmVkIChoZWxwZXIt Pm9yaWdpbmFsLCBjb250ZW50X3R5cGUsIE5VTEwpOwogCkBAIC0yMTUsNiArMjIyLDEzIEBAIHNl bmRfYXN5bmNfY2IgKGdwb2ludGVyIGRhdGEpCiAKIAkJLyogSXNzdWUgc2lnbmFscyAgKi8KIAkJ c291cF9tZXNzYWdlX2dvdF9oZWFkZXJzIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZyk7CisKKwkJ LyogRklYTUU6IFVuY29tbWVudCB0aGlzIHdoZW4gdGhpcyBiZWNvbWVzIHBhcnQgb2YgbGlic291 cAorCQkgKiBpZiAoIXNvdXBfbWVzc2FnZV9kaXNhYmxlc19mZWF0dXJlKGhlbHBlci0+aHR0cC0+ cHJpdi0+bXNnLCBTT1VQX1RZUEVfQ09OVEVOVF9TTklGRkVSKSkgeworCQkgKgljb25zdCBnY2hh ciAqY29udGVudF90eXBlID0gc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0X2NvbnRlbnRfdHlwZSAo aGVscGVyLT5odHRwLT5wcml2LT5tc2ctPnJlc3BvbnNlX2hlYWRlcnMsIE5VTEwpOworCQkgKglz b3VwX21lc3NhZ2VfY29udGVudF9zbmlmZmVkIChoZWxwZXItPmh0dHAtPnByaXYtPm1zZywgY29u dGVudF90eXBlLCBOVUxMKTsKKwkJICogfQorCQkgKi8KIAkJY29udGVudF90eXBlID0gc291cF9t ZXNzYWdlX2hlYWRlcnNfZ2V0X2NvbnRlbnRfdHlwZSAoaGVscGVyLT5odHRwLT5wcml2LT5tc2ct PnJlc3BvbnNlX2hlYWRlcnMsIE5VTEwpOwogCQlzb3VwX21lc3NhZ2VfY29udGVudF9zbmlmZmVk IChoZWxwZXItPmh0dHAtPnByaXYtPm1zZywgY29udGVudF90eXBlLCBOVUxMKTsKIApAQCAtMjI1 LDYgKzIzOSw3IEBAIHNlbmRfYXN5bmNfY2IgKGdwb2ludGVyIGRhdGEpCiAJCWdfb2JqZWN0X3Vu cmVmIChzaW1wbGUpOwogCX0KIAorCWdfb2JqZWN0X3VucmVmIChoZWxwZXItPmh0dHApOwogCWdf c2xpY2VfZnJlZSAoU2VuZEFzeW5jSGVscGVyLCBoZWxwZXIpOwogCiAJcmV0dXJuIEZBTFNFOwpA QCAtMjU2LDcgKzI3MSw3IEBAIHdlYmtpdF9zb3VwX3JlcXVlc3RfaHR0cF9zZW5kX2FzeW5jIChX ZWJLaXRTb3VwUmVxdWVzdCAgICAgICAgICAqcmVxdWVzdCwKIAkJCSAgIHRoZSBzaWduYWxzIG11 c3QgYmUgYWxzbyBlbWl0dGVkCiAJCQkgICBhc3luY2hyb25vdXNseSAqLwogCQkJU2VuZEFzeW5j SGVscGVyICpoZWxwZXIgPSBnX3NsaWNlX25ldyAoU2VuZEFzeW5jSGVscGVyKTsKLQkJCWhlbHBl ci0+aHR0cCA9IGh0dHA7CisJCQloZWxwZXItPmh0dHAgPSBnX29iamVjdF9yZWYgKGh0dHApOwog CQkJaGVscGVyLT5jYWxsYmFjayA9IGNhbGxiYWNrOwogCQkJaGVscGVyLT51c2VyX2RhdGEgPSB1 c2VyX2RhdGE7CiAJCQlnX3RpbWVvdXRfYWRkICgwLCBzZW5kX2FzeW5jX2NiLCBoZWxwZXIpOwot LSAKMS43LjEKCg==