88378 2012-06-05 17:12:51 -0700 Remove JSObject::m_inheritorID 2012-07-25 23:34:54 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92338 1 barraclough mhahnenberg barraclough fpizlo mhahnenberg mitz ossy zarvai oldest_to_newest 642024 0 barraclough 2012-06-05 17:12:51 -0700 This is rarely used, and not performance critical (the commonly accessed copy is cached on JSFunction), and most objects don't need an inheritorID (this value is only used if the object is used as a prototype). Instead use a private named value in the object's property storage. 642032 1 145900 barraclough 2012-06-05 17:16:36 -0700 Created attachment 145900 Fix 642034 2 145900 ggaren 2012-06-05 17:19:28 -0700 Comment on attachment 145900 Fix r=me 642172 3 barraclough 2012-06-05 22:08:55 -0700 Fixed in r119556 642253 4 mitz 2012-06-06 00:33:31 -0700 (In reply to comment #3) > Fixed in r119556 This broke the 32-bit build, as far as I can tell because it made the m_inlineStorage data member in JSNonFinalObject not 4-byte aligned, causing the assertion in finishCreation() to fail. 642254 5 mitz 2012-06-06 00:37:33 -0700 I didn’t know how to fix the build, so I reverted this change in <http://trac.webkit.org/r119568>. 642255 6 145900 mitz 2012-06-06 00:38:09 -0700 Comment on attachment 145900 Fix Changing to r- because it breaks the 32-bit build. 644299 7 barraclough 2012-06-07 21:29:58 -0700 Re-landed in r119795 644459 8 zarvai 2012-06-08 01:22:44 -0700 (In reply to comment #7) > Re-landed in r119795 Layout test fails on Qt, GTK, EFL and Lion after r119795: jquery/core.html 644484 9 barraclough 2012-06-08 01:55:23 -0700 Ugh. I'll revert in the morning if no-one else has done so, & debug. cheers for reporting this. 645035 10 barraclough 2012-06-08 14:31:41 -0700 Rolled back out in 119865. :'-( 678646 11 154496 mhahnenberg 2012-07-25 17:05:24 -0700 Created attachment 154496 Patch 678652 12 mhahnenberg 2012-07-25 17:13:23 -0700 Committed r123682: <http://trac.webkit.org/changeset/123682> 678906 13 ossy 2012-07-25 23:26:49 -0700 (In reply to comment #12) > Committed r123682: <http://trac.webkit.org/changeset/123682> It made many tests crash on 32 bit platforms. Could you check it, please? new bug report for this regression - https://bugs.webkit.org/show_bug.cgi?id=92338 678914 14 ossy 2012-07-25 23:34:54 -0700 Fixed by http://trac.webkit.org/changeset/123708. Thanks. 145900 2012-06-05 17:16:36 -0700 2012-07-25 17:05:22 -0700 Fix 88378.patch text/plain 9753 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE5NTM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDEyLTA2LTA1ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBSZW1vdmUgSlNPYmplY3Q6Om1faW5oZXJpdG9ySUQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4Mzc4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyByYXJlbHkgdXNlZCwgYW5k IG5vdCBwZXJmb3JtYW5jZSBjcml0aWNhbCAodGhlIGNvbW1vbmx5IGFjY2Vzc2VkIGNvcHkgaXMg Y2FjaGVkIG9uIEpTRnVuY3Rpb24pLAorICAgICAgICBhbmQgbW9zdCBvYmplY3RzIGRvbid0IG5l ZWQgYW4gaW5oZXJpdG9ySUQgKHRoaXMgdmFsdWUgaXMgb25seSB1c2VkIGlmIHRoZSBvYmplY3Qg aXMgdXNlZCBhcyBhIHByb3RvdHlwZSkuCisgICAgICAgIEluc3RlYWQgdXNlIGEgcHJpdmF0ZSBu YW1lZCB2YWx1ZSBpbiB0aGUgb2JqZWN0J3MgcHJvcGVydHkgc3RvcmFnZS4KKworICAgICAgICAq IGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZl SklUOjplbWl0QWxsb2NhdGVCYXNpY0pTT2JqZWN0KToKKyAgICAgICAgICAgIC0gTm8gbmVlZCBt X2luaGVyaXRvcklEIHRvIGluaXRpYWxpemUhCisgICAgICAgICogaml0L0pJVElubGluZU1ldGhv ZHMuaDoKKyAgICAgICAgKEpTQzo6SklUOjplbWl0QWxsb2NhdGVCYXNpY0pTT2JqZWN0KToKKyAg ICAgICAgICAgIC0gTm8gbmVlZCBtX2luaGVyaXRvcklEIHRvIGluaXRpYWxpemUhCisgICAgICAg ICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc206CisgICAgICAgICAgICAtIE5vIG5lZWQg bV9pbmhlcml0b3JJRCB0byBpbml0aWFsaXplIQorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxE YXRhLmg6CisgICAgICAgIChKU0dsb2JhbERhdGEpOgorICAgICAgICAgICAgLSBBZGRlZCBwcml2 YXRlIG5hbWUgJ21faW5oZXJpdG9ySURLZXknLgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxU aGlzLmNwcDoKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxUaGlzOjpzZXRVbndyYXBwZWRPYmplY3Qp OgorICAgICAgICAgICAgLSByZXNldEluaGVyaXRvcklEIGlzIG5vdyBwYXNzZWQgYSBKU0dsb2Jh bERhdGEmLgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpK U09iamVjdDo6dmlzaXRDaGlsZHJlbik6CisgICAgICAgICAgICAtIE5vIG1faW5oZXJpdG9ySUQg dG8gYmUgbWFya2VkLgorICAgICAgICAoSlNDOjpKU09iamVjdDo6Y3JlYXRlSW5oZXJpdG9ySUQp OgorICAgICAgICAgICAgLSBTdG9yZSB0aGUgbmV3bHkgY3JlYXRlZCBpbmhlcml0b3JJRCBpbiB0 aGUgcHJvcGVydHkgbWFwLgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuaDoKKyAgICAgICAg KEpTQzo6SlNPYmplY3Q6OnJlc2V0SW5oZXJpdG9ySUQpOgorICAgICAgICAgICAgLSBSZW1vdmUg dGhlIGluaGVyaXRvcklEIGZyb20gcHJvcGVydHkgc3RvcmFnZS4KKyAgICAgICAgKEpTQzo6SlNP YmplY3Q6OmluaGVyaXRvcklEKToKKyAgICAgICAgICAgIC0gUmVhZCB0aGUgaW5oZXJpdG9ySUQg ZnJvbSBwcm9wZXJ0eSBzdG9yYWdlLgorCiAyMDEyLTA2LTA1ICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CiAKICAgICAgICAgREZHIENGRyBzaW1wbGlmaWNhdGlvbiBzaG91bGQgbm90 IGF0dGVtcHQgdG8gZGVyZWYgbm9kZXMgaW5zaWRlIG9mIGFuIHVucmVhY2hhYmxlIHN1YmdyYXBo CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5o CShyZXZpc2lvbiAxMTk0NDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMjEsOSArMjEyMSw2IEBAIHB1YmxpYzoK ICAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgb2JqZWN0J3MgY2xhc3NJbmZvIHBvaW50ZXIKICAg ICAgICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJkNsYXNz VHlwZTo6c19pbmZvKSwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBKU0NlbGw6 OmNsYXNzSW5mb09mZnNldCgpKSk7CiAgICAgICAgIAotICAgICAgICAvLyBJbml0aWFsaXplIHRo ZSBvYmplY3QncyBpbmhlcml0b3JJRC4KLSAgICAgICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3Nl bWJsZXI6OlRydXN0ZWRJbW1QdHIoMCksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3VsdEdQ UiwgSlNPYmplY3Q6Om9mZnNldE9mSW5oZXJpdG9ySUQoKSkpOwotICAgICAgICAKICAgICAgICAg Ly8gSW5pdGlhbGl6ZSB0aGUgb2JqZWN0J3MgcHJvcGVydHkgc3RvcmFnZSBwb2ludGVyLgogICAg ICAgICBtX2ppdC5hZGRQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihzaXplb2YoSlNP YmplY3QpKSwgcmVzdWx0R1BSLCBzY3JhdGNoR1BSKTsKICAgICAgICAgbV9qaXQuc3RvcmVQdHIo c2NyYXRjaEdQUiwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBDbGFzc1R5cGU6 Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUSW5saW5lTWV0aG9kcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUSW5saW5lTWV0aG9kcy5oCShyZXZpc2lvbiAxMTk0NDApCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZU1ldGhvZHMuaAkod29ya2luZyBjb3B5KQpAQCAt NDI1LDkgKzQyNSw2IEBAIHRlbXBsYXRlIDx0eXBlbmFtZSBDbGFzc1R5cGUsIGJvb2wgZGVzdHIK ICAgICAvLyBpbml0aWFsaXplIHRoZSBvYmplY3QncyBjbGFzc0luZm8gcG9pbnRlcgogICAgIHN0 b3JlUHRyKFRydXN0ZWRJbW1QdHIoJkNsYXNzVHlwZTo6c19pbmZvKSwgQWRkcmVzcyhyZXN1bHQs IEpTQ2VsbDo6Y2xhc3NJbmZvT2Zmc2V0KCkpKTsKIAotICAgIC8vIGluaXRpYWxpemUgdGhlIGlu aGVyaXRvciBJRAotICAgIHN0b3JlUHRyKFRydXN0ZWRJbW1QdHIoMCksIEFkZHJlc3MocmVzdWx0 LCBKU09iamVjdDo6b2Zmc2V0T2ZJbmhlcml0b3JJRCgpKSk7Ci0KICAgICAvLyBpbml0aWFsaXpl IHRoZSBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlIHBvaW50ZXIKICAgICBhZGRQdHIoVHJ1c3Rl ZEltbTMyKHNpemVvZihKU09iamVjdCkpLCByZXN1bHQsIHN0b3JhZ2VQdHIpOwogICAgIHN0b3Jl UHRyKHN0b3JhZ2VQdHIsIEFkZHJlc3MocmVzdWx0LCBDbGFzc1R5cGU6Om9mZnNldE9mUHJvcGVy dHlTdG9yYWdlKCkpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZl bEludGVycHJldGVyLmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20JKHJldmlzaW9uIDExOTQ0MSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQkod29ya2luZyBjb3B5 KQpAQCAtMzExLDcgKzMxMSw2IEBAIG1hY3JvIGFsbG9jYXRlQmFzaWNKU09iamVjdChzaXplQ2xh c3NJbmQKICAgICAgICAgbG9hZHAgY2xhc3NJbmZvT2Zmc2V0W3NjcmF0Y2gxXSwgc2NyYXRjaDIK ICAgICAgICAgc3RvcmVwIHNjcmF0Y2gyLCBbcmVzdWx0XQogICAgICAgICBzdG9yZXAgc3RydWN0 dXJlLCBKU0NlbGw6Om1fc3RydWN0dXJlW3Jlc3VsdF0KLSAgICAgICAgc3RvcmVwIDAsIEpTT2Jq ZWN0OjptX2luaGVyaXRvcklEW3Jlc3VsdF0KICAgICAgICAgYWRkcCBzaXplb2YgSlNPYmplY3Qs IHJlc3VsdCwgc2NyYXRjaDEKICAgICAgICAgc3RvcmVwIHNjcmF0Y2gxLCBKU09iamVjdDo6bV9w cm9wZXJ0eVN0b3JhZ2VbcmVzdWx0XQogICAgIGVuZApJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmgJKHJldmlzaW9uIDExOTQ0MSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBA IC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiSlNWYWx1ZS5oIgogI2luY2x1ZGUgIkxMSW50RGF0 YS5oIgogI2luY2x1ZGUgIk51bWVyaWNTdHJpbmdzLmgiCisjaW5jbHVkZSAiUHJpdmF0ZU5hbWUu aCIKICNpbmNsdWRlICJTbWFsbFN0cmluZ3MuaCIKICNpbmNsdWRlICJTdHJvbmcuaCIKICNpbmNs dWRlICJUZXJtaW5hdG9yLmgiCkBAIC0yODEsNiArMjgyLDggQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIGJvb2wgY2FuVXNlUmVnRXhwSklUKCkgeyByZXR1cm4gbV9jYW5Vc2VBc3NlbWJsZXI7 IH0KICNlbmRpZgogCisgICAgICAgIFByaXZhdGVOYW1lIG1faW5oZXJpdG9ySURLZXk7CisKICAg ICAgICAgT3duUHRyPFBhcnNlckFyZW5hPiBwYXJzZXJBcmVuYTsKICAgICAgICAgT3duUHRyPEtl eXdvcmRzPiBrZXl3b3JkczsKICAgICAgICAgSW50ZXJwcmV0ZXIqIGludGVycHJldGVyOwpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxUaGlzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbFRoaXMuY3BwCShy ZXZpc2lvbiAxMTk0NDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2Jh bFRoaXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3IEBAIHZvaWQgSlNHbG9iYWxU aGlzOjpzZXRVbndyYXBwZWRPYmplY3QoSlMKICAgICBBU1NFUlRfQVJHKGdsb2JhbE9iamVjdCwg Z2xvYmFsT2JqZWN0KTsKICAgICBtX3Vud3JhcHBlZE9iamVjdC5zZXQoZ2xvYmFsRGF0YSwgdGhp cywgZ2xvYmFsT2JqZWN0KTsKICAgICBzZXRQcm90b3R5cGUoZ2xvYmFsRGF0YSwgZ2xvYmFsT2Jq ZWN0LT5wcm90b3R5cGUoKSk7Ci0gICAgcmVzZXRJbmhlcml0b3JJRCgpOworICAgIHJlc2V0SW5o ZXJpdG9ySUQoZ2xvYmFsRGF0YSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAkocmV2aXNpb24gMTE5NDQw KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC05OCw5ICs5OCw2IEBAIHZvaWQgSlNPYmplY3Q6OnZpc2l0Q2hpbGRyZW4oSlND ZWxsKiBjZWwKICAgICAgICAgdGhpc09iamVjdC0+bV9wcm9wZXJ0eVN0b3JhZ2Uuc2V0KHN0b3Jh Z2UsIFN0b3JhZ2VCYXJyaWVyOjpVbmNoZWNrZWQpOwogICAgIH0KIAotICAgIGlmICh0aGlzT2Jq ZWN0LT5tX2luaGVyaXRvcklEKQotICAgICAgICB2aXNpdG9yLmFwcGVuZCgmdGhpc09iamVjdC0+ bV9pbmhlcml0b3JJRCk7Ci0KICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgdmlzaXRvci5tX2lz Q2hlY2tpbmdGb3JEZWZhdWx0TWFya1Zpb2xhdGlvbiA9IHdhc0NoZWNraW5nRm9yRGVmYXVsdE1h cmtWaW9sYXRpb247CiAjZW5kaWYKQEAgLTUzNiwxNSArNTMzLDIxIEBAIE5FVkVSX0lOTElORSB2 b2lkIEpTT2JqZWN0OjpmaWxsR2V0dGVyUHIKIAogU3RydWN0dXJlKiBKU09iamVjdDo6Y3JlYXRl SW5oZXJpdG9ySUQoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhKQogeworICAgIEFTU0VSVCghZ2V0 RGlyZWN0TG9jYXRpb24oZ2xvYmFsRGF0YSwgZ2xvYmFsRGF0YS5tX2luaGVyaXRvcklES2V5KSk7 CisKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0OwogICAgIGlmIChpc0dsb2JhbFRo aXMoKSkKICAgICAgICAgZ2xvYmFsT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNHbG9iYWxUaGlzKj4o dGhpcyktPnVud3JhcHBlZE9iamVjdCgpOwogICAgIGVsc2UKICAgICAgICAgZ2xvYmFsT2JqZWN0 ID0gc3RydWN0dXJlKCktPmdsb2JhbE9iamVjdCgpOwogICAgIEFTU0VSVChnbG9iYWxPYmplY3Qp OwotICAgIG1faW5oZXJpdG9ySUQuc2V0KGdsb2JhbERhdGEsIHRoaXMsIGNyZWF0ZUVtcHR5T2Jq ZWN0U3RydWN0dXJlKGdsb2JhbERhdGEsIGdsb2JhbE9iamVjdCwgdGhpcykpOwotICAgIEFTU0VS VChtX2luaGVyaXRvcklELT5pc0VtcHR5KCkpOwotICAgIHJldHVybiBtX2luaGVyaXRvcklELmdl dCgpOworICAgIAorICAgIFN0cnVjdHVyZSogaW5oZXJpdG9ySUQgPSBjcmVhdGVFbXB0eU9iamVj dFN0cnVjdHVyZShnbG9iYWxEYXRhLCBnbG9iYWxPYmplY3QsIHRoaXMpOworICAgIEFTU0VSVChp bmhlcml0b3JJRC0+aXNFbXB0eSgpKTsKKworICAgIFB1dFByb3BlcnR5U2xvdCBzbG90OworICAg IHB1dERpcmVjdEludGVybmFsPFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eT4oZ2xvYmFsRGF0YSwg Z2xvYmFsRGF0YS5tX2luaGVyaXRvcklES2V5LCBpbmhlcml0b3JJRCwgMCwgc2xvdCwgMCk7Cisg ICAgcmV0dXJuIGluaGVyaXRvcklEOwogfQogCiBQcm9wZXJ0eVN0b3JhZ2UgSlNPYmplY3Q6Omdy b3dQcm9wZXJ0eVN0b3JhZ2UoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBzaXplX3Qgb2xkU2l6 ZSwgc2l6ZV90IG5ld1NpemUpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U09iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT T2JqZWN0LmgJKHJldmlzaW9uIDExOTQ0MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNiw3ICsyMzYsNiBAQCBuYW1lc3Bh Y2UgSlNDIHsKICAgICAgICAgCiAgICAgICAgIHN0YXRpYyBzaXplX3Qgb2Zmc2V0T2ZJbmxpbmVT dG9yYWdlKCk7CiAgICAgICAgIHN0YXRpYyBzaXplX3Qgb2Zmc2V0T2ZQcm9wZXJ0eVN0b3JhZ2Uo KTsKLSAgICAgICAgc3RhdGljIHNpemVfdCBvZmZzZXRPZkluaGVyaXRvcklEKCk7CiAKICAgICAg ICAgc3RhdGljIEpTX0VYUE9SVERBVEEgY29uc3QgQ2xhc3NJbmZvIHNfaW5mbzsKIApAQCAtMjY0 LDkgKzI2Myw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAvLyBUbyBjcmVhdGUgZGVyaXZl ZCB0eXBlcyB5b3UgbGlrZWx5IHdhbnQgSlNOb25GaW5hbE9iamVjdCwgYmVsb3cuCiAgICAgICAg IEpTT2JqZWN0KEpTR2xvYmFsRGF0YSYsIFN0cnVjdHVyZSosIFByb3BlcnR5U3RvcmFnZSBpbmxp bmVTdG9yYWdlKTsKICAgICAgICAgCi0gICAgICAgIHZvaWQgcmVzZXRJbmhlcml0b3JJRCgpCisg ICAgICAgIHZvaWQgcmVzZXRJbmhlcml0b3JJRChKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIG1faW5oZXJpdG9ySUQuY2xlYXIoKTsKKyAgICAgICAgICAg IHJlbW92ZURpcmVjdChnbG9iYWxEYXRhLCBnbG9iYWxEYXRhLm1faW5oZXJpdG9ySURLZXkpOwog ICAgICAgICB9CiAKICAgICBwcml2YXRlOgpAQCAtMzAzLDcgKzMwMiw2IEBAIG5hbWVzcGFjZSBK U0MgewogICAgICAgICBTdHJ1Y3R1cmUqIGNyZWF0ZUluaGVyaXRvcklEKEpTR2xvYmFsRGF0YSYp OwogCiAgICAgICAgIFN0b3JhZ2VCYXJyaWVyIG1fcHJvcGVydHlTdG9yYWdlOwotICAgICAgICBX cml0ZUJhcnJpZXI8U3RydWN0dXJlPiBtX2luaGVyaXRvcklEOwogICAgIH07CiAKIApAQCAtMzEx LDggKzMwOSw4IEBAIG5hbWVzcGFjZSBKU0MgewogI2RlZmluZSBKU05vbkZpbmFsT2JqZWN0X2lu bGluZVN0b3JhZ2VDYXBhY2l0eSA0CiAjZGVmaW5lIEpTRmluYWxPYmplY3RfaW5saW5lU3RvcmFn ZUNhcGFjaXR5IDYKICNlbHNlCi0jZGVmaW5lIEpTTm9uRmluYWxPYmplY3RfaW5saW5lU3RvcmFn ZUNhcGFjaXR5IDIKLSNkZWZpbmUgSlNGaW5hbE9iamVjdF9pbmxpbmVTdG9yYWdlQ2FwYWNpdHkg NAorI2RlZmluZSBKU05vbkZpbmFsT2JqZWN0X2lubGluZVN0b3JhZ2VDYXBhY2l0eSAzCisjZGVm aW5lIEpTRmluYWxPYmplY3RfaW5saW5lU3RvcmFnZUNhcGFjaXR5IDUKICNlbmRpZgogCiBDT01Q SUxFX0FTU0VSVCgoSlNGaW5hbE9iamVjdF9pbmxpbmVTdG9yYWdlQ2FwYWNpdHkgPj0gSlNOb25G aW5hbE9iamVjdF9pbmxpbmVTdG9yYWdlQ2FwYWNpdHkpLCBmaW5hbF9zdG9yYWdlX2lzX2F0X2xl YXN0X2FzX2xhcmdlX2FzX25vbl9maW5hbCk7CkBAIC00MTcsMTEgKzQxNSw2IEBAIGlubGluZSBz aXplX3QgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHkKICAgICByZXR1cm4gT0JKRUNUX09GRlNF VE9GKEpTT2JqZWN0LCBtX3Byb3BlcnR5U3RvcmFnZSk7CiB9CiAKLWlubGluZSBzaXplX3QgSlNP YmplY3Q6Om9mZnNldE9mSW5oZXJpdG9ySUQoKQotewotICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VU T0YoSlNPYmplY3QsIG1faW5oZXJpdG9ySUQpOwotfQotCiBpbmxpbmUgYm9vbCBKU09iamVjdDo6 aXNHbG9iYWxPYmplY3QoKSBjb25zdAogewogICAgIHJldHVybiBzdHJ1Y3R1cmUoKS0+dHlwZUlu Zm8oKS50eXBlKCkgPT0gR2xvYmFsT2JqZWN0VHlwZTsKQEAgLTUxNCw5ICs1MDcsMTAgQEAgaW5s aW5lIHZvaWQgSlNPYmplY3Q6OnNldFByb3RvdHlwZShKU0dsbwogCiBpbmxpbmUgU3RydWN0dXJl KiBKU09iamVjdDo6aW5oZXJpdG9ySUQoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhKQogewotICAg IGlmIChtX2luaGVyaXRvcklEKSB7Ci0gICAgICAgIEFTU0VSVChtX2luaGVyaXRvcklELT5pc0Vt cHR5KCkpOwotICAgICAgICByZXR1cm4gbV9pbmhlcml0b3JJRC5nZXQoKTsKKyAgICBpZiAoV3Jp dGVCYXJyaWVyQmFzZTxVbmtub3duPiogbG9jYXRpb24gPSBnZXREaXJlY3RMb2NhdGlvbihnbG9i YWxEYXRhLCBnbG9iYWxEYXRhLm1faW5oZXJpdG9ySURLZXkpKSB7CisgICAgICAgIFN0cnVjdHVy ZSogaW5oZXJpdG9ySUQgPSBqc0Nhc3Q8U3RydWN0dXJlKj4obG9jYXRpb24tPmdldCgpKTsKKyAg ICAgICAgQVNTRVJUKGluaGVyaXRvcklELT5pc0VtcHR5KCkpOworICAgICAgICByZXR1cm4gaW5o ZXJpdG9ySUQ7CiAgICAgfQogICAgIHJldHVybiBjcmVhdGVJbmhlcml0b3JJRChnbG9iYWxEYXRh KTsKIH0K 154496 2012-07-25 17:05:24 -0700 2012-07-25 17:10:43 -0700 Patch bug-88378-20120725170514.patch text/plain 9495 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTIzNjgwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDEyLTA3LTI1ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIEpTT2JqZWN0OjptX2luaGVyaXRvcklECisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODM3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgcmFyZWx5IHVzZWQsIGFuZCBu b3QgcGVyZm9ybWFuY2UgY3JpdGljYWwgKHRoZSBjb21tb25seSBhY2Nlc3NlZCBjb3B5IGlzIGNh Y2hlZCBvbiBKU0Z1bmN0aW9uKSwKKyAgICAgICAgYW5kIG1vc3Qgb2JqZWN0cyBkb24ndCBuZWVk IGFuIGluaGVyaXRvcklEICh0aGlzIHZhbHVlIGlzIG9ubHkgdXNlZCBpZiB0aGUgb2JqZWN0IGlz IHVzZWQgYXMgYSBwcm90b3R5cGUpLgorICAgICAgICBJbnN0ZWFkIHVzZSBhIHByaXZhdGUgbmFt ZWQgdmFsdWUgaW4gdGhlIG9iamVjdCdzIHByb3BlcnR5IHN0b3JhZ2UuCisKKyAgICAgICAgKiBk ZmcvREZHU3BlY3VsYXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6ZW1pdEFsbG9jYXRlQmFzaWNKU09iamVjdCk6IE5vIG5lZWQgbV9pbmhlcml0b3JJRCB0byBp bml0aWFsaXplIQorICAgICAgICAqIGppdC9KSVRJbmxpbmVNZXRob2RzLmg6CisgICAgICAgIChK U0M6OkpJVDo6ZW1pdEFsbG9jYXRlQmFzaWNKU09iamVjdCk6IE5vIG5lZWQgbV9pbmhlcml0b3JJ RCB0byBpbml0aWFsaXplIQorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNt OiBObyBuZWVkIG1faW5oZXJpdG9ySUQgdG8gaW5pdGlhbGl6ZSEKKyAgICAgICAgKiBydW50aW1l L0pTR2xvYmFsRGF0YS5oOgorICAgICAgICAoSlNHbG9iYWxEYXRhKTogQWRkZWQgcHJpdmF0ZSBu YW1lICdtX2luaGVyaXRvcklES2V5Jy4KKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFsVGhpcy5j cHA6CisgICAgICAgIChKU0M6OkpTR2xvYmFsVGhpczo6c2V0VW53cmFwcGVkT2JqZWN0KTogcmVz ZXRJbmhlcml0b3JJRCBpcyBub3cgcGFzc2VkIGEgSlNHbG9iYWxEYXRhJi4KKyAgICAgICAgKiBy dW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnZpc2l0Q2hpbGRy ZW4pOiBObyBtX2luaGVyaXRvcklEIHRvIGJlIG1hcmtlZC4KKyAgICAgICAgKEpTQzo6SlNGaW5h bE9iamVjdDo6dmlzaXRDaGlsZHJlbik6IE5vIG1faW5oZXJpdG9ySUQgdG8gYmUgbWFya2VkLgor ICAgICAgICAoSlNDOjpKU09iamVjdDo6Y3JlYXRlSW5oZXJpdG9ySUQpOiBTdG9yZSB0aGUgbmV3 bHkgY3JlYXRlZCBpbmhlcml0b3JJRCBpbiB0aGUgcHJvcGVydHkgbWFwLiBNYWtlIHN1cmUgCisg ICAgICAgIGl0J3MgZ290IHRoZSBEb250RW51bSBhdHRyaWJ1dGUhIQorICAgICAgICAqIHJ1bnRp bWUvSlNPYmplY3QuaDoKKyAgICAgICAgKEpTT2JqZWN0KToKKyAgICAgICAgKEpTQzo6SlNPYmpl Y3Q6OnJlc2V0SW5oZXJpdG9ySUQpOiBSZW1vdmUgdGhlIGluaGVyaXRvcklEIGZyb20gcHJvcGVy dHkgc3RvcmFnZS4KKyAgICAgICAgKEpTQyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0Ojppbmhl cml0b3JJRCk6IFJlYWQgdGhlIGluaGVyaXRvcklEIGZyb20gcHJvcGVydHkgc3RvcmFnZS4KKwog MjAxMi0wNy0yNSAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWly YUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIENyZWF0ZSBhIHNwZWNpYWxpemVkIHBhaXIgZm9y IHVzZSBpbiBIYXNoTWFwIGl0ZXJhdG9ycwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkocmV2aXNpb24gMTIzNjQyKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0y MTQ0LDkgKzIxNDQsNiBAQCBwdWJsaWM6CiAgICAgICAgIC8vIEluaXRpYWxpemUgdGhlIG9iamVj dCdzIGNsYXNzSW5mbyBwb2ludGVyCiAgICAgICAgIG1faml0LnN0b3JlUHRyKE1hY3JvQXNzZW1i bGVyOjpUcnVzdGVkSW1tUHRyKCZDbGFzc1R5cGU6OnNfaW5mbyksIE1hY3JvQXNzZW1ibGVyOjpB ZGRyZXNzKHJlc3VsdEdQUiwgSlNDZWxsOjpjbGFzc0luZm9PZmZzZXQoKSkpOwogICAgICAgICAK LSAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgb2JqZWN0J3MgaW5oZXJpdG9ySUQuCi0gICAgICAg IG1faml0LnN0b3JlUHRyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKDApLCBNYWNyb0Fz c2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIEpTT2JqZWN0OjpvZmZzZXRPZkluaGVyaXRvcklE KCkpKTsKLSAgICAgICAgCiAgICAgICAgIC8vIEluaXRpYWxpemUgdGhlIG9iamVjdCdzIHByb3Bl cnR5IHN0b3JhZ2UgcG9pbnRlci4KICAgICAgICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3NlbWJs ZXI6OlRydXN0ZWRJbW1QdHIoMCksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwg Q2xhc3NUeXBlOjpvZmZzZXRPZk91dE9mTGluZVN0b3JhZ2UoKSkpOwogICAgIH0KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUSW5saW5lTWV0aG9kcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUSW5saW5lTWV0aG9kcy5oCShyZXZpc2lvbiAx MjM2NDIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZU1ldGhvZHMuaAko d29ya2luZyBjb3B5KQpAQCAtNDI1LDkgKzQyNSw2IEBAIHRlbXBsYXRlIDx0eXBlbmFtZSBDbGFz c1R5cGUsIGJvb2wgZGVzdHIKICAgICAvLyBpbml0aWFsaXplIHRoZSBvYmplY3QncyBjbGFzc0lu Zm8gcG9pbnRlcgogICAgIHN0b3JlUHRyKFRydXN0ZWRJbW1QdHIoJkNsYXNzVHlwZTo6c19pbmZv KSwgQWRkcmVzcyhyZXN1bHQsIEpTQ2VsbDo6Y2xhc3NJbmZvT2Zmc2V0KCkpKTsKIAotICAgIC8v IGluaXRpYWxpemUgdGhlIGluaGVyaXRvciBJRAotICAgIHN0b3JlUHRyKFRydXN0ZWRJbW1QdHIo MCksIEFkZHJlc3MocmVzdWx0LCBKU09iamVjdDo6b2Zmc2V0T2ZJbmhlcml0b3JJRCgpKSk7Ci0K ICAgICAvLyBpbml0aWFsaXplIHRoZSBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlIHBvaW50ZXIK ICAgICBzdG9yZVB0cihUcnVzdGVkSW1tUHRyKDApLCBBZGRyZXNzKHJlc3VsdCwgQ2xhc3NUeXBl OjpvZmZzZXRPZk91dE9mTGluZVN0b3JhZ2UoKSkpOwogfQpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQkocmV2aXNpb24g MTIzNjQyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0 ZXIuYXNtCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNyArMzE4LDYgQEAgbWFjcm8gYWxsb2NhdGVC YXNpY0pTT2JqZWN0KHNpemVDbGFzc0luZAogICAgICAgICBsb2FkcCBjbGFzc0luZm9PZmZzZXRb c2NyYXRjaDFdLCBzY3JhdGNoMgogICAgICAgICBzdG9yZXAgc2NyYXRjaDIsIFtyZXN1bHRdCiAg ICAgICAgIHN0b3JlcCBzdHJ1Y3R1cmUsIEpTQ2VsbDo6bV9zdHJ1Y3R1cmVbcmVzdWx0XQotICAg ICAgICBzdG9yZXAgMCwgSlNPYmplY3Q6Om1faW5oZXJpdG9ySURbcmVzdWx0XQogICAgICAgICBz dG9yZXAgMCwgSlNPYmplY3Q6Om1fb3V0T2ZMaW5lU3RvcmFnZVtyZXN1bHRdCiAgICAgZW5kCiBl bmQKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5o CShyZXZpc2lvbiAxMjM2NDIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0ds b2JhbERhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUgIkpT VmFsdWUuaCIKICNpbmNsdWRlICJMTEludERhdGEuaCIKICNpbmNsdWRlICJOdW1lcmljU3RyaW5n cy5oIgorI2luY2x1ZGUgIlByaXZhdGVOYW1lLmgiCiAjaW5jbHVkZSAiU21hbGxTdHJpbmdzLmgi CiAjaW5jbHVkZSAiU3Ryb25nLmgiCiAjaW5jbHVkZSAiVGVybWluYXRvci5oIgpAQCAtMjkzLDYg KzI5NCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBib29sIGNhblVzZVJlZ0V4cEpJVCgp IHsgcmV0dXJuIG1fY2FuVXNlQXNzZW1ibGVyOyB9CiAjZW5kaWYKIAorICAgICAgICBQcml2YXRl TmFtZSBtX2luaGVyaXRvcklES2V5OworCiAgICAgICAgIE93blB0cjxQYXJzZXJBcmVuYT4gcGFy c2VyQXJlbmE7CiAgICAgICAgIE93blB0cjxLZXl3b3Jkcz4ga2V5d29yZHM7CiAgICAgICAgIElu dGVycHJldGVyKiBpbnRlcnByZXRlcjsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTR2xvYmFsVGhpcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNHbG9iYWxUaGlzLmNwcAkocmV2aXNpb24gMTIzNjQyKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxUaGlzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTMsNyArNTMsNyBAQCB2b2lkIEpTR2xvYmFsVGhpczo6c2V0VW53cmFwcGVkT2JqZWN0KEpTCiAg ICAgQVNTRVJUX0FSRyhnbG9iYWxPYmplY3QsIGdsb2JhbE9iamVjdCk7CiAgICAgbV91bndyYXBw ZWRPYmplY3Quc2V0KGdsb2JhbERhdGEsIHRoaXMsIGdsb2JhbE9iamVjdCk7CiAgICAgc2V0UHJv dG90eXBlKGdsb2JhbERhdGEsIGdsb2JhbE9iamVjdC0+cHJvdG90eXBlKCkpOwotICAgIHJlc2V0 SW5oZXJpdG9ySUQoKTsKKyAgICByZXNldEluaGVyaXRvcklEKGdsb2JhbERhdGEpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U09iamVjdC5jcHAJKHJldmlzaW9uIDEyMzY0MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA3LDkgKzEwNyw2IEBAIHZv aWQgSlNPYmplY3Q6OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWwKICAgICAgICAgdGhpc09iamVj dC0+bV9vdXRPZkxpbmVTdG9yYWdlLnNldChzdG9yYWdlLCBTdG9yYWdlQmFycmllcjo6VW5jaGVj a2VkKTsKICAgICB9CiAKLSAgICBpZiAodGhpc09iamVjdC0+bV9pbmhlcml0b3JJRCkKLSAgICAg ICAgdmlzaXRvci5hcHBlbmQoJnRoaXNPYmplY3QtPm1faW5oZXJpdG9ySUQpOwotCiAjaWYgIUFT U0VSVF9ESVNBQkxFRAogICAgIHZpc2l0b3IubV9pc0NoZWNraW5nRm9yRGVmYXVsdE1hcmtWaW9s YXRpb24gPSB3YXNDaGVja2luZ0ZvckRlZmF1bHRNYXJrVmlvbGF0aW9uOwogI2VuZGlmCkBAIC0x MzcsOSArMTM0LDYgQEAgdm9pZCBKU0ZpbmFsT2JqZWN0Ojp2aXNpdENoaWxkcmVuKEpTQ2VsbAog ICAgICAgICB0aGlzT2JqZWN0LT5tX291dE9mTGluZVN0b3JhZ2Uuc2V0KHN0b3JhZ2UsIFN0b3Jh Z2VCYXJyaWVyOjpVbmNoZWNrZWQpOwogICAgIH0KIAotICAgIGlmICh0aGlzT2JqZWN0LT5tX2lu aGVyaXRvcklEKQotICAgICAgICB2aXNpdG9yLmFwcGVuZCgmdGhpc09iamVjdC0+bV9pbmhlcml0 b3JJRCk7Ci0KICAgICBzaXplX3Qgc3RvcmFnZVNpemUgPSB0aGlzT2JqZWN0LT5zdHJ1Y3R1cmUo KS0+aW5saW5lU2l6ZUZvcktub3duRmluYWxPYmplY3QoKTsKICAgICB2aXNpdG9yLmFwcGVuZFZh bHVlcyh0aGlzT2JqZWN0LT5pbmxpbmVTdG9yYWdlKCksIHN0b3JhZ2VTaXplKTsKIApAQCAtNTgw LDE1ICs1NzQsMjEgQEAgTkVWRVJfSU5MSU5FIHZvaWQgSlNPYmplY3Q6OmZpbGxHZXR0ZXJQcgog CiBTdHJ1Y3R1cmUqIEpTT2JqZWN0OjpjcmVhdGVJbmhlcml0b3JJRChKU0dsb2JhbERhdGEmIGds b2JhbERhdGEpCiB7CisgICAgQVNTRVJUKCFnZXREaXJlY3RMb2NhdGlvbihnbG9iYWxEYXRhLCBn bG9iYWxEYXRhLm1faW5oZXJpdG9ySURLZXkpKTsKKwogICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3Q7CiAgICAgaWYgKGlzR2xvYmFsVGhpcygpKQogICAgICAgICBnbG9iYWxPYmplY3Qg PSBzdGF0aWNfY2FzdDxKU0dsb2JhbFRoaXMqPih0aGlzKS0+dW53cmFwcGVkT2JqZWN0KCk7CiAg ICAgZWxzZQogICAgICAgICBnbG9iYWxPYmplY3QgPSBzdHJ1Y3R1cmUoKS0+Z2xvYmFsT2JqZWN0 KCk7CiAgICAgQVNTRVJUKGdsb2JhbE9iamVjdCk7Ci0gICAgbV9pbmhlcml0b3JJRC5zZXQoZ2xv YmFsRGF0YSwgdGhpcywgY3JlYXRlRW1wdHlPYmplY3RTdHJ1Y3R1cmUoZ2xvYmFsRGF0YSwgZ2xv YmFsT2JqZWN0LCB0aGlzKSk7Ci0gICAgQVNTRVJUKG1faW5oZXJpdG9ySUQtPmlzRW1wdHkoKSk7 Ci0gICAgcmV0dXJuIG1faW5oZXJpdG9ySUQuZ2V0KCk7CisKKyAgICBTdHJ1Y3R1cmUqIGluaGVy aXRvcklEID0gY3JlYXRlRW1wdHlPYmplY3RTdHJ1Y3R1cmUoZ2xvYmFsRGF0YSwgZ2xvYmFsT2Jq ZWN0LCB0aGlzKTsKKyAgICBBU1NFUlQoaW5oZXJpdG9ySUQtPmlzRW1wdHkoKSk7CisKKyAgICBQ dXRQcm9wZXJ0eVNsb3Qgc2xvdDsKKyAgICBwdXREaXJlY3RJbnRlcm5hbDxQdXRNb2RlRGVmaW5l T3duUHJvcGVydHk+KGdsb2JhbERhdGEsIGdsb2JhbERhdGEubV9pbmhlcml0b3JJREtleSwgaW5o ZXJpdG9ySUQsIERvbnRFbnVtLCBzbG90LCAwKTsKKyAgICByZXR1cm4gaW5oZXJpdG9ySUQ7CiB9 CiAKIFByb3BlcnR5U3RvcmFnZSBKU09iamVjdDo6Z3Jvd091dE9mTGluZVN0b3JhZ2UoSlNHbG9i YWxEYXRhJiBnbG9iYWxEYXRhLCBzaXplX3Qgb2xkU2l6ZSwgc2l6ZV90IG5ld1NpemUpCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHJldmlzaW9uIDEyMzY0 MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTI5NSw3ICsyOTUsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgCiAgICAg ICAgIHN0YXRpYyBzaXplX3Qgb2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCk7CiAgICAgICAgIHN0YXRp YyBzaXplX3Qgb2Zmc2V0T2ZPdXRPZkxpbmVTdG9yYWdlKCk7Ci0gICAgICAgIHN0YXRpYyBzaXpl X3Qgb2Zmc2V0T2ZJbmhlcml0b3JJRCgpOwogCiAgICAgICAgIHN0YXRpYyBKU19FWFBPUlREQVRB IGNvbnN0IENsYXNzSW5mbyBzX2luZm87CiAKQEAgLTMyMiw5ICszMjEsOSBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgLy8gVG8gY3JlYXRlIGRlcml2ZWQgdHlwZXMgeW91IGxpa2VseSB3YW50 IEpTTm9uRmluYWxPYmplY3QsIGJlbG93LgogICAgICAgICBKU09iamVjdChKU0dsb2JhbERhdGEm LCBTdHJ1Y3R1cmUqKTsKICAgICAgICAgCi0gICAgICAgIHZvaWQgcmVzZXRJbmhlcml0b3JJRCgp CisgICAgICAgIHZvaWQgcmVzZXRJbmhlcml0b3JJRChKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEp CiAgICAgICAgIHsKLSAgICAgICAgICAgIG1faW5oZXJpdG9ySUQuY2xlYXIoKTsKKyAgICAgICAg ICAgIHJlbW92ZURpcmVjdChnbG9iYWxEYXRhLCBnbG9iYWxEYXRhLm1faW5oZXJpdG9ySURLZXkp OwogICAgICAgICB9CiAKICAgICBwcml2YXRlOgpAQCAtMzQ4LDcgKzM0Nyw2IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBTdHJ1Y3R1cmUqIGNyZWF0ZUluaGVyaXRvcklEKEpTR2xvYmFsRGF0 YSYpOwogCiAgICAgICAgIFN0b3JhZ2VCYXJyaWVyIG1fb3V0T2ZMaW5lU3RvcmFnZTsKLSAgICAg ICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9pbmhlcml0b3JJRDsKICAgICB9OwogCiAKQEAg LTQ2MSwxMSArNDU5LDYgQEAgaW5saW5lIHNpemVfdCBKU09iamVjdDo6b2Zmc2V0T2ZPdXRPZkxp bgogICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoSlNPYmplY3QsIG1fb3V0T2ZMaW5lU3RvcmFn ZSk7CiB9CiAKLWlubGluZSBzaXplX3QgSlNPYmplY3Q6Om9mZnNldE9mSW5oZXJpdG9ySUQoKQot ewotICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoSlNPYmplY3QsIG1faW5oZXJpdG9ySUQpOwot fQotCiBpbmxpbmUgYm9vbCBKU09iamVjdDo6aXNHbG9iYWxPYmplY3QoKSBjb25zdAogewogICAg IHJldHVybiBzdHJ1Y3R1cmUoKS0+dHlwZUluZm8oKS50eXBlKCkgPT0gR2xvYmFsT2JqZWN0VHlw ZTsKQEAgLTU2NCw5ICs1NTcsMTAgQEAgaW5saW5lIHZvaWQgSlNPYmplY3Q6OnNldFByb3RvdHlw ZShKU0dsbwogCiBpbmxpbmUgU3RydWN0dXJlKiBKU09iamVjdDo6aW5oZXJpdG9ySUQoSlNHbG9i YWxEYXRhJiBnbG9iYWxEYXRhKQogewotICAgIGlmIChtX2luaGVyaXRvcklEKSB7Ci0gICAgICAg IEFTU0VSVChtX2luaGVyaXRvcklELT5pc0VtcHR5KCkpOwotICAgICAgICByZXR1cm4gbV9pbmhl cml0b3JJRC5nZXQoKTsKKyAgICBpZiAoV3JpdGVCYXJyaWVyQmFzZTxVbmtub3duPiogbG9jYXRp b24gPSBnZXREaXJlY3RMb2NhdGlvbihnbG9iYWxEYXRhLCBnbG9iYWxEYXRhLm1faW5oZXJpdG9y SURLZXkpKSB7CisgICAgICAgIFN0cnVjdHVyZSogaW5oZXJpdG9ySUQgPSBqc0Nhc3Q8U3RydWN0 dXJlKj4obG9jYXRpb24tPmdldCgpKTsKKyAgICAgICAgQVNTRVJUKGluaGVyaXRvcklELT5pc0Vt cHR5KCkpOworICAgICAgICByZXR1cm4gaW5oZXJpdG9ySUQ7CiAgICAgfQogICAgIHJldHVybiBj cmVhdGVJbmhlcml0b3JJRChnbG9iYWxEYXRhKTsKIH0K