30239 2009-10-08 16:43:38 -0700 V8NPObject and c_instance don't throw an exception into javascript if an invoke call fails 2009-10-19 13:30:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 30528 1 japhet japhet commit-queue dglazkov eric ggaren oldest_to_newest 153566 0 japhet 2009-10-08 16:43:38 -0700 If an NPObject invoke() call returns false, something went wrong and an exception should be thrown in V8. Currently we fail silently. Error message should probably match Firefox ("Error calling method on NPObject!"). 154372 1 japhet 2009-10-13 10:34:10 -0700 This issue appears to affect JSC also, so I'm fixing it there too. 154457 2 41132 japhet 2009-10-13 15:08:14 -0700 Created attachment 41132 patch + layout test 154913 3 dglazkov 2009-10-15 15:00:17 -0700 V8 part looks good. 155580 4 41132 abarth 2009-10-18 23:15:55 -0700 Comment on attachment 41132 patch + layout test Thanks for the patch. 155696 5 41132 yong.li.webkit 2009-10-19 08:47:51 -0700 Comment on attachment 41132 patch + layout test Let commit bot land it 155809 6 41132 commit-queue 2009-10-19 11:50:36 -0700 Comment on attachment 41132 patch + layout test Clearing flags on attachment: 41132 Committed r49796: <http://trac.webkit.org/changeset/49796> 155810 7 commit-queue 2009-10-19 11:50:40 -0700 All reviewed patches have been landed. Closing bug. 155825 8 eric 2009-10-19 12:24:46 -0700 Test fails on Snow Leopard: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r49797%20(1179)/results.html We need to come up with a fix (or skip on SL) or roll this out. 155829 9 japhet 2009-10-19 12:27:24 -0700 (In reply to comment #8) > Test fails on Snow Leopard: > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r49797%20(1179)/results.html > > We need to come up with a fix (or skip on SL) or roll this out. I don't think I'm going to be able to fix this immediately (not least because I don't have SL), so I'm happy to either skip or roll out, whichever people prefer. 155848 10 japhet 2009-10-19 12:58:27 -0700 (In reply to comment #9) > (In reply to comment #8) > > Test fails on Snow Leopard: > > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r49797%20(1179)/results.html > > > > We need to come up with a fix (or skip on SL) or roll this out. > > I don't think I'm going to be able to fix this immediately (not least because I > don't have SL), so I'm happy to either skip or roll out, whichever people > prefer. Per conversation in #webkit, closing this bug. See SL-specific issue at https://bugs.webkit.org/show_bug.cgi?id=30528. 41132 2009-10-13 15:08:14 -0700 2009-10-19 11:50:36 -0700 patch + layout test patch.txt text/plain 9712 japhet SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTUwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMTAtMTMgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ ZiBhIGNhbGwgdG8gYSBwbHVnaW4ncyBpbnZva2VNZXRob2QsIGludm9rZURlZmF1bHQgb3IgY29u c3RydWN0CisgICAgICAgIHJldHVybnMgZmFsc2UsIHRocm93IGFuIGV4Y2VwdGlvbiBpbnRvIEpT LiAgICAgICAgCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMwMjM5CisKKyAgICAgICAgVGVzdDogcGx1Z2lucy9uZXRzY2FwZS1pbnZva2UtZmFpbHVy ZS5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNwcDogQ2hlY2sgcmV0 dXJuIHZhbHVlcyBvZiBpbnZva2VNZXRob2QsIGludm9rZURlZmF1bHQgYW5kIGNvbnN0cnVjdC4K KyAgICAgICAgKG5wT2JqZWN0SW52b2tlSW1wbCk6CisgICAgICAgICogYnJpZGdlL2MvY19pbnN0 YW5jZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpDSW5zdGFuY2U6Omludm9rZU1ldGhv ZCk6IENoZWNrIHJldHVybiB2YWx1ZQorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Q0luc3RhbmNl OjppbnZva2VEZWZhdWx0TWV0aG9kKTogQ2hlY2sgcmV0dXJuIHZhbHVlCisgICAgICAgIChKU0M6 OkJpbmRpbmdzOjpDSW5zdGFuY2U6Omludm9rZUNvbnN0cnVjdCk6IENoZWNrIHJldHVybiB2YWx1 ZQorCiAyMDA5LTEwLTEzICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4TlBPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9i amVjdC5jcHAJKHJldmlzaW9uIDQ5NTA3KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5QT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTMsMjYgKzkzLDMwIEBAIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RJbnYKICAgICBOUFZhcmlhbnQgcmVzdWx0OwogICAgIFZP SURfVE9fTlBWQVJJQU5UKHJlc3VsdCk7CiAKKyAgICBib29sIHJldHZhbCA9IHRydWU7CiAgICAg c3dpdGNoIChmdW5jdGlvbklkKSB7CiAgICAgY2FzZSBJbnZva2VNZXRob2Q6CiAgICAgICAgIGlm IChucE9iamVjdC0+X2NsYXNzLT5pbnZva2UpIHsKICAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6 OlN0cmluZz4gZnVuY3Rpb25OYW1lKHY4OjpTdHJpbmc6OkNhc3QoKmFyZ3MuRGF0YSgpKSk7CiAg ICAgICAgICAgICBOUElkZW50aWZpZXIgaWRlbnRpZmllciA9IGdldFN0cmluZ0lkZW50aWZpZXIo ZnVuY3Rpb25OYW1lKTsKLSAgICAgICAgICAgIG5wT2JqZWN0LT5fY2xhc3MtPmludm9rZShucE9i amVjdCwgaWRlbnRpZmllciwgbnBBcmdzLmdldCgpLCBudW1BcmdzLCAmcmVzdWx0KTsKKyAgICAg ICAgICAgIHJldHZhbCA9IG5wT2JqZWN0LT5fY2xhc3MtPmludm9rZShucE9iamVjdCwgaWRlbnRp ZmllciwgbnBBcmdzLmdldCgpLCBudW1BcmdzLCAmcmVzdWx0KTsKICAgICAgICAgfQogICAgICAg ICBicmVhazsKICAgICBjYXNlIEludm9rZUNvbnN0cnVjdDoKICAgICAgICAgaWYgKG5wT2JqZWN0 LT5fY2xhc3MtPmNvbnN0cnVjdCkKLSAgICAgICAgICAgIG5wT2JqZWN0LT5fY2xhc3MtPmNvbnN0 cnVjdChucE9iamVjdCwgbnBBcmdzLmdldCgpLCBudW1BcmdzLCAmcmVzdWx0KTsKKyAgICAgICAg ICAgIHJldHZhbCA9IG5wT2JqZWN0LT5fY2xhc3MtPmNvbnN0cnVjdChucE9iamVjdCwgbnBBcmdz LmdldCgpLCBudW1BcmdzLCAmcmVzdWx0KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbnZv a2VEZWZhdWx0OgogICAgICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+aW52b2tlRGVmYXVsdCkK LSAgICAgICAgICAgIG5wT2JqZWN0LT5fY2xhc3MtPmludm9rZURlZmF1bHQobnBPYmplY3QsIG5w QXJncy5nZXQoKSwgbnVtQXJncywgJnJlc3VsdCk7CisgICAgICAgICAgICByZXR2YWwgPSBucE9i amVjdC0+X2NsYXNzLT5pbnZva2VEZWZhdWx0KG5wT2JqZWN0LCBucEFyZ3MuZ2V0KCksIG51bUFy Z3MsICZyZXN1bHQpOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVh azsKICAgICB9CiAKKyAgICBpZiAoIXJldHZhbCkKKyAgICAgICAgdGhyb3dFcnJvcigiRXJyb3Ig Y2FsbGluZyBtZXRob2Qgb24gTlBPYmplY3QhIiwgVjhQcm94eTo6R2VuZXJhbEVycm9yKTsKKwog ICAgIGZvciAoaW50IGk9MDsgaSA8IG51bUFyZ3M7IGkrKykKICAgICAgICAgX05QTl9SZWxlYXNl VmFyaWFudFZhbHVlKCZucEFyZ3NbaV0pOwogCkluZGV4OiBXZWJDb3JlL2JyaWRnZS9jL2NfaW5z dGFuY2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2MvY19pbnN0YW5jZS5jcHAJ KHJldmlzaW9uIDQ5NTA3KQorKysgV2ViQ29yZS9icmlkZ2UvYy9jX2luc3RhbmNlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTIxLDE1ICsxMjEsMTkgQEAgSlNWYWx1ZSBDSW5zdGFuY2U6Omludm9r ZU1ldGhvZChFeGVjU3RhdAogICAgICAgICBjb252ZXJ0VmFsdWVUb05QVmFyaWFudChleGVjLCBh cmdzLmF0KGkpLCAmY0FyZ3NbaV0pOwogCiAgICAgLy8gSW52b2tlIHRoZSAnQycgbWV0aG9kLgor ICAgIGJvb2wgcmV0dmFsID0gdHJ1ZTsKICAgICBOUFZhcmlhbnQgcmVzdWx0VmFyaWFudDsKICAg ICBWT0lEX1RPX05QVkFSSUFOVChyZXN1bHRWYXJpYW50KTsKIAogICAgIHsKICAgICAgICAgSlNM b2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAg ICAgICAgIEFTU0VSVChnbG9iYWxFeGNlcHRpb25TdHJpbmcoKS5pc051bGwoKSk7Ci0gICAgICAg IF9vYmplY3QtPl9jbGFzcy0+aW52b2tlKF9vYmplY3QsIGlkZW50LCBjQXJncy5kYXRhKCksIGNv dW50LCAmcmVzdWx0VmFyaWFudCk7CisgICAgICAgIHJldHZhbCA9IF9vYmplY3QtPl9jbGFzcy0+ aW52b2tlKF9vYmplY3QsIGlkZW50LCBjQXJncy5kYXRhKCksIGNvdW50LCAmcmVzdWx0VmFyaWFu dCk7CiAgICAgICAgIG1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4ZWNTdGF0ZShleGVjKTsKICAgICB9 CisgICAgCisgICAgaWYgKCFyZXR2YWwpCisgICAgICAgIHRocm93RXJyb3IoZXhlYywgR2VuZXJh bEVycm9yLCAiRXJyb3IgY2FsbGluZyBtZXRob2Qgb24gTlBPYmplY3QhIik7CiAKICAgICBmb3Ig KGkgPSAwOyBpIDwgY291bnQ7IGkrKykKICAgICAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVl KCZjQXJnc1tpXSk7CkBAIC0xNTMsMTQgKzE1NywxOCBAQCBKU1ZhbHVlIENJbnN0YW5jZTo6aW52 b2tlRGVmYXVsdE1ldGhvZChFCiAgICAgICAgIGNvbnZlcnRWYWx1ZVRvTlBWYXJpYW50KGV4ZWMs IGFyZ3MuYXQoaSksICZjQXJnc1tpXSk7CiAKICAgICAvLyBJbnZva2UgdGhlICdDJyBtZXRob2Qu CisgICAgYm9vbCByZXR2YWwgPSB0cnVlOwogICAgIE5QVmFyaWFudCByZXN1bHRWYXJpYW50Owog ICAgIFZPSURfVE9fTlBWQVJJQU5UKHJlc3VsdFZhcmlhbnQpOwogICAgIHsKICAgICAgICAgSlNM b2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAg ICAgICAgIEFTU0VSVChnbG9iYWxFeGNlcHRpb25TdHJpbmcoKS5pc051bGwoKSk7Ci0gICAgICAg IF9vYmplY3QtPl9jbGFzcy0+aW52b2tlRGVmYXVsdChfb2JqZWN0LCBjQXJncy5kYXRhKCksIGNv dW50LCAmcmVzdWx0VmFyaWFudCk7CisgICAgICAgIHJldHZhbCA9IF9vYmplY3QtPl9jbGFzcy0+ aW52b2tlRGVmYXVsdChfb2JqZWN0LCBjQXJncy5kYXRhKCksIGNvdW50LCAmcmVzdWx0VmFyaWFu dCk7CiAgICAgICAgIG1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4ZWNTdGF0ZShleGVjKTsKICAgICB9 CisgICAgCisgICAgaWYgKCFyZXR2YWwpCisgICAgICAgIHRocm93RXJyb3IoZXhlYywgR2VuZXJh bEVycm9yLCAiRXJyb3IgY2FsbGluZyBtZXRob2Qgb24gTlBPYmplY3QhIik7CiAKICAgICBmb3Ig KGkgPSAwOyBpIDwgY291bnQ7IGkrKykKICAgICAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVl KCZjQXJnc1tpXSk7CkBAIC0xODgsMTQgKzE5NiwxOCBAQCBKU1ZhbHVlIENJbnN0YW5jZTo6aW52 b2tlQ29uc3RydWN0KEV4ZWNTCiAgICAgICAgIGNvbnZlcnRWYWx1ZVRvTlBWYXJpYW50KGV4ZWMs IGFyZ3MuYXQoaSksICZjQXJnc1tpXSk7CiAKICAgICAvLyBJbnZva2UgdGhlICdDJyBtZXRob2Qu CisgICAgYm9vbCByZXR2YWwgPSB0cnVlOwogICAgIE5QVmFyaWFudCByZXN1bHRWYXJpYW50Owog ICAgIFZPSURfVE9fTlBWQVJJQU5UKHJlc3VsdFZhcmlhbnQpOwogICAgIHsKICAgICAgICAgSlNM b2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAg ICAgICAgIEFTU0VSVChnbG9iYWxFeGNlcHRpb25TdHJpbmcoKS5pc051bGwoKSk7Ci0gICAgICAg IF9vYmplY3QtPl9jbGFzcy0+Y29uc3RydWN0KF9vYmplY3QsIGNBcmdzLmRhdGEoKSwgY291bnQs ICZyZXN1bHRWYXJpYW50KTsKKyAgICAgICAgcmV0dmFsID0gX29iamVjdC0+X2NsYXNzLT5jb25z dHJ1Y3QoX29iamVjdCwgY0FyZ3MuZGF0YSgpLCBjb3VudCwgJnJlc3VsdFZhcmlhbnQpOwogICAg ICAgICBtb3ZlR2xvYmFsRXhjZXB0aW9uVG9FeGVjU3RhdGUoZXhlYyk7CiAgICAgfQorICAgIAor ICAgIGlmICghcmV0dmFsKQorICAgICAgICB0aHJvd0Vycm9yKGV4ZWMsIEdlbmVyYWxFcnJvciwg IkVycm9yIGNhbGxpbmcgbWV0aG9kIG9uIE5QT2JqZWN0ISIpOwogCiAgICAgZm9yIChpID0gMDsg aSA8IGNvdW50OyBpKyspCiAgICAgICAgIF9OUE5fUmVsZWFzZVZhcmlhbnRWYWx1ZSgmY0FyZ3Nb aV0pOwpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNDk1MDcpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0xMC0xMyAgTmF0ZSBDaGFwaW4g IDxqYXBoZXRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCB0ZXN0RmFpbCgpIHRvIHRlc3QgcGx1Z2luIHNvIHdlIGNhbiB0 ZXN0IG91ciBoYW5kbGluZyBvZiBhCisgICAgICAgIHBsdWdpbiBpbnZva2UgY2FsbCByZXR1cm5p bmcgZmFsc2UuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMwMjM5CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4u c3VicHJvai9QbHVnaW5PYmplY3QuY3BwOiBBZGQgdGVzdEZhaWwoKS4KKyAgICAgICAgKHBsdWdp bkludm9rZSk6CisgICAgICAgICh0ZXN0SWRlbnRpZmllclRvU3RyaW5nKTogQWx3YXlzIHJldHVy biB0cnVlLCBzaW5jZSByZXR1cm5pbmcgZmFsc2Ugd2lsbCBub3cgY2F1c2UgYW4gZXhjZXB0aW9u IHRvIGJlIHRocm93bi4KKwogMjAwOS0xMC0xMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIGp1c3QgYWRkaW5nIHNlbGYgdG8gdGhl IGxpc3Qgb2YgcmV2aWV3ZXJzLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVz dE5ldHNjYXBlUGx1Z0luLnN1YnByb2ovUGx1Z2luT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9QbHVn aW5PYmplY3QuY3BwCShyZXZpc2lvbiA0OTUwNykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi5zdWJwcm9qL1BsdWdpbk9iamVjdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE0NCw2ICsxNDQsNyBAQCBlbnVtIHsKICAgICBJRF9URVNUX1BPU1RVUkxfRklM RSwKICAgICBJRF9URVNUX0NPTlNUUlVDVCwKICAgICBJRF9URVNUX1RIUk9XX0VYQ0VQVElPTl9N RVRIT0QsCisgICAgSURfVEVTVF9GQUlMX01FVEhPRCwKICAgICBJRF9ERVNUUk9ZX05VTExfU1RS RUFNLAogICAgIE5VTV9NRVRIT0RfSURFTlRJRklFUlMKIH07CkBAIC0xNjksNiArMTcwLDcgQEAg c3RhdGljIGNvbnN0IE5QVVRGOCAqcGx1Z2luTWV0aG9kSWRlbnRpZgogICAgICJ0ZXN0UG9zdFVS TEZpbGUiLAogICAgICJ0ZXN0Q29uc3RydWN0IiwKICAgICAidGVzdFRocm93RXhjZXB0aW9uIiwK KyAgICAidGVzdEZhaWwiLAogICAgICJkZXN0cm95TnVsbFN0cmVhbSIKIH07CiAKQEAgLTMwOSwx MyArMzExLDEzIEBAIHN0YXRpYyBOUElkZW50aWZpZXIgdmFyaWFudFRvSWRlbnRpZmllcigKIHN0 YXRpYyBib29sIHRlc3RJZGVudGlmaWVyVG9TdHJpbmcoUGx1Z2luT2JqZWN0KiwgY29uc3QgTlBW YXJpYW50KiBhcmdzLCB1aW50MzJfdCBhcmdDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCiB7CiAg ICAgaWYgKGFyZ0NvdW50ICE9IDEpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgTlBJZGVudGlmaWVyIGlkZW50aWZpZXIgPSB2YXJpYW50VG9JZGVudGlm aWVyKGFyZ3NbMF0pOwogICAgIGlmICghaWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBOUFVURjgqIHV0ZjhTdHJpbmcgPSBicm93c2Vy LT51dGY4ZnJvbWlkZW50aWZpZXIoaWRlbnRpZmllcik7CiAgICAgaWYgKCF1dGY4U3RyaW5nKQot ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIFNUUklOR1pf VE9fTlBWQVJJQU5UKHV0ZjhTdHJpbmcsICpyZXN1bHQpOwogICAgIHJldHVybiB0cnVlOwogfQpA QCAtNjY5LDYgKzY3MSwxMCBAQCBzdGF0aWMgYm9vbCBwbHVnaW5JbnZva2UoTlBPYmplY3QqIGhl YWRlCiAgICAgZWxzZSBpZiAobmFtZSA9PSBwbHVnaW5NZXRob2RJZGVudGlmaWVyc1tJRF9URVNU X1RIUk9XX0VYQ0VQVElPTl9NRVRIT0RdKSB7CiAgICAgICAgIGJyb3dzZXItPnNldGV4Y2VwdGlv bihoZWFkZXIsICJwbHVnaW4gb2JqZWN0IHRlc3RUaHJvd0V4Y2VwdGlvbiBTVUNDRVNTIik7CiAg ICAgICAgIHJldHVybiB0cnVlOworICAgIH0gZWxzZSBpZiAobmFtZSA9PSBwbHVnaW5NZXRob2RJ ZGVudGlmaWVyc1tJRF9URVNUX0ZBSUxfTUVUSE9EXSkgeworICAgICAgICBOUE9iamVjdCogd2lu ZG93U2NyaXB0T2JqZWN0OworICAgICAgICBicm93c2VyLT5nZXR2YWx1ZShwbHVnaW4tPm5wcCwg TlBOVldpbmRvd05QT2JqZWN0LCAmd2luZG93U2NyaXB0T2JqZWN0KTsKKyAgICAgICAgYnJvd3Nl ci0+aW52b2tlKHBsdWdpbi0+bnBwLCB3aW5kb3dTY3JpcHRPYmplY3QsIG5hbWUsIGFyZ3MsIGFy Z0NvdW50LCByZXN1bHQpOwogICAgIH0gZWxzZSBpZiAobmFtZSA9PSBwbHVnaW5NZXRob2RJZGVu dGlmaWVyc1tJRF9ERVNUUk9ZX05VTExfU1RSRUFNXSkgCiAgICAgICAgIHJldHVybiBkZXN0cm95 TnVsbFN0cmVhbShwbHVnaW4sIGFyZ3MsIGFyZ0NvdW50LCByZXN1bHQpOwogICAgIApJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gNDk1MDcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMC0xMyAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3QgdGhhdCB0aGUgcHJvcGVyIGV4Y2VwdGlvbiBpcyB0aHJvd24gaW50byBKUyB3aGVu IGEgcGx1Z2luCisgICAgICAgIGludm9rZSBjYWxsIHJldHVybnMgZmFsc2UuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMjM5CisKKyAgICAgICAg KiBwbHVnaW5zL25ldHNjYXBlLWludm9rZS1mYWlsdXJlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogcGx1Z2lucy9uZXRzY2FwZS1pbnZva2UtZmFpbHVyZS5odG1sOiBBZGRlZC4KKwog MjAwOS0xMC0xMyAgRG1pdHJ5IFRpdG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogTGF5b3V0VGVzdHMvcGx1Z2lucy9uZXRz Y2FwZS1pbnZva2UtZmFpbHVyZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvcGx1Z2lucy9uZXRzY2FwZS1pbnZva2UtZmFpbHVyZS1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9wbHVnaW5zL25ldHNjYXBlLWludm9rZS1mYWlsdXJlLWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyIEBACisKK1NVQ0NFU1M6IEV4Y2VwdGlv biBjYXVnaHQ6IEVycm9yOiBFcnJvciBjYWxsaW5nIG1ldGhvZCBvbiBOUE9iamVjdCEKSW5kZXg6 IExheW91dFRlc3RzL3BsdWdpbnMvbmV0c2NhcGUtaW52b2tlLWZhaWx1cmUuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL25ldHNjYXBlLWludm9rZS1mYWlsdXJlLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbHVnaW5zL25ldHNjYXBlLWludm9rZS1mYWls dXJlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTMgQEAKKzxodG1sPjxib2R5PgorPGVt YmVkIG5hbWU9InBsZyIgdHlwZT0iYXBwbGljYXRpb24veC13ZWJraXQtdGVzdC1uZXRzY2FwZSI+ PC9lbWJlZD4KKzxkaXYgaWQ9ImNvbnNvbGUiPkZBSUxVUkU6IE5vIGV4Y2VwdGlvbiBjYXVnaHQu PC9kaXY+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgIHRyeSB7Cisg ICAgICAgIHBsZy50ZXN0RmFpbCgpOworICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKS5pbm5lckhUTUwgPSAnU1VDQ0VTUzogRXhjZXB0 aW9uIGNhdWdodDogJyArIGU7CisgICAgfQorPC9zY3JpcHQ+PC9ib2R5PjwvaHRtbD4KXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==