120472 2013-08-29 08:26:47 -0700 VM::throwException() crashes reproducibly in testapi with !ENABLE(JIT) 2013-08-29 17:34:19 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 chris_curtis webkit-unassigned commit-queue eric.carlson fpizlo ggaren glenn jer.noble spena oldest_to_newest 922471 0 chris_curtis 2013-08-29 08:26:47 -0700 When the JIT is disabled, interpreterThrowInCaller does not handle the exception throw correctly. 922478 1 209987 chris_curtis 2013-08-29 08:47:41 -0700 Created attachment 209987 patch 922479 2 209987 chris_curtis 2013-08-29 08:58:11 -0700 Comment on attachment 209987 patch a layout test result changed. Running additional check to confirm will upload new patch soon 922495 3 209991 chris_curtis 2013-08-29 09:23:40 -0700 Created attachment 209991 patch 2 added error was caught in layout test. 922510 4 ap 2013-08-29 09:53:37 -0700 Is this a mistake in the layout test that setCaptionDisplayMode is not present? 922516 5 209991 commit-queue 2013-08-29 10:02:30 -0700 Comment on attachment 209991 patch 2 Clearing flags on attachment: 209991 Committed r154817: <http://trac.webkit.org/changeset/154817> 922517 6 commit-queue 2013-08-29 10:02:32 -0700 All reviewed patches have been landed. Closing bug. 922551 7 chris_curtis 2013-08-29 10:52:16 -0700 (In reply to comment #4) > Is this a mistake in the layout test that setCaptionDisplayMode is not present? I thought so as well, but running the test through chrome and Firfox recieves the same error. 922561 8 eric.carlson 2013-08-29 11:13:11 -0700 (In reply to comment #7) > (In reply to comment #4) > > Is this a mistake in the layout test that setCaptionDisplayMode is not present? > > I thought so as well, but running the test through chrome and Firfox recieves the same error. It was a bug in the test which was fixed earlier this morning in http://trac.webkit.org/changeset/154815. 922758 9 chris_curtis 2013-08-29 17:24:06 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #4) > > > Is this a mistake in the layout test that setCaptionDisplayMode is not present? > > > > I thought so as well, but running the test through chrome and Firfox recieves the same error. > > It was a bug in the test which was fixed earlier this morning in http://trac.webkit.org/changeset/154815. yes, it looks like both patches were going in at the same time. Im not sure how to adjust for this if anything. If further action is required on my part let me know. Thanks 922763 10 eric.carlson 2013-08-29 17:34:19 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > (In reply to comment #4) > > > > Is this a mistake in the layout test that setCaptionDisplayMode is not present? > > > > > > I thought so as well, but running the test through chrome and Firfox recieves the same error. > > > > It was a bug in the test which was fixed earlier this morning in http://trac.webkit.org/changeset/154815. > > yes, it looks like both patches were going in at the same time. Im not sure how to adjust for this if anything. Next time you might ping someone that knows the area (me, jer.noble), or file a bug instead of just blindly checking in obviously failing results. > If further action is required on my part let me know. Thanks Dino fixed the results earlier this morning. 209987 2013-08-29 08:47:41 -0700 2013-08-29 09:23:40 -0700 patch fixPatch.diff text/plain 9246 chris_curtis SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0ODEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDEzLTA4LTI5ICBDaHJpcyBDdXJ0aXMgIDxjaHJpc19jdXJ0aXNAYXBwbGUuY29tPgorCisg ICAgICAgIFZNOjp0aHJvd0V4Y2VwdGlvbigpIGNyYXNoZXMgcmVwcm9kdWNpYmx5IGluIHRlc3Rh cGkgd2l0aCAhRU5BQkxFKEpJVCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMDQ3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICAKKyAgICAgICAgV2l0aCB0aGUgSklUIGRpc2FibGVkLCBpbnRlcnByZXRlclRo cm93SW5DYWxsZXIgd2FzIGF0dGVtcHRpbmcgdG8gdGhyb3cgYW4gZXJyb3IsIAorICAgICAgICBi dXQgdGhlIHRvcENhbGxGcmFtZSB3YXMgbm90IHNldCB5ZXQuIEJ5IHBhc3NpbmcgdGhlIGVycm9y IG9iamVjdCBpbnRvIGludGVycHJldGVyVGhyb3dJbkNhbGxlcgorICAgICAgICB0aHJvd0V4Y2Vw dGlvbiBjYW4gYmUgY2FsbGVkIHdoZW4gdG9wQ2FsbEZyYW1lIGlzIHNldC4KKyAgICAgICAgKiBs bGludC9MTEludFNsb3dQYXRocy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50OjpMTElOVF9TTE9X X1BBVEhfREVDTCk6CisgICAgICAgICogcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwOgorICAg ICAgICAoSlNDOjpTTE9XX1BBVEhfREVDTCk6CisgICAgICAgICogcnVudGltZS9Db21tb25TbG93 UGF0aHNFeGNlcHRpb25zLmNwcDoKKyAgICAgICAgKEpTQzo6Q29tbW9uU2xvd1BhdGhzOjppbnRl cnByZXRlclRocm93SW5DYWxsZXIpOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhz RXhjZXB0aW9ucy5oOgorCisgICAgICAgIFJlbmFtZWQgZ2VuZXJpY1Rocm93IC0+IGdlbmVyaWNV bndpbmQsIGJlY2F1c2UgdGhpcyBmdW5jdGlvbiBubyBsb25nZXIgaGFzIHRoZSBhYmlsaXR5Cisg ICAgICAgIHRvIHRocm93IGVycm9ycy4gSXQgdW53aW5kcyB0aGUgc3RhY2sgaW4gb3JkZXIgdG8g cmVwb3J0IHRoZW0uIAorICAgICAgICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAg KiBqaXQvSklURXhjZXB0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OmdlbmVyaWNVbndpbmQpOgor ICAgICAgICAoSlNDOjpqaXRUaHJvd05ldyk6CisgICAgICAgIChKU0M6OmppdFRocm93KToKKyAg ICAgICAgKiBqaXQvSklURXhjZXB0aW9ucy5oOgorICAgICAgICAqIGxsaW50L0xMSW50RXhjZXB0 aW9ucy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50Ojpkb1Rocm93KToKKyAgICAKIDIwMTMtMDgt MjggIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBDb2RlQmxvY2sg Y29tcGlsYXRpb24gYW5kIGluc3RhbGxhdGlvbiBzaG91bGQgYmUgc2ltcGxpZmllZCBhbmQgcmF0 aW9uYWxpemVkCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9u cy5jcHAJKHJldmlzaW9uIDE1NDgxMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4OTksNyArMTg5OSw3IEBAIERGR0hh bmRsZXJFbmNvZGVkIERGR19PUEVSQVRJT04gbG9va3VwRXgKICAgICBBU1NFUlQoZXhjZXB0aW9u VmFsdWUpOwogICAgIAogICAgIHVuc2lnbmVkIHZQQ0luZGV4ID0gZXhlYy0+Y29kZUJsb2NrKCkt PmJ5dGVjb2RlT2Zmc2V0Rm9yQ2FsbEF0SW5kZXgoY2FsbEluZGV4KTsKLSAgICBFeGNlcHRpb25I YW5kbGVyIGhhbmRsZXIgPSBnZW5lcmljVGhyb3codm0sIGV4ZWMsIGV4Y2VwdGlvblZhbHVlLCB2 UENJbmRleCk7CisgICAgRXhjZXB0aW9uSGFuZGxlciBoYW5kbGVyID0gZ2VuZXJpY1Vud2luZCh2 bSwgZXhlYywgZXhjZXB0aW9uVmFsdWUsIHZQQ0luZGV4KTsKICAgICBBU1NFUlQoaGFuZGxlci5j YXRjaFJvdXRpbmUpOwogICAgIHJldHVybiBkZmdIYW5kbGVyRW5jb2RlZChoYW5kbGVyLmNhbGxG cmFtZSwgaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogfQpAQCAtMTkxNiw3ICsxOTE2LDcgQEAgREZH SGFuZGxlckVuY29kZWQgREZHX09QRVJBVElPTiBsb29rdXBFeAogICAgIHdoaWxlIChjb2RlT3Jp Z2luLmlubGluZUNhbGxGcmFtZSkKICAgICAgICAgY29kZU9yaWdpbiA9IGNvZGVPcmlnaW4uaW5s aW5lQ2FsbEZyYW1lLT5jYWxsZXI7CiAgICAgCi0gICAgRXhjZXB0aW9uSGFuZGxlciBoYW5kbGVy ID0gZ2VuZXJpY1Rocm93KHZtLCBleGVjLCBleGNlcHRpb25WYWx1ZSwgY29kZU9yaWdpbi5ieXRl Y29kZUluZGV4KTsKKyAgICBFeGNlcHRpb25IYW5kbGVyIGhhbmRsZXIgPSBnZW5lcmljVW53aW5k KHZtLCBleGVjLCBleGNlcHRpb25WYWx1ZSwgY29kZU9yaWdpbi5ieXRlY29kZUluZGV4KTsKICAg ICBBU1NFUlQoaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogICAgIHJldHVybiBkZmdIYW5kbGVyRW5j b2RlZChoYW5kbGVyLmNhbGxGcmFtZSwgaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogfQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRFeGNlcHRpb25zLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAx NTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw3IEBAIEV4Y2VwdGlvbkhhbmRsZXIgdW5jYXVnaHRF eGNlcHRpb25IYW5kbGUKICAgICByZXR1cm4gZXhjZXB0aW9uSGFuZGxlcjsKIH0KIAotRXhjZXB0 aW9uSGFuZGxlciBnZW5lcmljVGhyb3coVk0qIHZtLCBFeGVjU3RhdGUqIGNhbGxGcmFtZSwgSlNW YWx1ZSBleGNlcHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpCitFeGNlcHRpb25IYW5kbGVy IGdlbmVyaWNVbndpbmQoVk0qIHZtLCBFeGVjU3RhdGUqIGNhbGxGcmFtZSwgSlNWYWx1ZSBleGNl cHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoZXhj ZXB0aW9uVmFsdWUpOwogICAgIEhhbmRsZXJJbmZvKiBoYW5kbGVyID0gdm0tPmludGVycHJldGVy LT51bndpbmQoY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1ZSwgdlBDSW5kZXgpOyAvLyBUaGlzIG1h eSB1cGRhdGUgY2FsbEZyYW1lLgpAQCAtOTMsMTIgKzkzLDEyIEBAIEV4Y2VwdGlvbkhhbmRsZXIg aml0VGhyb3dOZXcoVk0qIHZtLCBFeGUKIHsKICAgICB1bnNpZ25lZCBieXRlY29kZU9mZnNldCA9 IGdldEV4Y2VwdGlvbkxvY2F0aW9uKHZtLCBjYWxsRnJhbWUpOwogICAgIAotICAgIHJldHVybiBn ZW5lcmljVGhyb3codm0sIGNhbGxGcmFtZSwgZXhjZXB0aW9uVmFsdWUsIGJ5dGVjb2RlT2Zmc2V0 KTsKKyAgICByZXR1cm4gZ2VuZXJpY1Vud2luZCh2bSwgY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1 ZSwgYnl0ZWNvZGVPZmZzZXQpOwogfQogCiBFeGNlcHRpb25IYW5kbGVyIGppdFRocm93KFZNKiB2 bSwgRXhlY1N0YXRlKiBjYWxsRnJhbWUsIEpTVmFsdWUgZXhjZXB0aW9uVmFsdWUsIFJldHVybkFk ZHJlc3NQdHIgZmF1bHRMb2NhdGlvbikKIHsKLSAgICByZXR1cm4gZ2VuZXJpY1Rocm93KHZtLCBj YWxsRnJhbWUsIGV4Y2VwdGlvblZhbHVlLCBjYWxsRnJhbWUtPmNvZGVCbG9jaygpLT5ieXRlY29k ZU9mZnNldChjYWxsRnJhbWUsIGZhdWx0TG9jYXRpb24pKTsKKyAgICByZXR1cm4gZ2VuZXJpY1Vu d2luZCh2bSwgY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1ZSwgY2FsbEZyYW1lLT5jb2RlQmxvY2so KS0+Ynl0ZWNvZGVPZmZzZXQoY2FsbEZyYW1lLCBmYXVsdExvY2F0aW9uKSk7CiB9CiAKIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5oCShyZXZpc2lvbiAx NTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuaAkod29y a2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNyBAQCBFbmNvZGVkRXhjZXB0aW9uSGFuZGxlciBlbmNv ZGUoRXhjZXB0aW9uCiAjZW5kaWYKIAogRXhjZXB0aW9uSGFuZGxlciB1bmNhdWdodEV4Y2VwdGlv bkhhbmRsZXIoKTsKLUV4Y2VwdGlvbkhhbmRsZXIgZ2VuZXJpY1Rocm93KFZNKiwgRXhlY1N0YXRl KiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpOworRXhjZXB0aW9u SGFuZGxlciBnZW5lcmljVW53aW5kKFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25W YWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpOwogCiBFeGNlcHRpb25IYW5kbGVyIGppdFRocm93TmV3 KFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSk7CiBFeGNlcHRpb25IYW5k bGVyIGppdFRocm93KFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSwgUmV0 dXJuQWRkcmVzc1B0ciBmYXVsdExvY2F0aW9uKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9sbGludC9MTEludEV4Y2VwdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9MTEludEV4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAxNTQ4MTApCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRFeGNlcHRpb25zLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDgsNyArNDgsNyBAQCBzdGF0aWMgdm9pZCBkb1Rocm93KEV4ZWNTdGF0ZSogZXhl YywgSW5zCiB7CiAgICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1l VHJhY2VyIHRyYWNlcih2bSwgZXhlYyk7Ci0gICAgZ2VuZXJpY1Rocm93KHZtLCBleGVjLCB2bS0+ ZXhjZXB0aW9uKCksIHBjIC0gZXhlYy0+Y29kZUJsb2NrKCktPmluc3RydWN0aW9ucygpLmJlZ2lu KCkpOworICAgIGdlbmVyaWNVbndpbmQodm0sIGV4ZWMsIHZtLT5leGNlcHRpb24oKSwgcGMgLSBl eGVjLT5jb2RlQmxvY2soKS0+aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKSk7CiB9CiAKIEluc3RydWN0 aW9uKiByZXR1cm5Ub1Rocm93KEV4ZWNTdGF0ZSogZXhlYywgSW5zdHJ1Y3Rpb24qIHBjKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCShy ZXZpc2lvbiAxNTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93 UGF0aHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzMsOCArNDMzLDcgQEAgTExJTlRfU0xPV19Q QVRIX0RFQ0woc3RhY2tfY2hlY2spCiAgICAgaWYgKFVOTElLRUxZKCF2bS5pbnRlcnByZXRlci0+ c3RhY2soKS5ncm93KCZleGVjLT5yZWdpc3RlcnMoKVtleGVjLT5jb2RlQmxvY2soKS0+bV9udW1D YWxsZWVSZWdpc3RlcnNdKSkpIHsKICAgICAgICAgUmV0dXJuQWRkcmVzc1B0ciByZXR1cm5QQyA9 IGV4ZWMtPnJldHVyblBDKCk7CiAgICAgICAgIGV4ZWMgPSBleGVjLT5jYWxsZXJGcmFtZSgpOwot ICAgICAgICB2bS50aHJvd0V4Y2VwdGlvbihleGVjLCBjcmVhdGVTdGFja092ZXJmbG93RXJyb3Io ZXhlYykpOwotICAgICAgICBDb21tb25TbG93UGF0aHM6OmludGVycHJldGVyVGhyb3dJbkNhbGxl cihleGVjLCByZXR1cm5QQyk7CisgICAgICAgIENvbW1vblNsb3dQYXRoczo6aW50ZXJwcmV0ZXJU aHJvd0luQ2FsbGVyKGV4ZWMsIHJldHVyblBDLCBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoZXhl YykpOwogICAgICAgICBwYyA9IHJldHVyblRvVGhyb3dGb3JUaHJvd25FeGNlcHRpb24oZXhlYyk7 CiAgICAgfQogICAgIExMSU5UX0VORF9JTVBMKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAJKHJldmlzaW9uIDE1NDgxMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE3Niw4ICsxNzYsNyBAQCBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhf Y2FsbF9hcml0eUNoZWNrCiAgICAgaWYgKFNsb3RzVG9BZGQgPCAwKSB7CiAgICAgICAgIFJldHVy bkFkZHJlc3NQdHIgcmV0dXJuUEMgPSBleGVjLT5yZXR1cm5QQygpOwogICAgICAgICBleGVjID0g ZXhlYy0+Y2FsbGVyRnJhbWUoKTsKLSAgICAgICAgdm0udGhyb3dFeGNlcHRpb24oZXhlYywgY3Jl YXRlU3RhY2tPdmVyZmxvd0Vycm9yKGV4ZWMpKTsKLSAgICAgICAgQ29tbW9uU2xvd1BhdGhzOjpp bnRlcnByZXRlclRocm93SW5DYWxsZXIoZXhlYywgcmV0dXJuUEMpOworICAgICAgICBDb21tb25T bG93UGF0aHM6OmludGVycHJldGVyVGhyb3dJbkNhbGxlcihleGVjLCByZXR1cm5QQywgY3JlYXRl U3RhY2tPdmVyZmxvd0Vycm9yKGV4ZWMpKTsKICAgICAgICAgUkVUVVJOX1RXTyhiaXR3aXNlX2Nh c3Q8dm9pZCo+KHN0YXRpY19jYXN0PHVpbnRwdHJfdD4oMSkpLCBleGVjKTsKICAgICB9CiAgICAg UkVUVVJOX1RXTygwLCByZWludGVycHJldF9jYXN0PEV4ZWNTdGF0ZSo+KFNsb3RzVG9BZGQpKTsK QEAgLTE5MCw4ICsxODksNyBAQCBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhfY29uc3RydWN0X2Fy aXR5CiAgICAgaWYgKFNsb3RzVG9BZGQgPCAwKSB7CiAgICAgICAgIFJldHVybkFkZHJlc3NQdHIg cmV0dXJuUEMgPSBleGVjLT5yZXR1cm5QQygpOwogICAgICAgICBleGVjID0gZXhlYy0+Y2FsbGVy RnJhbWUoKTsKLSAgICAgICAgdm0udGhyb3dFeGNlcHRpb24oZXhlYywgY3JlYXRlU3RhY2tPdmVy Zmxvd0Vycm9yKGV4ZWMpKTsKLSAgICAgICAgQ29tbW9uU2xvd1BhdGhzOjppbnRlcnByZXRlclRo cm93SW5DYWxsZXIoZXhlYywgcmV0dXJuUEMpOworICAgICAgICBDb21tb25TbG93UGF0aHM6Omlu dGVycHJldGVyVGhyb3dJbkNhbGxlcihleGVjLCByZXR1cm5QQywgY3JlYXRlU3RhY2tPdmVyZmxv d0Vycm9yKGV4ZWMpKTsKICAgICAgICAgUkVUVVJOX1RXTyhiaXR3aXNlX2Nhc3Q8dm9pZCo+KHN0 YXRpY19jYXN0PHVpbnRwdHJfdD4oMSkpLCBleGVjKTsKICAgICB9CiAgICAgUkVUVVJOX1RXTygw LCByZWludGVycHJldF9jYXN0PEV4ZWNTdGF0ZSo+KFNsb3RzVG9BZGQpKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlvbnMuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRo c0V4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAxNTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHNFeGNlcHRpb25zLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzMsMTQgKzMzLDE1IEBACiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgQ29tbW9uU2xv d1BhdGhzIHsKIAotdm9pZCBpbnRlcnByZXRlclRocm93SW5DYWxsZXIoRXhlY1N0YXRlKiBleGVj LCBSZXR1cm5BZGRyZXNzUHRyIHBjKQordm9pZCBpbnRlcnByZXRlclRocm93SW5DYWxsZXIoRXhl Y1N0YXRlKiBleGVjLCBSZXR1cm5BZGRyZXNzUHRyIHBjLCBKU09iamVjdCogZXJyb3IpCiB7CiAg ICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNl cih2bSwgZXhlYyk7CisgICAgdm0tPnRocm93RXhjZXB0aW9uKGV4ZWMsIGVycm9yKTsKICNpZiBM TElOVF9TTE9XX1BBVEhfVFJBQ0lORwogICAgIGRhdGFMb2coIlRocm93aW5nIGV4Y2VwdGlvbiAi LCB2bS0+ZXhjZXB0aW9uKCksICIuXG4iKTsKICNlbmRpZgotICAgIGdlbmVyaWNUaHJvdygKKyAg ICBnZW5lcmljVW53aW5kKAogICAgICAgICB2bSwgZXhlYywgdm0tPmV4Y2VwdGlvbigpLAogICAg ICAgICBleGVjLT5jb2RlQmxvY2soKS0+Ynl0ZWNvZGVPZmZzZXQoZXhlYywgcGMpKTsKIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlv bnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25T bG93UGF0aHNFeGNlcHRpb25zLmgJKHJldmlzaW9uIDE1NDgxMCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlvbnMuaAkod29ya2luZyBjb3B5 KQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBFeGVjU3RhdGU7CiBuYW1lc3BhY2UgQ29tbW9uU2xv d1BhdGhzIHsKIAogLy8gVGhyb3cgdGhlIGN1cnJlbnRseSBhY3RpdmUgZXhjZXB0aW9uIGluIHRo ZSBjb250ZXh0IG9mIHRoZSBjYWxsZXIncyBjYWxsIGZyYW1lLgotdm9pZCBpbnRlcnByZXRlclRo cm93SW5DYWxsZXIoRXhlY1N0YXRlKiBjYWxsZXJGcmFtZSwgUmV0dXJuQWRkcmVzc1B0cik7Cit2 b2lkIGludGVycHJldGVyVGhyb3dJbkNhbGxlcihFeGVjU3RhdGUqIGNhbGxlckZyYW1lLCBSZXR1 cm5BZGRyZXNzUHRyLCBKU09iamVjdCopOwogCiB9IH0gLy8gbmFtZXNwYWNlIEpTQzo6Q29tbW9u U2xvd1BhdGhzCiAK 209991 2013-08-29 09:23:40 -0700 2013-08-29 10:02:30 -0700 patch 2 fixPatch.diff text/plain 10485 chris_curtis SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0ODEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDEzLTA4LTI5ICBDaHJpcyBDdXJ0aXMgIDxjaHJpc19jdXJ0aXNAYXBwbGUuY29tPgorCisg ICAgICAgIFZNOjp0aHJvd0V4Y2VwdGlvbigpIGNyYXNoZXMgcmVwcm9kdWNpYmx5IGluIHRlc3Rh cGkgd2l0aCAhRU5BQkxFKEpJVCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMDQ3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICAKKyAgICAgICAgV2l0aCB0aGUgSklUIGRpc2FibGVkLCBpbnRlcnByZXRlclRo cm93SW5DYWxsZXIgd2FzIGF0dGVtcHRpbmcgdG8gdGhyb3cgYW4gZXJyb3IsIAorICAgICAgICBi dXQgdGhlIHRvcENhbGxGcmFtZSB3YXMgbm90IHNldCB5ZXQuIEJ5IHBhc3NpbmcgdGhlIGVycm9y IG9iamVjdCBpbnRvIGludGVycHJldGVyVGhyb3dJbkNhbGxlcgorICAgICAgICB0aHJvd0V4Y2Vw dGlvbiBjYW4gYmUgY2FsbGVkIHdoZW4gdG9wQ2FsbEZyYW1lIGlzIHNldC4KKyAgICAgICAgKiBs bGludC9MTEludFNsb3dQYXRocy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50OjpMTElOVF9TTE9X X1BBVEhfREVDTCk6CisgICAgICAgICogcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwOgorICAg ICAgICAoSlNDOjpTTE9XX1BBVEhfREVDTCk6CisgICAgICAgICogcnVudGltZS9Db21tb25TbG93 UGF0aHNFeGNlcHRpb25zLmNwcDoKKyAgICAgICAgKEpTQzo6Q29tbW9uU2xvd1BhdGhzOjppbnRl cnByZXRlclRocm93SW5DYWxsZXIpOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhz RXhjZXB0aW9ucy5oOgorCisgICAgICAgIFJlbmFtZWQgZ2VuZXJpY1Rocm93IC0+IGdlbmVyaWNV bndpbmQsIGJlY2F1c2UgdGhpcyBmdW5jdGlvbiBubyBsb25nZXIgaGFzIHRoZSBhYmlsaXR5Cisg ICAgICAgIHRvIHRocm93IGVycm9ycy4gSXQgdW53aW5kcyB0aGUgc3RhY2sgaW4gb3JkZXIgdG8g cmVwb3J0IHRoZW0uIAorICAgICAgICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAg KiBqaXQvSklURXhjZXB0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OmdlbmVyaWNVbndpbmQpOgor ICAgICAgICAoSlNDOjpqaXRUaHJvd05ldyk6CisgICAgICAgIChKU0M6OmppdFRocm93KToKKyAg ICAgICAgKiBqaXQvSklURXhjZXB0aW9ucy5oOgorICAgICAgICAqIGxsaW50L0xMSW50RXhjZXB0 aW9ucy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50Ojpkb1Rocm93KToKKyAgICAKIDIwMTMtMDgt MjggIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBDb2RlQmxvY2sg Y29tcGlsYXRpb24gYW5kIGluc3RhbGxhdGlvbiBzaG91bGQgYmUgc2ltcGxpZmllZCBhbmQgcmF0 aW9uYWxpemVkCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9u cy5jcHAJKHJldmlzaW9uIDE1NDgxMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4OTksNyArMTg5OSw3IEBAIERGR0hh bmRsZXJFbmNvZGVkIERGR19PUEVSQVRJT04gbG9va3VwRXgKICAgICBBU1NFUlQoZXhjZXB0aW9u VmFsdWUpOwogICAgIAogICAgIHVuc2lnbmVkIHZQQ0luZGV4ID0gZXhlYy0+Y29kZUJsb2NrKCkt PmJ5dGVjb2RlT2Zmc2V0Rm9yQ2FsbEF0SW5kZXgoY2FsbEluZGV4KTsKLSAgICBFeGNlcHRpb25I YW5kbGVyIGhhbmRsZXIgPSBnZW5lcmljVGhyb3codm0sIGV4ZWMsIGV4Y2VwdGlvblZhbHVlLCB2 UENJbmRleCk7CisgICAgRXhjZXB0aW9uSGFuZGxlciBoYW5kbGVyID0gZ2VuZXJpY1Vud2luZCh2 bSwgZXhlYywgZXhjZXB0aW9uVmFsdWUsIHZQQ0luZGV4KTsKICAgICBBU1NFUlQoaGFuZGxlci5j YXRjaFJvdXRpbmUpOwogICAgIHJldHVybiBkZmdIYW5kbGVyRW5jb2RlZChoYW5kbGVyLmNhbGxG cmFtZSwgaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogfQpAQCAtMTkxNiw3ICsxOTE2LDcgQEAgREZH SGFuZGxlckVuY29kZWQgREZHX09QRVJBVElPTiBsb29rdXBFeAogICAgIHdoaWxlIChjb2RlT3Jp Z2luLmlubGluZUNhbGxGcmFtZSkKICAgICAgICAgY29kZU9yaWdpbiA9IGNvZGVPcmlnaW4uaW5s aW5lQ2FsbEZyYW1lLT5jYWxsZXI7CiAgICAgCi0gICAgRXhjZXB0aW9uSGFuZGxlciBoYW5kbGVy ID0gZ2VuZXJpY1Rocm93KHZtLCBleGVjLCBleGNlcHRpb25WYWx1ZSwgY29kZU9yaWdpbi5ieXRl Y29kZUluZGV4KTsKKyAgICBFeGNlcHRpb25IYW5kbGVyIGhhbmRsZXIgPSBnZW5lcmljVW53aW5k KHZtLCBleGVjLCBleGNlcHRpb25WYWx1ZSwgY29kZU9yaWdpbi5ieXRlY29kZUluZGV4KTsKICAg ICBBU1NFUlQoaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogICAgIHJldHVybiBkZmdIYW5kbGVyRW5j b2RlZChoYW5kbGVyLmNhbGxGcmFtZSwgaGFuZGxlci5jYXRjaFJvdXRpbmUpOwogfQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRFeGNlcHRpb25zLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAx NTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw3IEBAIEV4Y2VwdGlvbkhhbmRsZXIgdW5jYXVnaHRF eGNlcHRpb25IYW5kbGUKICAgICByZXR1cm4gZXhjZXB0aW9uSGFuZGxlcjsKIH0KIAotRXhjZXB0 aW9uSGFuZGxlciBnZW5lcmljVGhyb3coVk0qIHZtLCBFeGVjU3RhdGUqIGNhbGxGcmFtZSwgSlNW YWx1ZSBleGNlcHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpCitFeGNlcHRpb25IYW5kbGVy IGdlbmVyaWNVbndpbmQoVk0qIHZtLCBFeGVjU3RhdGUqIGNhbGxGcmFtZSwgSlNWYWx1ZSBleGNl cHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoZXhj ZXB0aW9uVmFsdWUpOwogICAgIEhhbmRsZXJJbmZvKiBoYW5kbGVyID0gdm0tPmludGVycHJldGVy LT51bndpbmQoY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1ZSwgdlBDSW5kZXgpOyAvLyBUaGlzIG1h eSB1cGRhdGUgY2FsbEZyYW1lLgpAQCAtOTMsMTIgKzkzLDEyIEBAIEV4Y2VwdGlvbkhhbmRsZXIg aml0VGhyb3dOZXcoVk0qIHZtLCBFeGUKIHsKICAgICB1bnNpZ25lZCBieXRlY29kZU9mZnNldCA9 IGdldEV4Y2VwdGlvbkxvY2F0aW9uKHZtLCBjYWxsRnJhbWUpOwogICAgIAotICAgIHJldHVybiBn ZW5lcmljVGhyb3codm0sIGNhbGxGcmFtZSwgZXhjZXB0aW9uVmFsdWUsIGJ5dGVjb2RlT2Zmc2V0 KTsKKyAgICByZXR1cm4gZ2VuZXJpY1Vud2luZCh2bSwgY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1 ZSwgYnl0ZWNvZGVPZmZzZXQpOwogfQogCiBFeGNlcHRpb25IYW5kbGVyIGppdFRocm93KFZNKiB2 bSwgRXhlY1N0YXRlKiBjYWxsRnJhbWUsIEpTVmFsdWUgZXhjZXB0aW9uVmFsdWUsIFJldHVybkFk ZHJlc3NQdHIgZmF1bHRMb2NhdGlvbikKIHsKLSAgICByZXR1cm4gZ2VuZXJpY1Rocm93KHZtLCBj YWxsRnJhbWUsIGV4Y2VwdGlvblZhbHVlLCBjYWxsRnJhbWUtPmNvZGVCbG9jaygpLT5ieXRlY29k ZU9mZnNldChjYWxsRnJhbWUsIGZhdWx0TG9jYXRpb24pKTsKKyAgICByZXR1cm4gZ2VuZXJpY1Vu d2luZCh2bSwgY2FsbEZyYW1lLCBleGNlcHRpb25WYWx1ZSwgY2FsbEZyYW1lLT5jb2RlQmxvY2so KS0+Ynl0ZWNvZGVPZmZzZXQoY2FsbEZyYW1lLCBmYXVsdExvY2F0aW9uKSk7CiB9CiAKIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5oCShyZXZpc2lvbiAx NTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuaAkod29y a2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNyBAQCBFbmNvZGVkRXhjZXB0aW9uSGFuZGxlciBlbmNv ZGUoRXhjZXB0aW9uCiAjZW5kaWYKIAogRXhjZXB0aW9uSGFuZGxlciB1bmNhdWdodEV4Y2VwdGlv bkhhbmRsZXIoKTsKLUV4Y2VwdGlvbkhhbmRsZXIgZ2VuZXJpY1Rocm93KFZNKiwgRXhlY1N0YXRl KiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpOworRXhjZXB0aW9u SGFuZGxlciBnZW5lcmljVW53aW5kKFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25W YWx1ZSwgdW5zaWduZWQgdlBDSW5kZXgpOwogCiBFeGNlcHRpb25IYW5kbGVyIGppdFRocm93TmV3 KFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSk7CiBFeGNlcHRpb25IYW5k bGVyIGppdFRocm93KFZNKiwgRXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSwgUmV0 dXJuQWRkcmVzc1B0ciBmYXVsdExvY2F0aW9uKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9sbGludC9MTEludEV4Y2VwdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9MTEludEV4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAxNTQ4MTApCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRFeGNlcHRpb25zLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDgsNyArNDgsNyBAQCBzdGF0aWMgdm9pZCBkb1Rocm93KEV4ZWNTdGF0ZSogZXhl YywgSW5zCiB7CiAgICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1l VHJhY2VyIHRyYWNlcih2bSwgZXhlYyk7Ci0gICAgZ2VuZXJpY1Rocm93KHZtLCBleGVjLCB2bS0+ ZXhjZXB0aW9uKCksIHBjIC0gZXhlYy0+Y29kZUJsb2NrKCktPmluc3RydWN0aW9ucygpLmJlZ2lu KCkpOworICAgIGdlbmVyaWNVbndpbmQodm0sIGV4ZWMsIHZtLT5leGNlcHRpb24oKSwgcGMgLSBl eGVjLT5jb2RlQmxvY2soKS0+aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKSk7CiB9CiAKIEluc3RydWN0 aW9uKiByZXR1cm5Ub1Rocm93KEV4ZWNTdGF0ZSogZXhlYywgSW5zdHJ1Y3Rpb24qIHBjKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCShy ZXZpc2lvbiAxNTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93 UGF0aHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzMsOCArNDMzLDcgQEAgTExJTlRfU0xPV19Q QVRIX0RFQ0woc3RhY2tfY2hlY2spCiAgICAgaWYgKFVOTElLRUxZKCF2bS5pbnRlcnByZXRlci0+ c3RhY2soKS5ncm93KCZleGVjLT5yZWdpc3RlcnMoKVtleGVjLT5jb2RlQmxvY2soKS0+bV9udW1D YWxsZWVSZWdpc3RlcnNdKSkpIHsKICAgICAgICAgUmV0dXJuQWRkcmVzc1B0ciByZXR1cm5QQyA9 IGV4ZWMtPnJldHVyblBDKCk7CiAgICAgICAgIGV4ZWMgPSBleGVjLT5jYWxsZXJGcmFtZSgpOwot ICAgICAgICB2bS50aHJvd0V4Y2VwdGlvbihleGVjLCBjcmVhdGVTdGFja092ZXJmbG93RXJyb3Io ZXhlYykpOwotICAgICAgICBDb21tb25TbG93UGF0aHM6OmludGVycHJldGVyVGhyb3dJbkNhbGxl cihleGVjLCByZXR1cm5QQyk7CisgICAgICAgIENvbW1vblNsb3dQYXRoczo6aW50ZXJwcmV0ZXJU aHJvd0luQ2FsbGVyKGV4ZWMsIHJldHVyblBDLCBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoZXhl YykpOwogICAgICAgICBwYyA9IHJldHVyblRvVGhyb3dGb3JUaHJvd25FeGNlcHRpb24oZXhlYyk7 CiAgICAgfQogICAgIExMSU5UX0VORF9JTVBMKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAJKHJldmlzaW9uIDE1NDgxMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE3Niw4ICsxNzYsNyBAQCBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhf Y2FsbF9hcml0eUNoZWNrCiAgICAgaWYgKFNsb3RzVG9BZGQgPCAwKSB7CiAgICAgICAgIFJldHVy bkFkZHJlc3NQdHIgcmV0dXJuUEMgPSBleGVjLT5yZXR1cm5QQygpOwogICAgICAgICBleGVjID0g ZXhlYy0+Y2FsbGVyRnJhbWUoKTsKLSAgICAgICAgdm0udGhyb3dFeGNlcHRpb24oZXhlYywgY3Jl YXRlU3RhY2tPdmVyZmxvd0Vycm9yKGV4ZWMpKTsKLSAgICAgICAgQ29tbW9uU2xvd1BhdGhzOjpp bnRlcnByZXRlclRocm93SW5DYWxsZXIoZXhlYywgcmV0dXJuUEMpOworICAgICAgICBDb21tb25T bG93UGF0aHM6OmludGVycHJldGVyVGhyb3dJbkNhbGxlcihleGVjLCByZXR1cm5QQywgY3JlYXRl U3RhY2tPdmVyZmxvd0Vycm9yKGV4ZWMpKTsKICAgICAgICAgUkVUVVJOX1RXTyhiaXR3aXNlX2Nh c3Q8dm9pZCo+KHN0YXRpY19jYXN0PHVpbnRwdHJfdD4oMSkpLCBleGVjKTsKICAgICB9CiAgICAg UkVUVVJOX1RXTygwLCByZWludGVycHJldF9jYXN0PEV4ZWNTdGF0ZSo+KFNsb3RzVG9BZGQpKTsK QEAgLTE5MCw4ICsxODksNyBAQCBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhfY29uc3RydWN0X2Fy aXR5CiAgICAgaWYgKFNsb3RzVG9BZGQgPCAwKSB7CiAgICAgICAgIFJldHVybkFkZHJlc3NQdHIg cmV0dXJuUEMgPSBleGVjLT5yZXR1cm5QQygpOwogICAgICAgICBleGVjID0gZXhlYy0+Y2FsbGVy RnJhbWUoKTsKLSAgICAgICAgdm0udGhyb3dFeGNlcHRpb24oZXhlYywgY3JlYXRlU3RhY2tPdmVy Zmxvd0Vycm9yKGV4ZWMpKTsKLSAgICAgICAgQ29tbW9uU2xvd1BhdGhzOjppbnRlcnByZXRlclRo cm93SW5DYWxsZXIoZXhlYywgcmV0dXJuUEMpOworICAgICAgICBDb21tb25TbG93UGF0aHM6Omlu dGVycHJldGVyVGhyb3dJbkNhbGxlcihleGVjLCByZXR1cm5QQywgY3JlYXRlU3RhY2tPdmVyZmxv d0Vycm9yKGV4ZWMpKTsKICAgICAgICAgUkVUVVJOX1RXTyhiaXR3aXNlX2Nhc3Q8dm9pZCo+KHN0 YXRpY19jYXN0PHVpbnRwdHJfdD4oMSkpLCBleGVjKTsKICAgICB9CiAgICAgUkVUVVJOX1RXTygw LCByZWludGVycHJldF9jYXN0PEV4ZWNTdGF0ZSo+KFNsb3RzVG9BZGQpKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlvbnMuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRo c0V4Y2VwdGlvbnMuY3BwCShyZXZpc2lvbiAxNTQ4MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHNFeGNlcHRpb25zLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzMsMTQgKzMzLDE1IEBACiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgQ29tbW9uU2xv d1BhdGhzIHsKIAotdm9pZCBpbnRlcnByZXRlclRocm93SW5DYWxsZXIoRXhlY1N0YXRlKiBleGVj LCBSZXR1cm5BZGRyZXNzUHRyIHBjKQordm9pZCBpbnRlcnByZXRlclRocm93SW5DYWxsZXIoRXhl Y1N0YXRlKiBleGVjLCBSZXR1cm5BZGRyZXNzUHRyIHBjLCBKU09iamVjdCogZXJyb3IpCiB7CiAg ICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNl cih2bSwgZXhlYyk7CisgICAgdm0tPnRocm93RXhjZXB0aW9uKGV4ZWMsIGVycm9yKTsKICNpZiBM TElOVF9TTE9XX1BBVEhfVFJBQ0lORwogICAgIGRhdGFMb2coIlRocm93aW5nIGV4Y2VwdGlvbiAi LCB2bS0+ZXhjZXB0aW9uKCksICIuXG4iKTsKICNlbmRpZgotICAgIGdlbmVyaWNUaHJvdygKKyAg ICBnZW5lcmljVW53aW5kKAogICAgICAgICB2bSwgZXhlYywgdm0tPmV4Y2VwdGlvbigpLAogICAg ICAgICBleGVjLT5jb2RlQmxvY2soKS0+Ynl0ZWNvZGVPZmZzZXQoZXhlYywgcGMpKTsKIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlv bnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25T bG93UGF0aHNFeGNlcHRpb25zLmgJKHJldmlzaW9uIDE1NDgxMCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRoc0V4Y2VwdGlvbnMuaAkod29ya2luZyBjb3B5 KQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBFeGVjU3RhdGU7CiBuYW1lc3BhY2UgQ29tbW9uU2xv d1BhdGhzIHsKIAogLy8gVGhyb3cgdGhlIGN1cnJlbnRseSBhY3RpdmUgZXhjZXB0aW9uIGluIHRo ZSBjb250ZXh0IG9mIHRoZSBjYWxsZXIncyBjYWxsIGZyYW1lLgotdm9pZCBpbnRlcnByZXRlclRo cm93SW5DYWxsZXIoRXhlY1N0YXRlKiBjYWxsZXJGcmFtZSwgUmV0dXJuQWRkcmVzc1B0cik7Cit2 b2lkIGludGVycHJldGVyVGhyb3dJbkNhbGxlcihFeGVjU3RhdGUqIGNhbGxlckZyYW1lLCBSZXR1 cm5BZGRyZXNzUHRyLCBKU09iamVjdCopOwogCiB9IH0gLy8gbmFtZXNwYWNlIEpTQzo6Q29tbW9u U2xvd1BhdGhzCiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDgxMikKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEzLTA4LTI5ICBDaHJp cyBDdXJ0aXMgIDxjaHJpc19jdXJ0aXNAYXBwbGUuY29tPgorCisgICAgICAgIFZNOjp0aHJvd0V4 Y2VwdGlvbigpIGNyYXNoZXMgcmVwcm9kdWNpYmx5IGluIHRlc3RhcGkgd2l0aCAhRU5BQkxFKEpJ VCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDQ3 MgorICAgICAgICAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IEFuIGVycm9yIHRoYXQgd2FzIG5vdCBiZWluZyByZXBvcnRlZCBiZWZvcmUgaXMgbm93IGNhdWdo dCBhbmQgYmVpbmcgcmVwb3J0ZWQuCisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3VlLXJl bmRlcmluZy1vbi1yZXNpemUtZXhwZWN0ZWQudHh0OgorCiAyMDEzLTA4LTI5ICBTaW1vbiBQZW5h ICA8c2ltb24ucGVuYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBVbnJldmlld2VkIGdh cmRlbmluZy4gUmViYXNlbGluaW5nIGFmdGVyIHIxNTQ0NzkgYW5kIHIxNTQ3MDIKSW5kZXg6IExh eW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1yZW5kZXJpbmctb24tcmVzaXplLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUt cmVuZGVyaW5nLW9uLXJlc2l6ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE1NDgxMCkKKysrIExh eW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1yZW5kZXJpbmctb24tcmVzaXplLWV4cGVj dGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTog bGluZSA0NzogUmVmZXJlbmNlRXJyb3I6IENhbid0IGZpbmQgdmFyaWFibGU6IHNldENhcHRpb25E aXNwbGF5TW9kZQogTGluZSBoZWlnaHQgaXNuJ3Qgb3ZlcnJpZGVuIGJ5IG90aGVyIENTUyB2YWx1 ZXMgaW4gdGhlIGZpbGUuCiBFVkVOVChjYW5wbGF5dGhyb3VnaCkKIEVWRU5UKHNlZWtlZCkK