47690 2010-10-14 13:44:42 -0700 Assertion failure in NetscapePlugin::fromNPP when using Shockwave in WebKit2 2010-10-21 10:00:41 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) All All RESOLVED FIXED http://www.nga.gov/kids/zone/dollhouse.htm InRadar P2 Normal --- 1 aroben aroben abarth alex andersca eric jhoneycutt ossy webkit.review.bot oldest_to_newest 294333 0 aroben 2010-10-14 13:44:42 -0700 To reproduce: 1. Go to http://www.nga.gov/kids/zone/dollhouse.htm You'll hit an assertion in NetscapePlugin::fromNPP: NetscapePlugin* plugin = static_cast<NetscapePlugin*>(npp->ndata); ASSERT(npp == &plugin->m_npp); This assertion seems to be incorrect. WebCore doesn't have it, WebKit/mac doesn't have it, Firefox doesn't have it. Removing it allows the page to work just fine. 294334 1 aroben 2010-10-14 13:45:30 -0700 <rdar://problem/8553020> 294361 2 70777 aroben 2010-10-14 14:06:47 -0700 Created attachment 70777 Don't require the plugin to always use the same NPP struct we gave it in NPP_New 294362 3 webkit.review.bot 2010-10-14 14:09:01 -0700 Attachment 70777 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:26: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:28: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 294369 4 70777 sullivan 2010-10-14 14:27:16 -0700 Comment on attachment 70777 Don't require the plugin to always use the same NPP struct we gave it in NPP_New Maybe you can make the stylebot slightly happier by reordering #includes? 294377 5 aroben 2010-10-14 14:38:22 -0700 (In reply to comment #4) > (From update of attachment 70777 [details]) > Maybe you can make the stylebot slightly happier by reordering #includes? I think to make the style bot happy we will have to teach it about the non-standard #include style of these test files. Thanks for reviewing! 297125 6 aroben 2010-10-20 16:42:01 -0700 Committed r70190: <http://trac.webkit.org/changeset/70190> 297163 7 webkit.review.bot 2010-10-20 17:22:13 -0700 http://trac.webkit.org/changeset/70190 might have broken Qt Linux Release 297276 8 abarth 2010-10-21 01:02:45 -0700 This new test doesn't seem to pass: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r70205%20(19462)/plugins/pass-different-npp-struct-pretty-diff.html 297289 9 abarth 2010-10-21 01:43:49 -0700 I've added this test to the Skipped list for Mac in http://trac.webkit.org/changeset/70213. Can you look into why it's failing? 297293 10 alex 2010-10-21 01:52:13 -0700 (In reply to comment #9) > I've added this test to the Skipped list for Mac in http://trac.webkit.org/changeset/70213. Can you look into why it's failing? This test is also failing: http://build.webkit.org/results/GTK%20Linux%2064-bit%20Debug/r70211%20(14993)/plugins/pass-different-npp-struct-pretty-diff.html 297301 11 alex 2010-10-21 02:08:32 -0700 Skipped in GTK until Adam can review the issue: http://trac.webkit.org/changeset/70215 297371 12 ossy 2010-10-21 04:32:02 -0700 (In reply to comment #7) > http://trac.webkit.org/changeset/70190 might have broken Qt Linux Release Any progression with fixing? This patch broke the whole world, I don't think if it is a good idea to put this failing test to the skipped list on all platform. 297440 13 aroben 2010-10-21 08:44:24 -0700 (In reply to comment #10) > (In reply to comment #9) > > I've added this test to the Skipped list for Mac in http://trac.webkit.org/changeset/70213. Can you look into why it's failing? > > This test is also failing: > > http://build.webkit.org/results/GTK%20Linux%2064-bit%20Debug/r70211%20(14993)/plugins/pass-different-npp-struct-pretty-diff.html I think PassDifferentNPPStruct.cpp just needs to be added to the GTK build. Sorry about that. 297441 14 aroben 2010-10-21 08:44:37 -0700 (In reply to comment #8) > This new test doesn't seem to pass: > > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r70205%20(19462)/plugins/pass-different-npp-struct-pretty-diff.html I'm looking into it. 297446 15 aroben 2010-10-21 08:46:00 -0700 (In reply to comment #12) > (In reply to comment #7) > > http://trac.webkit.org/changeset/70190 might have broken Qt Linux Release > > Any progression with fixing? I added PassDifferentNPPStruct.cpp to TestNetscapePlugin.pro in <http://trac.webkit.org/changeset/70196>. I don't know why it's continuing to fail after that. Hopefully I can find a friendly Qt person to help me figure it out. Sorry for the trouble! 297479 16 aroben 2010-10-21 10:00:41 -0700 Fixed GTK and Qt in r70238 and r70242 with help from Andreas and Anders: http://trac.webkit.org/changeset/70238 http://trac.webkit.org/changeset/70242 Unskipped on SnowLeopard after running Software Update on the bots in r70243: http://trac.webkit.org/changeset/70243 70777 2010-10-14 14:06:47 -0700 2010-10-21 01:42:21 -0700 Don't require the plugin to always use the same NPP struct we gave it in NPP_New bug-47690-20101014170645.patch text/plain 12984 aroben ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDMzZmQzNTBiZWVlMzljODllODc5NmJhOTgxMjlmYTBjNGVjYTE4Li42Zjg4NWYw YWNiZWI5NDczYWFlZTZkMzUxOWU3MTI1N2FlYzBmMzNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTAtMTQgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCisgICAgICAgIFRl c3QgdGhhdCBwYXNzaW5nIGEgZGlmZmVyZW50IE5QUCBzdHJ1Y3QgYmFjayB0byB0aGUgYnJvd3Nl ciBkb2Vzbid0CisgICAgICAgIGNhdXNlIGFuIGFzc2VydGlvbiBmYWlsdXJlCisKKyAgICAgICAg VGVzdCBmb3IgPGh0dHA6Ly93ZWJraXQub3JnL2IvNDc2OTA+IDxyZGFyOi8vcHJvYmxlbS84NTUz MDIwPgorICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBpbiBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5Q UCB3aGVuIHVzaW5nIFNob2Nrd2F2ZSBpbgorICAgICAgICBXZWJLaXQyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbHVnaW5zL3Bhc3MtZGlmZmVy ZW50LW5wcC1zdHJ1Y3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbHVnaW5zL3Bh c3MtZGlmZmVyZW50LW5wcC1zdHJ1Y3QuaHRtbDogQWRkZWQuCisKIDIwMTAtMTAtMDEgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEhvbGdlciBGcmV5dGhlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsdWdpbnMvcGFzcy1k aWZmZXJlbnQtbnBwLXN0cnVjdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL3Bh c3MtZGlmZmVyZW50LW5wcC1zdHJ1Y3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2OTNhZWFk YTI5NDdkN2QxODJmMDE0MDczNjg1MTVlZDA0ZWFlMTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9wbHVnaW5zL3Bhc3MtZGlmZmVyZW50LW5wcC1zdHJ1Y3QtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMyBAQAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogTlBOX0dldFZh bHVlKE5QTlZwcml2YXRlTW9kZUJvb2wpIHdpdGggYSBkaWZmZXJlbnQgTlBQIHN0cnVjdCBzdWNj ZWVkZWQKKworVGhpcyB0ZXN0cyB0aGF0IG5vIGFzc2VydGlvbnMgZmlyZSB3aGVuIGEgcGx1Z2lu IHBhc3NlcyBhIGRpZmZlcmVudCBOUFAgc3RydWN0IHRvIG9uZSBvZiB0aGUgTlBOKiBmdW5jdGlv bnMgKHNwZWNpZmljYWxseSwgTlBOX0dldFZhbHVlKS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsdWdpbnMvcGFzcy1kaWZmZXJlbnQtbnBwLXN0cnVjdC5odG1sIGIvTGF5b3V0VGVzdHMvcGx1 Z2lucy9wYXNzLWRpZmZlcmVudC1ucHAtc3RydWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzg2OWJkMGVh Njc2ODA5NmJiZjNmMjNlYjRjMGUzYWMwMDFjYjk1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsdWdpbnMvcGFzcy1kaWZmZXJlbnQtbnBwLXN0cnVjdC5odG1sCkBAIC0wLDAgKzEs MTkgQEAKKzxodG1sPgorPGhlYWQ+Cis8Ym9keT4KKzxlbWJlZCBpZD0idGVzdFBsdWdpbiIgCisg ICAgICAgdHlwZT0iYXBwbGljYXRpb24veC13ZWJraXQtdGVzdC1uZXRzY2FwZSIKKyAgICAgICBz cmM9ImRhdGE6dGV4dC9wbGFpbiwiCisgICAgICAgdGVzdD0icGFzcy1kaWZmZXJlbnQtbnBwLXN0 cnVjdCI+Cis8L2VtYmVkPgorCis8ZGl2PgorICAgIFRoaXMgdGVzdHMgdGhhdCBubyBhc3NlcnRp b25zIGZpcmUgd2hlbiBhIHBsdWdpbiBwYXNzZXMgYSBkaWZmZXJlbnQgTlBQIHN0cnVjdCB0byBv bmUgb2YgdGhlIE5QTiogZnVuY3Rpb25zIChzcGVjaWZpY2FsbHksIE5QTl9HZXRWYWx1ZSkuCis8 L2Rpdj4KKzxzY3JpcHQ+CisgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KKwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCA1Yjg2MWM1NDE0ODRiZWE1NDkxOTg4OGYxMGU3M2Q1MGJhNTYyNWNlLi4wYzhj Yjc2M2E5ZTQ1YmZmMDg1YTg3ZmJhNmU1MzA1NGMxYjNmZWRkIDEwMDY0NAotLS0gYS9XZWJLaXQy L0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEw LTEwLTE0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAorICAgICAgICBEb24ndCBy ZXF1aXJlIHRoZSBwbHVnaW4gdG8gYWx3YXlzIHVzZSB0aGUgc2FtZSBOUFAgc3RydWN0IHdlIGdh dmUgaXQKKyAgICAgICAgaW4gTlBQX05ldworCisgICAgICAgIE5laXRoZXIgV2ViQ29yZSwgbm9y IFdlYktpdC9tYWMsIG5vciBGaXJlZm94IHJlcXVpcmVzIHRoaXMsIGFuZAorICAgICAgICBTaG9j a3dhdmUgKGF0IGxlYXN0KSBzZWVtcyB0byB1c2UgYSBkaWZmZXJlbnQgTlBQIHN0cnVjdCB0aGF0 IGNvbnRhaW5zCisgICAgICAgIHRoZSBzYW1lIG5kYXRhIG1lbWJlci4gU28gd2Ugc2hvdWxkbid0 IGVuZm9yY2UgaXQsIGVpdGhlci4KKworICAgICAgICBGaXhlcyA8aHR0cDovL3dlYmtpdC5vcmcv Yi80NzY5MD4gPHJkYXI6Ly9wcm9ibGVtLzg1NTMwMjA+IEFzc2VydGlvbgorICAgICAgICBmYWls dXJlIGluIE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQIHdoZW4gdXNpbmcgU2hvY2t3YXZlIGluIFdl YktpdDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKTogUmVtb3ZlZCB0aGUgYm9ndXMgYXNz ZXJ0aW9uLgorCisyMDEwLTEwLTE0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKwog ICAgICAgICBNYWtlIHN1cmUgV2ViS2l0MiBvbmx5IGxvYWRzIGVhY2ggcGx1Z2luIG9uY2UKIAog ICAgICAgICBGaXhlcyA8aHR0cDovL3dlYmtpdC5vcmcvYi80NzY3Nz4gPHJkYXI6Ly9wcm9ibGVt Lzg1NTIxNzg+IFdlYktpdDIgY2FuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggYzMyZTRhMDJiNWVhNzY4Zjll NWJkMWFmNmIxMjkwYjQ1OTFhYTQ5YS4uNWU4YjY0ZjZhNGU0ZjZkMmY0MWYyMDlmMjllZGE3OWJk NWMzMzYyOSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmNwcApAQCAtNzcsMTIgKzc3LDggQEAgTmV0c2NhcGVQbHVnaW46 On5OZXRzY2FwZVBsdWdpbigpCiAKIFBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IE5ldHNjYXBl UGx1Z2luOjpmcm9tTlBQKE5QUCBucHApCiB7Ci0gICAgaWYgKG5wcCkgewotICAgICAgICBOZXRz Y2FwZVBsdWdpbiogcGx1Z2luID0gc3RhdGljX2Nhc3Q8TmV0c2NhcGVQbHVnaW4qPihucHAtPm5k YXRhKTsKLSAgICAgICAgQVNTRVJUKG5wcCA9PSAmcGx1Z2luLT5tX25wcCk7Ci0gICAgICAgIAot ICAgICAgICByZXR1cm4gcGx1Z2luOwotICAgIH0KKyAgICBpZiAobnBwKQorICAgICAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8TmV0c2NhcGVQbHVnaW4qPihucHAtPm5kYXRhKTsKIAogICAgIC8vIEZJ WE1FOiBSZXR1cm4gdGhlIGN1cnJlbnQgTmV0c2NhcGVQbHVnaW4gaGVyZS4KICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktp dFRvb2xzL0NoYW5nZUxvZwppbmRleCBhYWEyYTQ3MTU1MjQ3NDgxZjc3NDE3ZjZjYjY1OTI0M2Rj ZmU3ZDU0Li43ZDEwMTlkZWZiOGFkODgzYzczNDExZmJhNGE5MzdjMWFlZDI0ZWE0IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjYgQEAKIDIwMTAtMTAtMTQgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29t PgogCisgICAgICAgIFRlc3QgdGhhdCBwYXNzaW5nIGEgZGlmZmVyZW50IE5QUCBzdHJ1Y3QgYmFj ayB0byB0aGUgYnJvd3NlciBkb2Vzbid0CisgICAgICAgIGNhdXNlIGFuIGFzc2VydGlvbiBmYWls dXJlCisKKyAgICAgICAgVGVzdCBmb3IgPGh0dHA6Ly93ZWJraXQub3JnL2IvNDc2OTA+IDxyZGFy Oi8vcHJvYmxlbS84NTUzMDIwPgorICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBpbiBOZXRzY2Fw ZVBsdWdpbjo6ZnJvbU5QUCB3aGVuIHVzaW5nIFNob2Nrd2F2ZSBpbgorICAgICAgICBXZWJLaXQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvUGFzc0RpZmZlcmVudE5QUFN0cnVj dC5jcHA6IENvcGllZCBmcm9tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2Fw ZVBsdWdJbi9UZXN0cy93aW4vR2V0VmFsdWVOZXRzY2FwZVdpbmRvdy5jcHAuCisgICAgICAgIChQ YXNzRGlmZmVyZW50TlBQU3RydWN0OjpQYXNzRGlmZmVyZW50TlBQU3RydWN0KTogSW5pdGlhbGl6 ZSBvdXIKKyAgICAgICAgbWVtYmVycy4KKyAgICAgICAgKFBhc3NEaWZmZXJlbnROUFBTdHJ1Y3Q6 Ok5QUF9TZXRXaW5kb3cpOiBQYXNzIGEgZGlmZmVyZW50IE5QUCB0byB0aGUKKyAgICAgICAgYnJv d3NlciB0aGFuIHRoZSBvbmUgaXQgZ2F2ZSB1cyBpbiBOUFBfTmV3IGFuZCBzZWUgaWYgaXQgd29y a3MuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBs dWdJbi93aW4vVGVzdE5ldHNjYXBlUGx1Z2luLnZjcHJvajoKKyAgICAgICAgQWRkZWQgUGFzc0Rp ZmZlcmVudE5QUFN0cnVjdC4KKworMjAxMC0xMC0xNCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBs ZS5jb20+CisKICAgICAgICAgVGVzdCB0aGF0IHByZXNzaW5nIHRoZSBBbHQga2V5IGdlbmVyYXRl cyBhIFdNX1NZU0NPTU1BTkQgbWVzc2FnZQogCiAgICAgICAgIFRlc3QgZm9yIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzQ3NjcxPiA8cmRhcjovL3Byb2JsZW0vODQzNTU5ND4gUHJlc3NpbmcKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2ogYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVy VHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGFjZGFjM2Q0NmNhMjFkM2Y3Mjk3 YjI3YzFhOGU3MTk4Yjc3ZDUzNTAuLjUxZDhlN2Y2ZDllNWU5YTE1ZWQwZjFkZGIxNDA4NjQ1Yzc0 YWJlNDIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJU cmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTMwLDYg KzEzMCw3IEBACiAJCUJDRDA4QjNBMEUxMDU3RUYwMEE3RDBDMSAvKiBBY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBCQ0QwOEIzOTBFMTA1N0VGMDBBN0QwQzEgLyogQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuY3Bw ICovOyB9OwogCQlCQ0QwOEI3MTBFMTA1OUQyMDBBN0QwQzEgLyogQWNjZXNzaWJpbGl0eUNvbnRy b2xsZXJNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBCQ0QwOEI3MDBFMTA1OUQyMDBBN0QwQzEgLyogQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJNYWMu bW0gKi87IH07CiAJCUJDRjZDNjUwMEM5OEU5QzAwMEFDMDYzRSAvKiBHQ0NvbnRyb2xsZXIuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNGNkM2NEYw Qzk4RTlDMDAwQUMwNjNFIC8qIEdDQ29udHJvbGxlci5jcHAgKi87IH07CisJCUMwNkY5QUJDMTI2 N0E3MDYwMDU4RTFGNiAvKiBQYXNzRGlmZmVyZW50TlBQU3RydWN0LmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwNkY5QUJCMTI2N0E3MDYwMDU4RTFG NiAvKiBQYXNzRGlmZmVyZW50TlBQU3RydWN0LmNwcCAqLzsgfTsKIAkJRTFCNzgxNjUxMUFGMzFC NzAwN0UxQkMyIC8qIE1vY2tHZW9sb2NhdGlvblByb3ZpZGVyLm1tIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTFCNzgwODcxMUFGMTY2OTAwN0UxQkMyIC8q IE1vY2tHZW9sb2NhdGlvblByb3ZpZGVyLm1tICovOyB9OwogCQlFMUI3ODE2NzExQUYzMUMzMDA3 RTFCQzIgLyogTW9ja0dlb2xvY2F0aW9uUHJvdmlkZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxQjc4MDg1MTFBRjE2NDMwMDdFMUJDMiAvKiBNb2Nr R2VvbG9jYXRpb25Qcm92aWRlci5oICovOyB9OwogLyogRW5kIFBCWEJ1aWxkRmlsZSBzZWN0aW9u ICovCkBAIC0zMDIsNiArMzAzLDcgQEAKIAkJQkNEMDhCMzkwRTEwNTdFRjAwQTdEMEMxIC8qIEFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IEFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQkNEMDhCNzAwRTEwNTlEMjAwQTdEMEMxIC8qIEFjY2Vzc2liaWxpdHlDb250cm9s bGVyTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gQWNjZXNz aWJpbGl0eUNvbnRyb2xsZXJNYWMubW07IHBhdGggPSBtYWMvQWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXJNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDRjZDNjRGMEM5OEU5QzAw MEFDMDYzRSAvKiBHQ0NvbnRyb2xsZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGV4cGxpY2l0RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IGZpbGVFbmNvZGluZyA9 IDMwOyBwYXRoID0gR0NDb250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJQzA2RjlBQkIxMjY3QTcwNjAwNThFMUY2IC8qIFBhc3NEaWZmZXJlbnROUFBTdHJ1Y3QuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUGFzc0RpZmZlcmVudE5QUFN0 cnVjdC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUUxQjc4MDg1MTFBRjE2NDMw MDdFMUJDMiAvKiBNb2NrR2VvbG9jYXRpb25Qcm92aWRlci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IG5hbWUgPSBNb2NrR2VvbG9jYXRpb25Qcm92aWRlci5oOyBwYXRoID0gbWFjL01vY2tH ZW9sb2NhdGlvblByb3ZpZGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUUxQjc4 MDg3MTFBRjE2NjkwMDdFMUJDMiAvKiBNb2NrR2VvbG9jYXRpb25Qcm92aWRlci5tbSAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IE1vY2tHZW9sb2NhdGlvblByb3ZpZGVy Lm1tOyBwYXRoID0gbWFjL01vY2tHZW9sb2NhdGlvblByb3ZpZGVyLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogLyogRW5kIFBCWEZpbGVSZWZlcmVuY2Ugc2VjdGlvbiAqLwpAQCAtNDU3 LDYgKzQ1OSw3IEBACiAJCQkJMUEyMTVBNzUxMUYyNjA3MjAwOEFEMEY1IC8qIERvY3VtZW50T3Bl bkluRGVzdHJveVN0cmVhbS5jcHAgKi8sCiAJCQkJMUEyNEJBQTgxMjA3MzRFRTAwRkJCMDU5IC8q IE5QUnVudGltZU9iamVjdEZyb21EZXN0cm95ZWRQbHVnaW4uY3BwICovLAogCQkJCTFBQzc3RENF MTIwNjA1QjYwMDVDMTlFRiAvKiBOUFJ1bnRpbWVSZW1vdmVQcm9wZXJ0eS5jcHAgKi8sCisJCQkJ QzA2RjlBQkIxMjY3QTcwNjAwNThFMUY2IC8qIFBhc3NEaWZmZXJlbnROUFBTdHJ1Y3QuY3BwICov LAogCQkJCTFBRDlEMkZEMTIwMjg0MDkwMDFBNzBEMSAvKiBQbHVnaW5TY3JpcHRhYmxlTlBPYmpl Y3RJbnZva2VEZWZhdWx0LmNwcCAqLywKIAkJCSk7CiAJCQlwYXRoID0gVGVzdHM7CkBAIC03MzMs NiArNzM2LDcgQEAKIAkJCQkxQUQ5RDJGRTEyMDI4NDA5MDAxQTcwRDEgLyogUGx1Z2luU2NyaXB0 YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQUM3N0RD RjEyMDYwNUI2MDA1QzE5RUYgLyogTlBSdW50aW1lUmVtb3ZlUHJvcGVydHkuY3BwIGluIFNvdXJj ZXMgKi8sCiAJCQkJMUEyNEJBQTkxMjA3MzRFRTAwRkJCMDU5IC8qIE5QUnVudGltZU9iamVjdEZy b21EZXN0cm95ZWRQbHVnaW4uY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJQzA2RjlBQkMxMjY3QTcw NjAwNThFMUY2IC8qIFBhc3NEaWZmZXJlbnROUFBTdHJ1Y3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4v VGVzdHMvUGFzc0RpZmZlcmVudE5QUFN0cnVjdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvUGFzc0RpZmZlcmVudE5QUFN0cnVjdC5jcHAK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uZTQ2NDk5NjNiNDZmNjdjZDBkN2MxOTg5MzAyMGFlNDJiNWViYzMwOQotLS0g L2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBs dWdJbi9UZXN0cy9QYXNzRGlmZmVyZW50TlBQU3RydWN0LmNwcApAQCAtMCwwICsxLDcwIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgIlBsdWdpblRlc3QuaCIKKworI2luY2x1ZGUgIlBsdWdpbk9i amVjdC5oIgorCit1c2luZyBuYW1lc3BhY2Ugc3RkOworCisvLyBQYXNzaW5nIGEgZGlmZmVyZW50 IE5QUCBzdHJ1Y3QgdGhhdCBoYXMgdGhlIHNhbWUgbmRhdGEgdmFsdWUgYXMgdGhlIG9uZSBwYXNz ZWQgdG8gTlBQX05ldyBzaG91bGQKKy8vIG5vdCB0cmlnZ2VyIGFuIGFzc2VydGlvbiBmYWlsdXJl LgorCitjbGFzcyBQYXNzRGlmZmVyZW50TlBQU3RydWN0IDogcHVibGljIFBsdWdpblRlc3Qgewor cHVibGljOgorICAgIFBhc3NEaWZmZXJlbnROUFBTdHJ1Y3QoTlBQIG5wcCwgY29uc3Qgc3RyaW5n JiBpZGVudGlmaWVyKQorICAgICAgICA6IFBsdWdpblRlc3QobnBwLCBpZGVudGlmaWVyKQorICAg ICAgICAsIG1fZGlkUmVjZWl2ZUluaXRpYWxTZXRXaW5kb3dDYWxsKGZhbHNlKQorICAgIHsKKyAg ICB9CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCBOUEVycm9yIE5QUF9TZXRXaW5kb3coTlBQIGlu c3RhbmNlLCBOUFdpbmRvdyogd2luZG93KQorICAgIHsKKyAgICAgICAgaWYgKG1fZGlkUmVjZWl2 ZUluaXRpYWxTZXRXaW5kb3dDYWxsKQorICAgICAgICAgICAgcmV0dXJuIE5QRVJSX05PX0VSUk9S OworICAgICAgICBtX2RpZFJlY2VpdmVJbml0aWFsU2V0V2luZG93Q2FsbCA9IHRydWU7CisKKyAg ICAgICAgTlBQIG9sZE5QUCA9IG1fbnBwOworICAgICAgICBOUFBfdCBkaWZmZXJlbnROUFAgPSAq bV9ucHA7CisgICAgICAgIG1fbnBwID0gJmRpZmZlcmVudE5QUDsKKworICAgICAgICBOUEJvb2wg cHJpdmF0ZU1vZGU7CisgICAgICAgIE5QRXJyb3IgZXJyb3IgPSBOUE5fR2V0VmFsdWUoTlBOVnBy aXZhdGVNb2RlQm9vbCwgJnByaXZhdGVNb2RlKTsKKworICAgICAgICBtX25wcCA9IG9sZE5QUDsK KworICAgICAgICBpZiAoZXJyb3IgIT0gTlBFUlJfTk9fRVJST1IpIHsKKyAgICAgICAgICAgIHBs dWdpbkxvZyhpbnN0YW5jZSwgIk5QTl9HZXRWYWx1ZShOUE5WcHJpdmF0ZU1vZGVCb29sKSB3aXRo IGEgZGlmZmVyZW50IE5QUCBzdHJ1Y3QgZmFpbGVkIHdpdGggZXJyb3IgJWQiLCBlcnJvcik7Cisg ICAgICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICAgICAgfQorICAgICAg ICBwbHVnaW5Mb2coaW5zdGFuY2UsICJOUE5fR2V0VmFsdWUoTlBOVnByaXZhdGVNb2RlQm9vbCkg d2l0aCBhIGRpZmZlcmVudCBOUFAgc3RydWN0IHN1Y2NlZWRlZCIpOworICAgICAgICByZXR1cm4g TlBFUlJfTk9fRVJST1I7CisgICAgfQorCisgICAgYm9vbCBtX2RpZFJlY2VpdmVJbml0aWFsU2V0 V2luZG93Q2FsbDsKK307CisKK3N0YXRpYyBQbHVnaW5UZXN0OjpSZWdpc3RlcjxQYXNzRGlmZmVy ZW50TlBQU3RydWN0PiBnZXRWYWx1ZU5ldHNjYXBlV2luZG93KCJwYXNzLWRpZmZlcmVudC1ucHAt c3RydWN0Iik7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0 c2NhcGVQbHVnSW4vd2luL1Rlc3ROZXRzY2FwZVBsdWdpbi52Y3Byb2ogYi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vd2luL1Rlc3ROZXRzY2FwZVBsdWdpbi52 Y3Byb2oKaW5kZXggNTQ0NDM0NjM0MGVmMDBlMjhiNWRhOTk3MTIxZWMzMDA4ZjhlMjhmOS4uY2Rk NzcyOWZlNTgwNDMzOTI3Yzc2MTliYzVkNTQ5ZTJhYWZjODZiNCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL3dpbi9UZXN0TmV0c2NhcGVQ bHVnaW4udmNwcm9qCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2Fw ZVBsdWdJbi93aW4vVGVzdE5ldHNjYXBlUGx1Z2luLnZjcHJvagpAQCAtMzgzLDYgKzM4MywxMCBA QAogCQkJCT4NCiAJCQk8L0ZpbGU+DQogCQkJPEZpbGUNCisJCQkJUmVsYXRpdmVQYXRoPSIuLlxU ZXN0c1xQYXNzRGlmZmVyZW50TlBQU3RydWN0LmNwcCINCisJCQkJPg0KKwkJCTwvRmlsZT4NCisJ CQk8RmlsZQ0KIAkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFRlc3RzXFBsdWdpblNjcmlwdGFibGVOUE9i amVjdEludm9rZURlZmF1bHQuY3BwIg0KIAkJCQk+DQogCQkJPC9GaWxlPg0K