119266 2013-07-30 09:21:48 -0700 Add back c++11 features removed by buildfixes after all ports did the switch 2013-09-12 08:27:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 119402 1 ossy ossy abecsi allan.jensen buildbot cmarcelo commit-queue eflews.bot gyuyoung.kim menard nick.diego ossy rakuco rego+ews rniwa webkit-ews xan.lopez zan oldest_to_newest 912875 0 ossy 2013-07-30 09:21:48 -0700 Patch is coming soon. 912928 1 207746 ossy 2013-07-30 10:35:06 -0700 Created attachment 207746 Patch WIP patch for EWS bots to check if all ports are ready for c++11 in JSC 912932 2 207746 webkit-ews 2013-07-30 10:40:05 -0700 Comment on attachment 207746 Patch Attachment 207746 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1290444 912934 3 207746 webkit-ews 2013-07-30 10:40:42 -0700 Comment on attachment 207746 Patch Attachment 207746 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1295414 912935 4 207746 eflews.bot 2013-07-30 10:42:08 -0700 Comment on attachment 207746 Patch Attachment 207746 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1293385 912936 5 207747 ossy 2013-07-30 10:42:42 -0700 Created attachment 207747 Patch WIP patch for EWS bots, let's try to enable c++11 for whole QtWebKit 912943 6 207747 eflews.bot 2013-07-30 10:55:41 -0700 Comment on attachment 207747 Patch Attachment 207747 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1295420 912949 7 207750 ossy 2013-07-30 11:12:50 -0700 Created attachment 207750 Patch one more round after killing the Qt EWS bots :) (clean build worked for me locally) 912952 8 207750 eflews.bot 2013-07-30 11:20:44 -0700 Comment on attachment 207750 Patch Attachment 207750 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1298425 913075 9 allan.jensen 2013-07-30 16:06:06 -0700 (In reply to comment #7) > Created an attachment (id=207750) [details] > Patch > > one more round after killing the Qt EWS bots :) (clean build worked for me locally) Did anyone actually enable C++11 on Qt? 913211 10 ossy 2013-07-30 23:56:31 -0700 (In reply to comment #9) > (In reply to comment #7) > > Created an attachment (id=207750) [details] [details] > > Patch > > > > one more round after killing the Qt EWS bots :) (clean build worked for me locally) > > Did anyone actually enable C++11 on Qt? No, I tried to enable it by the uploaded patch. But unfortunately the EWS bot couldn't handle this situation and needed a clean build. 913779 11 207935 ossy 2013-08-01 10:31:26 -0700 Created attachment 207935 Patch updated patch for EWS bots, Qt fix removed (Qt switched to c++11), cmake fixes added to make EFL bots happy 916090 12 207935 buildbot 2013-08-11 03:30:08 -0700 Comment on attachment 207935 Patch Attachment 207935 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/1359999 916623 13 allan.jensen 2013-08-13 01:47:53 -0700 (In reply to comment #11) > Created an attachment (id=207935) [details] > Patch > > updated patch for EWS bots, Qt fix removed (Qt switched to c++11), cmake fixes added to make EFL bots happy Actually I would prefer if we didn't add these back. We might have enabled C++11, but using nullptr limits WebKit from GCC 4.3+ to GCC 4.6+, and considering how little using nullptr brings, I would prefer we avoid them. 916632 14 allan.jensen 2013-08-13 02:29:08 -0700 (In reply to comment #13) > (In reply to comment #11) > > Created an attachment (id=207935) [details] [details] > > Patch > > > > updated patch for EWS bots, Qt fix removed (Qt switched to c++11), cmake fixes added to make EFL bots happy > > Actually I would prefer if we didn't add these back. > > We might have enabled C++11, but using nullptr limits WebKit from GCC 4.3+ to GCC 4.6+, and considering how little using nullptr brings, I would prefer we avoid them. Btw, the reason support older GCC still makes sense is mostly Red Hat. Since Debian stable updated earlier this year, it is now RHEL6 that restraining gcc on linux. The latest Red Hat Enterprise Linux ships with GCC 4.4. 918998 15 ossy 2013-08-20 03:33:56 -0700 (In reply to comment #13) > (In reply to comment #11) > > Created an attachment (id=207935) [details] [details] > > Patch > > > > updated patch for EWS bots, Qt fix removed (Qt switched to c++11), cmake fixes added to make EFL bots happy > > Actually I would prefer if we didn't add these back. > > We might have enabled C++11, but using nullptr limits WebKit from GCC 4.3+ to GCC 4.6+, and considering how little using nullptr brings, I would prefer we avoid them. It's all the same for me, but it would be great to reply to the original webkit-dev message about it. Otherwise I don't think if there is any buildbot or EWS with GCC 4.4 to ensure nobody adds nullptr again and again. 928243 16 211419 ossy 2013-09-12 04:58:48 -0700 Created attachment 211419 Patch updated patch to ToT, Qt and EFL buildsystem hacks aren't needed, both of them builds with c++11 928244 17 211419 buildbot 2013-09-12 05:02:11 -0700 Comment on attachment 211419 Patch Attachment 211419 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/1795131 928245 18 211419 eflews.bot 2013-09-12 05:02:13 -0700 Comment on attachment 211419 Patch Attachment 211419 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1843106 928246 19 211419 webkit-ews 2013-09-12 05:02:52 -0700 Comment on attachment 211419 Patch Attachment 211419 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1857085 928247 20 211419 eflews.bot 2013-09-12 05:04:05 -0700 Comment on attachment 211419 Patch Attachment 211419 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1843107 928248 21 ossy 2013-09-12 05:04:11 -0700 I grepped to nullptr and it seems there are zillion everywhere: - 8 nullptr in JavaScriptCore - 71 nullptr in WTF - 383 nullptr in WebCore - 99 nullptr in WebKit2 So I don't see why shouldn't we add them back. 928249 22 211419 webkit-ews 2013-09-12 05:04:21 -0700 Comment on attachment 211419 Patch Attachment 211419 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1818100 928251 23 211421 ossy 2013-09-12 05:11:04 -0700 Created attachment 211421 Patch 928286 24 zan 2013-09-12 08:09:04 -0700 If you're taking requests here, feel free to also include the std::nullptr reintroduction in ChildProcessProxy in bug #109162. 928297 25 211421 ossy 2013-09-12 08:27:17 -0700 Comment on attachment 211421 Patch Clearing flags on attachment: 211421 Committed r155613: <http://trac.webkit.org/changeset/155613> 928298 26 ossy 2013-09-12 08:27:25 -0700 All reviewed patches have been landed. Closing bug. 207746 2013-07-30 10:35:06 -0700 2013-07-30 10:42:38 -0700 Patch bug-119266-20130730193504.patch text/plain 12333 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MTJlMTEwYWY3NDIzN2UyMTQ0NjliNDMyZjk4MTM1M2NmODRmYTViLi40NWY2OTgyOTc4MzZlOWRk NjM5MzNiNTE5ZWU4YWI4YTc0NGRiODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNyBAQAorMjAxMy0wNy0zMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFBhcnRpYWxseSBy ZXZlcnQgcjE1MzI5OSwgcjE1MzMwMSwgcjE1MzMxNCwgcjE1MzMyMSBhbmQgcjE1MzMyMi4KKyAg ICAgICAgQWRkaXRpb25hbGx5IGFkZCBtb3JlIG51bGxwdHIgdG8gcnVudGltZS9FeGVjdXRhYmxl LmNwcC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGJ5dGVjb2RlL0dldEJ5SWRTdGF0dXMuaDoKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1czo6 R2V0QnlJZFN0YXR1cyk6CisgICAgICAgICogZGZnL0RGR1dvcmtsaXN0LmNwcDoKKyAgICAgICAg KEpTQzo6REZHOjpXb3JrbGlzdDo6fldvcmtsaXN0KToKKyAgICAgICAgKiBpbnRlcnByZXRlci9D YWxsRnJhbWUuaDoKKyAgICAgICAgKiBpbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcDoKKyAg ICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmNvZGVUeXBlKToKKyAgICAgICAgKEpT Qzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmZ1bmN0aW9uTmFtZSk6CisgICAgICAgIChKU0M6OlN0 YWNrSXRlcmF0b3I6OkZyYW1lOjpzb3VyY2VVUkwpOgorICAgICAgICAoSlNDOjpTdGFja0l0ZXJh dG9yOjpGcmFtZTo6bG9naWNhbEZyYW1lKToKKyAgICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6 RnJhbWU6OnByaW50KToKKyAgICAgICAgKiBydW50aW1lL0V4ZWN1dGFibGUuY3BwOgorICAgICAg ICAoSlNDOjpFdmFsRXhlY3V0YWJsZTo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6c2FtcGxpbmdE ZXNjcmlwdGlvbik6CisgICAgICAgIChKU0M6OkV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwpOgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y2hlY2tTeW50YXgpOgorICAg ICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKToKKyAgICAgICAg KEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKToKKyAg ICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpiYXNlbGluZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNhbGxJbnRlcm5hbCk6 CisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdElu dGVybmFsKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpmcm9tR2xvYmFsQ29k ZSk6CisKIDIwMTMtMDctMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXRCeUlkU3RhdHVzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCmluZGV4IDVhOTFkZjQy ZWRjYzVlNjg3M2RiZmVhZDBmOTc2YWRiOWRjYjk3ZmUuLjg0NGFmYTgzMGFkMmMwODgyMThhMTg4 ZmY2NmU5N2ZiODk1ZTlmYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9HZXRCeUlkU3RhdHVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0dldEJ5SWRTdGF0dXMuaApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgR2V0 QnlJZFN0YXR1cygKICAgICAgICAgU3RhdGUgc3RhdGUsIGJvb2wgd2FzU2VlbkluSklULCBjb25z dCBTdHJ1Y3R1cmVTZXQmIHN0cnVjdHVyZVNldCA9IFN0cnVjdHVyZVNldCgpLAotICAgICAgICBQ cm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1ZhbHVlIHNwZWNpZmljVmFs dWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1cmVDaGFpbj4gY2hhaW4g PSAwKQorICAgICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1Zh bHVlIHNwZWNpZmljVmFsdWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1 cmVDaGFpbj4gY2hhaW4gPSBudWxscHRyKQogICAgICAgICA6IG1fc3RhdGUoc3RhdGUpCiAgICAg ICAgICwgbV9zdHJ1Y3R1cmVTZXQoc3RydWN0dXJlU2V0KQogICAgICAgICAsIG1fY2hhaW4oY2hh aW4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCmluZGV4IGE3M2U1 NmQ1NDhkODAzMGZjZGVkOTQ2MjY0YWRhNjE4YWY1NThlNjMuLjQ0MzZjMGQ5M2QyYzIzMzY5OWU2 ODNhOTc3Njg4MmVjYmY5ODY4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHV29ya2xpc3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29y a2xpc3QuY3BwCkBAIC00NCw3ICs0NCw3IEBAIFdvcmtsaXN0Ojp+V29ya2xpc3QoKQogICAgIHsK ICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbG9jayk7CiAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCi0gICAgICAgICAgICBtX3F1ZXVlLmFwcGVu ZChSZWZQdHI8UGxhbj4oMCkpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ug d2FudCB0aGUgdGhyZWFkIHRvIHRlcm1pbmF0ZS4KKyAgICAgICAgICAgIG1fcXVldWUuYXBwZW5k KG51bGxwdHIpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ugd2FudCB0aGUg dGhyZWFkIHRvIHRlcm1pbmF0ZS4KICAgICAgICAgbV9wbGFuRW5xdWV1ZWQuYnJvYWRjYXN0KCk7 CiAgICAgfQogICAgIGZvciAodW5zaWduZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgKaW5kZXggNjcw NWNiNTY2ZWRhN2FhNzNmOWNkOWVjNDcwZDBlZGY5MDRjYzNkYS4uNzNkNDRjMWRmYTVhZWM4MDhm OWMxNGI3ODRkNDkwYzI1NDE5YzM0MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0NhbGxGcmFtZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRl cnByZXRlci9DYWxsRnJhbWUuaApAQCAtMjc3LDggKzI3Nyw4IEBAIG5hbWVzcGFjZSBKU0MgIHsK ICNlbmRpZgogICAgICAgICBDYWxsRnJhbWUqIGNhbGxlckZyYW1lTm9GbGFncygpIHsgcmV0dXJu IGNhbGxlckZyYW1lKCktPnJlbW92ZUhvc3RDYWxsRnJhbWVGbGFnKCk7IH0KIAotICAgICAgICBK U19FWFBPUlRfUFJJVkFURSBTdGFja0l0ZXJhdG9yIGJlZ2luKFN0YWNrSXRlcmF0b3I6OkZyYW1l RmlsdGVyID0gMCk7Ci0gICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIFN0YWNrSXRlcmF0b3IgZmlu ZChKU0Z1bmN0aW9uKiBjYWxsZWVGdW5jdGlvbk9iaiwgU3RhY2tJdGVyYXRvcjo6RnJhbWVGaWx0 ZXIgPSAwKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgU3RhY2tJdGVyYXRvciBiZWdpbihT dGFja0l0ZXJhdG9yOjpGcmFtZUZpbHRlciA9IG51bGxwdHIpOworICAgICAgICBKU19FWFBPUlRf UFJJVkFURSBTdGFja0l0ZXJhdG9yIGZpbmQoSlNGdW5jdGlvbiogY2FsbGVlRnVuY3Rpb25PYmos IFN0YWNrSXRlcmF0b3I6OkZyYW1lRmlsdGVyID0gbnVsbHB0cik7CiAgICAgICAgIEpTX0VYUE9S VF9QUklWQVRFIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBlbmQoKTsKIAogICAgIHByaXZhdGU6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRv ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRvci5j cHAKaW5kZXggNzJjNTIxMGM5MDIxNWEwZGJkNTkzMDA0ZWRiZDc1OTkxMDQ1Y2ZiMi4uY2I1Y2Zl ODVhZTgyMmYzZGM1ODgwMDRmZjIyNWIzMjUxMDY2MDZmOSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcApAQCAtNjcsMTggKzY3 LDE4IEBAIHZvaWQgU3RhY2tJdGVyYXRvcjo6ZmluZChKU0Z1bmN0aW9uKiBmdW5jdGlvbk9iaikK IFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpDb2RlVHlwZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6Y29k ZVR5cGUoKSBjb25zdAogewogICAgIGlmICghaXNKU0ZyYW1lKCkpCi0gICAgICAgIHJldHVybiBT dGFja0l0ZXJhdG9yOjpGcmFtZTo6TmF0aXZlOworICAgICAgICByZXR1cm4gQ29kZVR5cGU6Ok5h dGl2ZTsKIAogICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmNvZGVUeXBlKCkpIHsKICAgICBjYXNl IEV2YWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6OkV2YWw7Cisg ICAgICAgIHJldHVybiBDb2RlVHlwZTo6RXZhbDsKICAgICBjYXNlIEZ1bmN0aW9uQ29kZToKLSAg ICAgICAgcmV0dXJuIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpGdW5jdGlvbjsKKyAgICAgICAgcmV0 dXJuIENvZGVUeXBlOjpGdW5jdGlvbjsKICAgICBjYXNlIEdsb2JhbENvZGU6Ci0gICAgICAgIHJl dHVybiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6R2xvYmFsOworICAgICAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKICAgICB9CiAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6Okdsb2JhbDsKKyAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKIH0KIAogU3RyaW5nIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpmdW5jdGlvbk5h bWUoKQpAQCAtODcsMTcgKzg3LDE3IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6ZnVu Y3Rpb25OYW1lKCkKICAgICBKU09iamVjdCogY2FsbGVlID0gdGhpcy0+Y2FsbGVlKCk7CiAKICAg ICBzd2l0Y2ggKGNvZGVUeXBlKCkpIHsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpF dmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkV2YWw6CiAgICAgICAgIHRyYWNlTGluZSA9ICJldmFs IGNvZGUiOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpO YXRpdmU6CisgICAgY2FzZSBDb2RlVHlwZTo6TmF0aXZlOgogICAgICAgICBpZiAoY2FsbGVlKQog ICAgICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERpc3BsYXlOYW1lKGNhbGxGcmFt ZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTdGFja0l0ZXJh dG9yOjpGcmFtZTo6RnVuY3Rpb246CisgICAgY2FzZSBDb2RlVHlwZTo6RnVuY3Rpb246CiAgICAg ICAgIHRyYWNlTGluZSA9IGdldENhbGN1bGF0ZWREaXNwbGF5TmFtZShjYWxsRnJhbWUoKSwgY2Fs bGVlKS5pbXBsKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJh bWU6Okdsb2JhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpHbG9iYWw6CiAgICAgICAgIHRyYWNlTGlu ZSA9ICJnbG9iYWwgY29kZSI7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTEwOSwxNSArMTA5 LDE1IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6c291cmNlVVJMKCkKICAgICBTdHJp bmcgdHJhY2VMaW5lOwogCiAgICAgc3dpdGNoIChjb2RlVHlwZSgpKSB7Ci0gICAgY2FzZSBTdGFj a0l0ZXJhdG9yOjpGcmFtZTo6RXZhbDoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpG dW5jdGlvbjoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpHbG9iYWw6IHsKKyAgICBj YXNlIENvZGVUeXBlOjpFdmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0aW9uOgorICAgIGNh c2UgQ29kZVR5cGU6Okdsb2JhbDogewogICAgICAgICBTdHJpbmcgc291cmNlVVJMID0gY29kZUJs b2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLT5zb3VyY2VVUkwoKTsKICAgICAgICAgaWYgKCFzb3Vy Y2VVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gc291cmNlVVJMLmltcGwo KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJhbWU6 Ok5hdGl2ZToKKyAgICBjYXNlIENvZGVUeXBlOjpOYXRpdmU6CiAgICAgICAgIHRyYWNlTGluZSA9 ICJbbmF0aXZlIGNvZGVdIjsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMjE5LDcgKzIxOSw3 IEBAIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6bG9naWNhbEZy YW1lKCkKICAgICBpZiAoIW91dGVyTW9zdENvZGVCbG9jay0+Y2FuR2V0Q29kZU9yaWdpbihpbmRl eCkpIHsKICAgICAgICAgLy8gU2VlIGFib3ZlLiBJbiByZWxlYXNlIGJ1aWxkcywgd2UgdHJ5IHRv IHByb3RlY3Qgb3Vyc2VsdmVzIGZyb20gY3Jhc2hpbmcgZXZlbgogICAgICAgICAvLyB0aG91Z2gg c3RhY2sgd2Fsa2luZyB3aWxsIGJlIGdvb2ZlZCB1cC4KLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIENvZGVPcmlnaW4gY29kZU9yaWdpbiA9 IG91dGVyTW9zdENvZGVCbG9jay0+Y29kZU9yaWdpbihpbmRleCk7CkBAIC0zNDIsNyArMzQyLDcg QEAgdm9pZCBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6cHJpbnQoaW50IGluZGVudExldmVsKQogICAg IHByaW50aWYoaSwgImZyYW1lICVwIHtcbiIsIHRoaXMpOwogCiAgICAgQ2FsbEZyYW1lKiBjYWxs ZXJGcmFtZSA9IHRoaXMtPmNhbGxlckZyYW1lKCk7Ci0gICAgdm9pZCogcmV0dXJuUEMgPSBoYXNS ZXR1cm5QQygpID8gdGhpcy0+cmV0dXJuUEMoKS52YWx1ZSgpIDogMDsKKyAgICB2b2lkKiByZXR1 cm5QQyA9IGhhc1JldHVyblBDKCkgPyB0aGlzLT5yZXR1cm5QQygpLnZhbHVlKCkgOiBudWxscHRy OwogCiAgICAgcHJpbnRpZihpLCAiICAgbmFtZSAnJXMnXG4iLCBmdW5jdGlvbk5hbWUoKS51dGY4 KCkuZGF0YSgpKTsKICAgICBwcmludGlmKGksICIgICBzb3VyY2VVUkwgJyVzJ1xuIiwgc291cmNl VVJMKCkudXRmOCgpLmRhdGEoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9FeGVjdXRhYmxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4 ZWN1dGFibGUuY3BwCmluZGV4IDI5ODNlZGIzMmNlOGY2MDI3MDZiZmViMWJiYTQ0NWQ2Njc1ZDQ3 MmYuLjRhNjJmMGEwMzAxYTYxNzQzYzIxNWU1ZWZhMjAxM2UzNzI2NWJlM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCkBAIC0xMjEsNyArMTIxLDcg QEAgRXZhbEV4ZWN1dGFibGUqIEV2YWxFeGVjdXRhYmxlOjpjcmVhdGUoRXhlY1N0YXRlKiBleGVj LCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0ID0gZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpOwogICAgIGlmICghZ2xvYmFsT2JqZWN0 LT5ldmFsRW5hYmxlZCgpKSB7CiAgICAgICAgIHRocm93RXJyb3IoZXhlYywgY3JlYXRlRXZhbEVy cm9yKGV4ZWMsIGdsb2JhbE9iamVjdC0+ZXZhbERpc2FibGVkRXJyb3JNZXNzYWdlKCkpKTsKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIEV2 YWxFeGVjdXRhYmxlKiBleGVjdXRhYmxlID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RXZh bEV4ZWN1dGFibGU+KCpleGVjLT5oZWFwKCkpKSBFdmFsRXhlY3V0YWJsZShleGVjLCBzb3VyY2Us IGlzSW5TdHJpY3RDb250ZXh0KTsKQEAgLTEyOSw3ICsxMjksNyBAQCBFdmFsRXhlY3V0YWJsZSog RXZhbEV4ZWN1dGFibGU6OmNyZWF0ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNvZGUm IHNvdXJjZQogCiAgICAgVW5saW5rZWRFdmFsQ29kZUJsb2NrKiB1bmxpbmtlZEV2YWxDb2RlID0g Z2xvYmFsT2JqZWN0LT5jcmVhdGVFdmFsQ29kZUJsb2NrKGV4ZWMsIGV4ZWN1dGFibGUpOwogICAg IGlmICghdW5saW5rZWRFdmFsQ29kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgZXhlY3V0YWJsZS0+bV91bmxpbmtlZEV2YWxDb2RlQmxvY2suc2V0 KGV4ZWMtPnZtKCksIGV4ZWN1dGFibGUsIHVubGlua2VkRXZhbENvZGUpOwogCkBAIC0yMTEsNyAr MjExLDcgQEAgaW5saW5lIGNvbnN0IGNoYXIqIHNhbXBsaW5nRGVzY3JpcHRpb24oSklUQ29kZTo6 SklUVHlwZSBqaXRUeXBlKQogICAgICAgICByZXR1cm4gIkZUTCBDb21waWxhdGlvbiAoVE9UQUwp IjsKICAgICBkZWZhdWx0OgogICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogfQogCkBA IC0yMzcsNyArMjM3LDcgQEAgSlNPYmplY3QqIEV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSklUQ28KICAgICBpZiAocmVzdWx0 KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0 dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTI5Myw3ICsyOTMsNyBA QCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmNoZWNrU3ludGF4KEV4ZWNTdGF0ZSogZXhl YykKICAgICBKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGlj YWxHbG9iYWxPYmplY3QoKTsKICAgICBSZWZQdHI8UHJvZ3JhbU5vZGU+IHByb2dyYW1Ob2RlID0g cGFyc2U8UHJvZ3JhbU5vZGU+KHZtLCBtX3NvdXJjZSwgMCwgSWRlbnRpZmllcigpLCBKU1BhcnNl Tm9ybWFsLCBQcm9ncmFtTm9kZTo6aXNGdW5jdGlvbk5vZGUgPyBKU1BhcnNlRnVuY3Rpb25Db2Rl IDogSlNQYXJzZVByb2dyYW1Db2RlLCBlcnJvcik7CiAgICAgaWYgKHByb2dyYW1Ob2RlKQotICAg ICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgQVNTRVJUKGVycm9y Lm1fdHlwZSAhPSBQYXJzZXJFcnJvcjo6RXJyb3JOb25lKTsKICAgICByZXR1cm4gZXJyb3IudG9F cnJvck9iamVjdChsZXhpY2FsR2xvYmFsT2JqZWN0LCBtX3NvdXJjZSk7CiB9CkBAIC0zNDEsNyAr MzQxLDcgQEAgSlNPYmplY3QqIFByb2dyYW1FeGVjdXRhYmxlOjpjb21waWxlSW50ZXJuYWwoRXhl Y1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSkkKICAgICBpZiAocmVzdWx0KQogICAgICAg ICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxw dHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTQxMCw3ICs0MTAsNyBAQCBKU09iamVj dCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKFZNJiB2bSwg Q2FsbEZyYW1lKiBjYWxsRgogCiAgICAgc2l6ZV90IG5ld0dsb2JhbHMgPSB2YXJpYWJsZURlY2xh cmF0aW9ucy5zaXplKCkgKyBmdW5jdGlvbkRlY2xhcmF0aW9ucy5zaXplKCk7CiAgICAgaWYgKCFu ZXdHbG9iYWxzKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgZ2xvYmFsT2JqZWN0LT5hZGRSZWdpc3RlcnMobmV3R2xvYmFscyk7CiAgICAgQ2FsbEZyYW1l KiBnbG9iYWxFeGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAKQEAgLTQzMCw3ICs0 MzAsNyBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9w ZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgogICAgICAgICAgICAgKHZhcmlhYmxlRGVj bGFyYXRpb25zW2ldLnNlY29uZCAmIERlY2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50KSA/IElz Q29uc3RhbnQgOiBJc1ZhcmlhYmxlLAogICAgICAgICAgICAgTm90RnVuY3Rpb25Pck5vdFNwZWNp YWxpemFibGUpOwogICAgIH0KLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0K IAogdm9pZCBQcm9ncmFtRXhlY3V0YWJsZTo6dmlzaXRDaGlsZHJlbihKU0NlbGwqIGNlbGwsIFNs b3RWaXNpdG9yJiB2aXNpdG9yKQpAQCAtNDYyLDcgKzQ2Miw3IEBAIEZ1bmN0aW9uQ29kZUJsb2Nr KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmJhc2VsaW5lQ29kZUJsb2NrRm9yKENvZGVTcGVjaWFsaXph dGlvbktpCiAgICAgICAgIHJlc3VsdCA9IG1fY29kZUJsb2NrRm9yQ29uc3RydWN0LmdldCgpOwog ICAgIH0KICAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIHdoaWxlIChyZXN1bHQtPmFsdGVybmF0aXZlKCkpCiAgICAgICAgIHJl c3VsdCA9IHN0YXRpY19jYXN0PEZ1bmN0aW9uQ29kZUJsb2NrKj4ocmVzdWx0LT5hbHRlcm5hdGl2 ZSgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChyZXN1bHQpOwpAQCAtNTMwLDcgKzUzMCw3IEBAIFBh c3NSZWZQdHI8RnVuY3Rpb25Db2RlQmxvY2s+IEZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNv ZGVCbG9ja0ZvcihKU1Njb3BlKiBzCiAKICAgICBpZiAoIXVubGlua2VkQ29kZUJsb2NrKSB7CiAg ICAgICAgIGV4Y2VwdGlvbiA9IGVycm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBtX3Nv dXJjZSk7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAKICAgICBTb3VyY2VQcm92aWRlciogcHJvdmlkZXIgPSBzb3VyY2UoKS5wcm92aWRlcigpOwpA QCAtNTYxLDcgKzU2MSw3IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNvbXBpbGVG b3JDYWxsSW50ZXJuYWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzCiAgICAgICAgIGJ5dGVj b2RlSW5kZXgsIENvZGVGb3JDYWxsKTsKICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0 ID0gdGhlUmVzdWx0OwotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiAj aWYgRU5BQkxFKERGR19KSVQpCkBAIC01OTMsNyArNTkzLDcgQEAgSlNPYmplY3QqIEZ1bmN0aW9u RXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdEludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywg SlNTY28KICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0g ICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJ VCkKQEAgLTY3NCw3ICs2NzQsNyBAQCBGdW5jdGlvbkV4ZWN1dGFibGUqIEZ1bmN0aW9uRXhlY3V0 YWJsZTo6ZnJvbUdsb2JhbENvZGUoY29uc3QgSWRlbnRpZmllciYgbmFtZSwgRQogewogICAgIFVu bGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlKiB1bmxpbmtlZEZ1bmN0aW9uID0gVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2RlKG5hbWUsIGV4ZWMsIGRlYnVnZ2VyLCBzb3Vy Y2UsIGV4Y2VwdGlvbik7CiAgICAgaWYgKCF1bmxpbmtlZEZ1bmN0aW9uKQotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgdW5zaWduZWQgZmlyc3RMaW5lID0g c291cmNlLmZpcnN0TGluZSgpICsgdW5saW5rZWRGdW5jdGlvbi0+Zmlyc3RMaW5lT2Zmc2V0KCk7 CiAgICAgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSBzb3VyY2Uuc3RhcnRPZmZzZXQoKSArIHVubGlu a2VkRnVuY3Rpb24tPnN0YXJ0T2Zmc2V0KCk7CiAgICAgdW5zaWduZWQgc3RhcnRDb2x1bW4gPSBz b3VyY2Uuc3RhcnRDb2x1bW4oKTsK 207747 2013-07-30 10:42:42 -0700 2013-07-30 11:12:44 -0700 Patch bug-119266-20130730194240.patch text/plain 13020 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MTJlMTEwYWY3NDIzN2UyMTQ0NjliNDMyZjk4MTM1M2NmODRmYTViLi40NWY2OTgyOTc4MzZlOWRk NjM5MzNiNTE5ZWU4YWI4YTc0NGRiODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNyBAQAorMjAxMy0wNy0zMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFBhcnRpYWxseSBy ZXZlcnQgcjE1MzI5OSwgcjE1MzMwMSwgcjE1MzMxNCwgcjE1MzMyMSBhbmQgcjE1MzMyMi4KKyAg ICAgICAgQWRkaXRpb25hbGx5IGFkZCBtb3JlIG51bGxwdHIgdG8gcnVudGltZS9FeGVjdXRhYmxl LmNwcC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGJ5dGVjb2RlL0dldEJ5SWRTdGF0dXMuaDoKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1czo6 R2V0QnlJZFN0YXR1cyk6CisgICAgICAgICogZGZnL0RGR1dvcmtsaXN0LmNwcDoKKyAgICAgICAg KEpTQzo6REZHOjpXb3JrbGlzdDo6fldvcmtsaXN0KToKKyAgICAgICAgKiBpbnRlcnByZXRlci9D YWxsRnJhbWUuaDoKKyAgICAgICAgKiBpbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcDoKKyAg ICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmNvZGVUeXBlKToKKyAgICAgICAgKEpT Qzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmZ1bmN0aW9uTmFtZSk6CisgICAgICAgIChKU0M6OlN0 YWNrSXRlcmF0b3I6OkZyYW1lOjpzb3VyY2VVUkwpOgorICAgICAgICAoSlNDOjpTdGFja0l0ZXJh dG9yOjpGcmFtZTo6bG9naWNhbEZyYW1lKToKKyAgICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6 RnJhbWU6OnByaW50KToKKyAgICAgICAgKiBydW50aW1lL0V4ZWN1dGFibGUuY3BwOgorICAgICAg ICAoSlNDOjpFdmFsRXhlY3V0YWJsZTo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6c2FtcGxpbmdE ZXNjcmlwdGlvbik6CisgICAgICAgIChKU0M6OkV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwpOgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y2hlY2tTeW50YXgpOgorICAg ICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKToKKyAgICAgICAg KEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKToKKyAg ICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpiYXNlbGluZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNhbGxJbnRlcm5hbCk6 CisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdElu dGVybmFsKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpmcm9tR2xvYmFsQ29k ZSk6CisKIDIwMTMtMDctMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXRCeUlkU3RhdHVzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCmluZGV4IDVhOTFkZjQy ZWRjYzVlNjg3M2RiZmVhZDBmOTc2YWRiOWRjYjk3ZmUuLjg0NGFmYTgzMGFkMmMwODgyMThhMTg4 ZmY2NmU5N2ZiODk1ZTlmYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9HZXRCeUlkU3RhdHVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0dldEJ5SWRTdGF0dXMuaApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgR2V0 QnlJZFN0YXR1cygKICAgICAgICAgU3RhdGUgc3RhdGUsIGJvb2wgd2FzU2VlbkluSklULCBjb25z dCBTdHJ1Y3R1cmVTZXQmIHN0cnVjdHVyZVNldCA9IFN0cnVjdHVyZVNldCgpLAotICAgICAgICBQ cm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1ZhbHVlIHNwZWNpZmljVmFs dWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1cmVDaGFpbj4gY2hhaW4g PSAwKQorICAgICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1Zh bHVlIHNwZWNpZmljVmFsdWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1 cmVDaGFpbj4gY2hhaW4gPSBudWxscHRyKQogICAgICAgICA6IG1fc3RhdGUoc3RhdGUpCiAgICAg ICAgICwgbV9zdHJ1Y3R1cmVTZXQoc3RydWN0dXJlU2V0KQogICAgICAgICAsIG1fY2hhaW4oY2hh aW4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCmluZGV4IGE3M2U1 NmQ1NDhkODAzMGZjZGVkOTQ2MjY0YWRhNjE4YWY1NThlNjMuLjQ0MzZjMGQ5M2QyYzIzMzY5OWU2 ODNhOTc3Njg4MmVjYmY5ODY4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHV29ya2xpc3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29y a2xpc3QuY3BwCkBAIC00NCw3ICs0NCw3IEBAIFdvcmtsaXN0Ojp+V29ya2xpc3QoKQogICAgIHsK ICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbG9jayk7CiAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCi0gICAgICAgICAgICBtX3F1ZXVlLmFwcGVu ZChSZWZQdHI8UGxhbj4oMCkpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ug d2FudCB0aGUgdGhyZWFkIHRvIHRlcm1pbmF0ZS4KKyAgICAgICAgICAgIG1fcXVldWUuYXBwZW5k KG51bGxwdHIpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ugd2FudCB0aGUg dGhyZWFkIHRvIHRlcm1pbmF0ZS4KICAgICAgICAgbV9wbGFuRW5xdWV1ZWQuYnJvYWRjYXN0KCk7 CiAgICAgfQogICAgIGZvciAodW5zaWduZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgKaW5kZXggNjcw NWNiNTY2ZWRhN2FhNzNmOWNkOWVjNDcwZDBlZGY5MDRjYzNkYS4uNzNkNDRjMWRmYTVhZWM4MDhm OWMxNGI3ODRkNDkwYzI1NDE5YzM0MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0NhbGxGcmFtZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRl cnByZXRlci9DYWxsRnJhbWUuaApAQCAtMjc3LDggKzI3Nyw4IEBAIG5hbWVzcGFjZSBKU0MgIHsK ICNlbmRpZgogICAgICAgICBDYWxsRnJhbWUqIGNhbGxlckZyYW1lTm9GbGFncygpIHsgcmV0dXJu IGNhbGxlckZyYW1lKCktPnJlbW92ZUhvc3RDYWxsRnJhbWVGbGFnKCk7IH0KIAotICAgICAgICBK U19FWFBPUlRfUFJJVkFURSBTdGFja0l0ZXJhdG9yIGJlZ2luKFN0YWNrSXRlcmF0b3I6OkZyYW1l RmlsdGVyID0gMCk7Ci0gICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIFN0YWNrSXRlcmF0b3IgZmlu ZChKU0Z1bmN0aW9uKiBjYWxsZWVGdW5jdGlvbk9iaiwgU3RhY2tJdGVyYXRvcjo6RnJhbWVGaWx0 ZXIgPSAwKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgU3RhY2tJdGVyYXRvciBiZWdpbihT dGFja0l0ZXJhdG9yOjpGcmFtZUZpbHRlciA9IG51bGxwdHIpOworICAgICAgICBKU19FWFBPUlRf UFJJVkFURSBTdGFja0l0ZXJhdG9yIGZpbmQoSlNGdW5jdGlvbiogY2FsbGVlRnVuY3Rpb25PYmos IFN0YWNrSXRlcmF0b3I6OkZyYW1lRmlsdGVyID0gbnVsbHB0cik7CiAgICAgICAgIEpTX0VYUE9S VF9QUklWQVRFIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBlbmQoKTsKIAogICAgIHByaXZhdGU6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRv ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRvci5j cHAKaW5kZXggNzJjNTIxMGM5MDIxNWEwZGJkNTkzMDA0ZWRiZDc1OTkxMDQ1Y2ZiMi4uY2I1Y2Zl ODVhZTgyMmYzZGM1ODgwMDRmZjIyNWIzMjUxMDY2MDZmOSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcApAQCAtNjcsMTggKzY3 LDE4IEBAIHZvaWQgU3RhY2tJdGVyYXRvcjo6ZmluZChKU0Z1bmN0aW9uKiBmdW5jdGlvbk9iaikK IFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpDb2RlVHlwZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6Y29k ZVR5cGUoKSBjb25zdAogewogICAgIGlmICghaXNKU0ZyYW1lKCkpCi0gICAgICAgIHJldHVybiBT dGFja0l0ZXJhdG9yOjpGcmFtZTo6TmF0aXZlOworICAgICAgICByZXR1cm4gQ29kZVR5cGU6Ok5h dGl2ZTsKIAogICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmNvZGVUeXBlKCkpIHsKICAgICBjYXNl IEV2YWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6OkV2YWw7Cisg ICAgICAgIHJldHVybiBDb2RlVHlwZTo6RXZhbDsKICAgICBjYXNlIEZ1bmN0aW9uQ29kZToKLSAg ICAgICAgcmV0dXJuIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpGdW5jdGlvbjsKKyAgICAgICAgcmV0 dXJuIENvZGVUeXBlOjpGdW5jdGlvbjsKICAgICBjYXNlIEdsb2JhbENvZGU6Ci0gICAgICAgIHJl dHVybiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6R2xvYmFsOworICAgICAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKICAgICB9CiAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6Okdsb2JhbDsKKyAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKIH0KIAogU3RyaW5nIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpmdW5jdGlvbk5h bWUoKQpAQCAtODcsMTcgKzg3LDE3IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6ZnVu Y3Rpb25OYW1lKCkKICAgICBKU09iamVjdCogY2FsbGVlID0gdGhpcy0+Y2FsbGVlKCk7CiAKICAg ICBzd2l0Y2ggKGNvZGVUeXBlKCkpIHsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpF dmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkV2YWw6CiAgICAgICAgIHRyYWNlTGluZSA9ICJldmFs IGNvZGUiOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpO YXRpdmU6CisgICAgY2FzZSBDb2RlVHlwZTo6TmF0aXZlOgogICAgICAgICBpZiAoY2FsbGVlKQog ICAgICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERpc3BsYXlOYW1lKGNhbGxGcmFt ZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTdGFja0l0ZXJh dG9yOjpGcmFtZTo6RnVuY3Rpb246CisgICAgY2FzZSBDb2RlVHlwZTo6RnVuY3Rpb246CiAgICAg ICAgIHRyYWNlTGluZSA9IGdldENhbGN1bGF0ZWREaXNwbGF5TmFtZShjYWxsRnJhbWUoKSwgY2Fs bGVlKS5pbXBsKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJh bWU6Okdsb2JhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpHbG9iYWw6CiAgICAgICAgIHRyYWNlTGlu ZSA9ICJnbG9iYWwgY29kZSI7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTEwOSwxNSArMTA5 LDE1IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6c291cmNlVVJMKCkKICAgICBTdHJp bmcgdHJhY2VMaW5lOwogCiAgICAgc3dpdGNoIChjb2RlVHlwZSgpKSB7Ci0gICAgY2FzZSBTdGFj a0l0ZXJhdG9yOjpGcmFtZTo6RXZhbDoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpG dW5jdGlvbjoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpHbG9iYWw6IHsKKyAgICBj YXNlIENvZGVUeXBlOjpFdmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0aW9uOgorICAgIGNh c2UgQ29kZVR5cGU6Okdsb2JhbDogewogICAgICAgICBTdHJpbmcgc291cmNlVVJMID0gY29kZUJs b2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLT5zb3VyY2VVUkwoKTsKICAgICAgICAgaWYgKCFzb3Vy Y2VVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gc291cmNlVVJMLmltcGwo KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJhbWU6 Ok5hdGl2ZToKKyAgICBjYXNlIENvZGVUeXBlOjpOYXRpdmU6CiAgICAgICAgIHRyYWNlTGluZSA9 ICJbbmF0aXZlIGNvZGVdIjsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMjE5LDcgKzIxOSw3 IEBAIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6bG9naWNhbEZy YW1lKCkKICAgICBpZiAoIW91dGVyTW9zdENvZGVCbG9jay0+Y2FuR2V0Q29kZU9yaWdpbihpbmRl eCkpIHsKICAgICAgICAgLy8gU2VlIGFib3ZlLiBJbiByZWxlYXNlIGJ1aWxkcywgd2UgdHJ5IHRv IHByb3RlY3Qgb3Vyc2VsdmVzIGZyb20gY3Jhc2hpbmcgZXZlbgogICAgICAgICAvLyB0aG91Z2gg c3RhY2sgd2Fsa2luZyB3aWxsIGJlIGdvb2ZlZCB1cC4KLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIENvZGVPcmlnaW4gY29kZU9yaWdpbiA9 IG91dGVyTW9zdENvZGVCbG9jay0+Y29kZU9yaWdpbihpbmRleCk7CkBAIC0zNDIsNyArMzQyLDcg QEAgdm9pZCBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6cHJpbnQoaW50IGluZGVudExldmVsKQogICAg IHByaW50aWYoaSwgImZyYW1lICVwIHtcbiIsIHRoaXMpOwogCiAgICAgQ2FsbEZyYW1lKiBjYWxs ZXJGcmFtZSA9IHRoaXMtPmNhbGxlckZyYW1lKCk7Ci0gICAgdm9pZCogcmV0dXJuUEMgPSBoYXNS ZXR1cm5QQygpID8gdGhpcy0+cmV0dXJuUEMoKS52YWx1ZSgpIDogMDsKKyAgICB2b2lkKiByZXR1 cm5QQyA9IGhhc1JldHVyblBDKCkgPyB0aGlzLT5yZXR1cm5QQygpLnZhbHVlKCkgOiBudWxscHRy OwogCiAgICAgcHJpbnRpZihpLCAiICAgbmFtZSAnJXMnXG4iLCBmdW5jdGlvbk5hbWUoKS51dGY4 KCkuZGF0YSgpKTsKICAgICBwcmludGlmKGksICIgICBzb3VyY2VVUkwgJyVzJ1xuIiwgc291cmNl VVJMKCkudXRmOCgpLmRhdGEoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9FeGVjdXRhYmxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4 ZWN1dGFibGUuY3BwCmluZGV4IDI5ODNlZGIzMmNlOGY2MDI3MDZiZmViMWJiYTQ0NWQ2Njc1ZDQ3 MmYuLjRhNjJmMGEwMzAxYTYxNzQzYzIxNWU1ZWZhMjAxM2UzNzI2NWJlM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCkBAIC0xMjEsNyArMTIxLDcg QEAgRXZhbEV4ZWN1dGFibGUqIEV2YWxFeGVjdXRhYmxlOjpjcmVhdGUoRXhlY1N0YXRlKiBleGVj LCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0ID0gZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpOwogICAgIGlmICghZ2xvYmFsT2JqZWN0 LT5ldmFsRW5hYmxlZCgpKSB7CiAgICAgICAgIHRocm93RXJyb3IoZXhlYywgY3JlYXRlRXZhbEVy cm9yKGV4ZWMsIGdsb2JhbE9iamVjdC0+ZXZhbERpc2FibGVkRXJyb3JNZXNzYWdlKCkpKTsKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIEV2 YWxFeGVjdXRhYmxlKiBleGVjdXRhYmxlID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RXZh bEV4ZWN1dGFibGU+KCpleGVjLT5oZWFwKCkpKSBFdmFsRXhlY3V0YWJsZShleGVjLCBzb3VyY2Us IGlzSW5TdHJpY3RDb250ZXh0KTsKQEAgLTEyOSw3ICsxMjksNyBAQCBFdmFsRXhlY3V0YWJsZSog RXZhbEV4ZWN1dGFibGU6OmNyZWF0ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNvZGUm IHNvdXJjZQogCiAgICAgVW5saW5rZWRFdmFsQ29kZUJsb2NrKiB1bmxpbmtlZEV2YWxDb2RlID0g Z2xvYmFsT2JqZWN0LT5jcmVhdGVFdmFsQ29kZUJsb2NrKGV4ZWMsIGV4ZWN1dGFibGUpOwogICAg IGlmICghdW5saW5rZWRFdmFsQ29kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgZXhlY3V0YWJsZS0+bV91bmxpbmtlZEV2YWxDb2RlQmxvY2suc2V0 KGV4ZWMtPnZtKCksIGV4ZWN1dGFibGUsIHVubGlua2VkRXZhbENvZGUpOwogCkBAIC0yMTEsNyAr MjExLDcgQEAgaW5saW5lIGNvbnN0IGNoYXIqIHNhbXBsaW5nRGVzY3JpcHRpb24oSklUQ29kZTo6 SklUVHlwZSBqaXRUeXBlKQogICAgICAgICByZXR1cm4gIkZUTCBDb21waWxhdGlvbiAoVE9UQUwp IjsKICAgICBkZWZhdWx0OgogICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogfQogCkBA IC0yMzcsNyArMjM3LDcgQEAgSlNPYmplY3QqIEV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSklUQ28KICAgICBpZiAocmVzdWx0 KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0 dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTI5Myw3ICsyOTMsNyBA QCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmNoZWNrU3ludGF4KEV4ZWNTdGF0ZSogZXhl YykKICAgICBKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGlj YWxHbG9iYWxPYmplY3QoKTsKICAgICBSZWZQdHI8UHJvZ3JhbU5vZGU+IHByb2dyYW1Ob2RlID0g cGFyc2U8UHJvZ3JhbU5vZGU+KHZtLCBtX3NvdXJjZSwgMCwgSWRlbnRpZmllcigpLCBKU1BhcnNl Tm9ybWFsLCBQcm9ncmFtTm9kZTo6aXNGdW5jdGlvbk5vZGUgPyBKU1BhcnNlRnVuY3Rpb25Db2Rl IDogSlNQYXJzZVByb2dyYW1Db2RlLCBlcnJvcik7CiAgICAgaWYgKHByb2dyYW1Ob2RlKQotICAg ICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgQVNTRVJUKGVycm9y Lm1fdHlwZSAhPSBQYXJzZXJFcnJvcjo6RXJyb3JOb25lKTsKICAgICByZXR1cm4gZXJyb3IudG9F cnJvck9iamVjdChsZXhpY2FsR2xvYmFsT2JqZWN0LCBtX3NvdXJjZSk7CiB9CkBAIC0zNDEsNyAr MzQxLDcgQEAgSlNPYmplY3QqIFByb2dyYW1FeGVjdXRhYmxlOjpjb21waWxlSW50ZXJuYWwoRXhl Y1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSkkKICAgICBpZiAocmVzdWx0KQogICAgICAg ICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxw dHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTQxMCw3ICs0MTAsNyBAQCBKU09iamVj dCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKFZNJiB2bSwg Q2FsbEZyYW1lKiBjYWxsRgogCiAgICAgc2l6ZV90IG5ld0dsb2JhbHMgPSB2YXJpYWJsZURlY2xh cmF0aW9ucy5zaXplKCkgKyBmdW5jdGlvbkRlY2xhcmF0aW9ucy5zaXplKCk7CiAgICAgaWYgKCFu ZXdHbG9iYWxzKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgZ2xvYmFsT2JqZWN0LT5hZGRSZWdpc3RlcnMobmV3R2xvYmFscyk7CiAgICAgQ2FsbEZyYW1l KiBnbG9iYWxFeGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAKQEAgLTQzMCw3ICs0 MzAsNyBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9w ZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgogICAgICAgICAgICAgKHZhcmlhYmxlRGVj bGFyYXRpb25zW2ldLnNlY29uZCAmIERlY2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50KSA/IElz Q29uc3RhbnQgOiBJc1ZhcmlhYmxlLAogICAgICAgICAgICAgTm90RnVuY3Rpb25Pck5vdFNwZWNp YWxpemFibGUpOwogICAgIH0KLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0K IAogdm9pZCBQcm9ncmFtRXhlY3V0YWJsZTo6dmlzaXRDaGlsZHJlbihKU0NlbGwqIGNlbGwsIFNs b3RWaXNpdG9yJiB2aXNpdG9yKQpAQCAtNDYyLDcgKzQ2Miw3IEBAIEZ1bmN0aW9uQ29kZUJsb2Nr KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmJhc2VsaW5lQ29kZUJsb2NrRm9yKENvZGVTcGVjaWFsaXph dGlvbktpCiAgICAgICAgIHJlc3VsdCA9IG1fY29kZUJsb2NrRm9yQ29uc3RydWN0LmdldCgpOwog ICAgIH0KICAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIHdoaWxlIChyZXN1bHQtPmFsdGVybmF0aXZlKCkpCiAgICAgICAgIHJl c3VsdCA9IHN0YXRpY19jYXN0PEZ1bmN0aW9uQ29kZUJsb2NrKj4ocmVzdWx0LT5hbHRlcm5hdGl2 ZSgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChyZXN1bHQpOwpAQCAtNTMwLDcgKzUzMCw3IEBAIFBh c3NSZWZQdHI8RnVuY3Rpb25Db2RlQmxvY2s+IEZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNv ZGVCbG9ja0ZvcihKU1Njb3BlKiBzCiAKICAgICBpZiAoIXVubGlua2VkQ29kZUJsb2NrKSB7CiAg ICAgICAgIGV4Y2VwdGlvbiA9IGVycm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBtX3Nv dXJjZSk7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAKICAgICBTb3VyY2VQcm92aWRlciogcHJvdmlkZXIgPSBzb3VyY2UoKS5wcm92aWRlcigpOwpA QCAtNTYxLDcgKzU2MSw3IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNvbXBpbGVG b3JDYWxsSW50ZXJuYWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzCiAgICAgICAgIGJ5dGVj b2RlSW5kZXgsIENvZGVGb3JDYWxsKTsKICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0 ID0gdGhlUmVzdWx0OwotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiAj aWYgRU5BQkxFKERGR19KSVQpCkBAIC01OTMsNyArNTkzLDcgQEAgSlNPYmplY3QqIEZ1bmN0aW9u RXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdEludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywg SlNTY28KICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0g ICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJ VCkKQEAgLTY3NCw3ICs2NzQsNyBAQCBGdW5jdGlvbkV4ZWN1dGFibGUqIEZ1bmN0aW9uRXhlY3V0 YWJsZTo6ZnJvbUdsb2JhbENvZGUoY29uc3QgSWRlbnRpZmllciYgbmFtZSwgRQogewogICAgIFVu bGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlKiB1bmxpbmtlZEZ1bmN0aW9uID0gVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2RlKG5hbWUsIGV4ZWMsIGRlYnVnZ2VyLCBzb3Vy Y2UsIGV4Y2VwdGlvbik7CiAgICAgaWYgKCF1bmxpbmtlZEZ1bmN0aW9uKQotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgdW5zaWduZWQgZmlyc3RMaW5lID0g c291cmNlLmZpcnN0TGluZSgpICsgdW5saW5rZWRGdW5jdGlvbi0+Zmlyc3RMaW5lT2Zmc2V0KCk7 CiAgICAgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSBzb3VyY2Uuc3RhcnRPZmZzZXQoKSArIHVubGlu a2VkRnVuY3Rpb24tPnN0YXJ0T2Zmc2V0KCk7CiAgICAgdW5zaWduZWQgc3RhcnRDb2x1bW4gPSBz b3VyY2Uuc3RhcnRDb2x1bW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu cHJpIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKaW5kZXggYTFkYTA0NTFhYzVhZjhmMWYy M2QxN2Q0M2MwNWRhZTkxOTk2NmQ4Zi4uY2YxZDU0OWRkYTIxOGVlOWFmMGY0NTY2ZTQzMmE4NmNh ZWI4OGYyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKQEAgLTg1LDUgKzg1LDMgQEAgaGF2ZT8oUVRRVUlDSyk6 IFFUICs9IHFtbCBxdWljawogaGF2ZT8ocXRsb2NhdGlvbik6ZW5hYmxlPyhHRU9MT0NBVElPTik6 IFFUICs9IGxvY2F0aW9uCiAKIGVuYWJsZT8oU0VDQ09NUF9GSUxURVJTKTogUEtHQ09ORklHICs9 IGxpYnNlY2NvbXAKLQotQ09ORklHICs9IGMrKzExCmRpZmYgLS1naXQgYS8ucW1ha2UuY29uZiBi Ly5xbWFrZS5jb25mCmluZGV4IGQ1NzFhYTI4ZWE4NmMxNGM3ODgwNTMzYmYzYmE2OGU5ZWY0YjNj ODEuLjIyNGNiY2VjODBlNTYxMDUxNjBmMDBkNzExNGI5NDZiZDU2OTgxMzQgMTAwNjQ0Ci0tLSBh Ly5xbWFrZS5jb25mCisrKyBiLy5xbWFrZS5jb25mCkBAIC0xMSwzICsxMSw1IEBAIGV4aXN0cygk JFBXRC8uc3ZuKSB7CiBsb2FkKHF0X2J1aWxkX2NvbmZpZykKIAogTU9EVUxFX1ZFUlNJT04gPSA1 LjIuMAorCitDT05GSUcgKz0gYysrMTEK 207750 2013-07-30 11:12:50 -0700 2013-08-01 10:31:21 -0700 Patch bug-119266-20130730201248.patch text/plain 13020 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MTJlMTEwYWY3NDIzN2UyMTQ0NjliNDMyZjk4MTM1M2NmODRmYTViLi40NWY2OTgyOTc4MzZlOWRk NjM5MzNiNTE5ZWU4YWI4YTc0NGRiODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNyBAQAorMjAxMy0wNy0zMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFBhcnRpYWxseSBy ZXZlcnQgcjE1MzI5OSwgcjE1MzMwMSwgcjE1MzMxNCwgcjE1MzMyMSBhbmQgcjE1MzMyMi4KKyAg ICAgICAgQWRkaXRpb25hbGx5IGFkZCBtb3JlIG51bGxwdHIgdG8gcnVudGltZS9FeGVjdXRhYmxl LmNwcC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGJ5dGVjb2RlL0dldEJ5SWRTdGF0dXMuaDoKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1czo6 R2V0QnlJZFN0YXR1cyk6CisgICAgICAgICogZGZnL0RGR1dvcmtsaXN0LmNwcDoKKyAgICAgICAg KEpTQzo6REZHOjpXb3JrbGlzdDo6fldvcmtsaXN0KToKKyAgICAgICAgKiBpbnRlcnByZXRlci9D YWxsRnJhbWUuaDoKKyAgICAgICAgKiBpbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcDoKKyAg ICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmNvZGVUeXBlKToKKyAgICAgICAgKEpT Qzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OmZ1bmN0aW9uTmFtZSk6CisgICAgICAgIChKU0M6OlN0 YWNrSXRlcmF0b3I6OkZyYW1lOjpzb3VyY2VVUkwpOgorICAgICAgICAoSlNDOjpTdGFja0l0ZXJh dG9yOjpGcmFtZTo6bG9naWNhbEZyYW1lKToKKyAgICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6 RnJhbWU6OnByaW50KToKKyAgICAgICAgKiBydW50aW1lL0V4ZWN1dGFibGUuY3BwOgorICAgICAg ICAoSlNDOjpFdmFsRXhlY3V0YWJsZTo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6c2FtcGxpbmdE ZXNjcmlwdGlvbik6CisgICAgICAgIChKU0M6OkV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwpOgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y2hlY2tTeW50YXgpOgorICAg ICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKToKKyAgICAgICAg KEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKToKKyAg ICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpiYXNlbGluZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNvZGVCbG9ja0Zvcik6Cisg ICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNhbGxJbnRlcm5hbCk6 CisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdElu dGVybmFsKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpmcm9tR2xvYmFsQ29k ZSk6CisKIDIwMTMtMDctMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXRCeUlkU3RhdHVzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCmluZGV4IDVhOTFkZjQy ZWRjYzVlNjg3M2RiZmVhZDBmOTc2YWRiOWRjYjk3ZmUuLjg0NGFmYTgzMGFkMmMwODgyMThhMTg4 ZmY2NmU5N2ZiODk1ZTlmYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9HZXRCeUlkU3RhdHVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0dldEJ5SWRTdGF0dXMuaApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgR2V0 QnlJZFN0YXR1cygKICAgICAgICAgU3RhdGUgc3RhdGUsIGJvb2wgd2FzU2VlbkluSklULCBjb25z dCBTdHJ1Y3R1cmVTZXQmIHN0cnVjdHVyZVNldCA9IFN0cnVjdHVyZVNldCgpLAotICAgICAgICBQ cm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1ZhbHVlIHNwZWNpZmljVmFs dWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1cmVDaGFpbj4gY2hhaW4g PSAwKQorICAgICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBpbnZhbGlkT2Zmc2V0LCBKU1Zh bHVlIHNwZWNpZmljVmFsdWUgPSBKU1ZhbHVlKCksIFBhc3NSZWZQdHI8SW50ZW5kZWRTdHJ1Y3R1 cmVDaGFpbj4gY2hhaW4gPSBudWxscHRyKQogICAgICAgICA6IG1fc3RhdGUoc3RhdGUpCiAgICAg ICAgICwgbV9zdHJ1Y3R1cmVTZXQoc3RydWN0dXJlU2V0KQogICAgICAgICAsIG1fY2hhaW4oY2hh aW4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCmluZGV4IGE3M2U1 NmQ1NDhkODAzMGZjZGVkOTQ2MjY0YWRhNjE4YWY1NThlNjMuLjQ0MzZjMGQ5M2QyYzIzMzY5OWU2 ODNhOTc3Njg4MmVjYmY5ODY4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHV29ya2xpc3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29y a2xpc3QuY3BwCkBAIC00NCw3ICs0NCw3IEBAIFdvcmtsaXN0Ojp+V29ya2xpc3QoKQogICAgIHsK ICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbG9jayk7CiAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCi0gICAgICAgICAgICBtX3F1ZXVlLmFwcGVu ZChSZWZQdHI8UGxhbj4oMCkpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ug d2FudCB0aGUgdGhyZWFkIHRvIHRlcm1pbmF0ZS4KKyAgICAgICAgICAgIG1fcXVldWUuYXBwZW5k KG51bGxwdHIpOyAvLyBVc2UgbnVsbCBwbGFuIHRvIGluZGljYXRlIHRoYXQgd2Ugd2FudCB0aGUg dGhyZWFkIHRvIHRlcm1pbmF0ZS4KICAgICAgICAgbV9wbGFuRW5xdWV1ZWQuYnJvYWRjYXN0KCk7 CiAgICAgfQogICAgIGZvciAodW5zaWduZWQgaSA9IG1fdGhyZWFkcy5zaXplKCk7IGktLTspCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgKaW5kZXggNjcw NWNiNTY2ZWRhN2FhNzNmOWNkOWVjNDcwZDBlZGY5MDRjYzNkYS4uNzNkNDRjMWRmYTVhZWM4MDhm OWMxNGI3ODRkNDkwYzI1NDE5YzM0MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0NhbGxGcmFtZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRl cnByZXRlci9DYWxsRnJhbWUuaApAQCAtMjc3LDggKzI3Nyw4IEBAIG5hbWVzcGFjZSBKU0MgIHsK ICNlbmRpZgogICAgICAgICBDYWxsRnJhbWUqIGNhbGxlckZyYW1lTm9GbGFncygpIHsgcmV0dXJu IGNhbGxlckZyYW1lKCktPnJlbW92ZUhvc3RDYWxsRnJhbWVGbGFnKCk7IH0KIAotICAgICAgICBK U19FWFBPUlRfUFJJVkFURSBTdGFja0l0ZXJhdG9yIGJlZ2luKFN0YWNrSXRlcmF0b3I6OkZyYW1l RmlsdGVyID0gMCk7Ci0gICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIFN0YWNrSXRlcmF0b3IgZmlu ZChKU0Z1bmN0aW9uKiBjYWxsZWVGdW5jdGlvbk9iaiwgU3RhY2tJdGVyYXRvcjo6RnJhbWVGaWx0 ZXIgPSAwKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgU3RhY2tJdGVyYXRvciBiZWdpbihT dGFja0l0ZXJhdG9yOjpGcmFtZUZpbHRlciA9IG51bGxwdHIpOworICAgICAgICBKU19FWFBPUlRf UFJJVkFURSBTdGFja0l0ZXJhdG9yIGZpbmQoSlNGdW5jdGlvbiogY2FsbGVlRnVuY3Rpb25PYmos IFN0YWNrSXRlcmF0b3I6OkZyYW1lRmlsdGVyID0gbnVsbHB0cik7CiAgICAgICAgIEpTX0VYUE9S VF9QUklWQVRFIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBlbmQoKTsKIAogICAgIHByaXZhdGU6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRv ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tJdGVyYXRvci5j cHAKaW5kZXggNzJjNTIxMGM5MDIxNWEwZGJkNTkzMDA0ZWRiZDc1OTkxMDQ1Y2ZiMi4uY2I1Y2Zl ODVhZTgyMmYzZGM1ODgwMDRmZjIyNWIzMjUxMDY2MDZmOSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9TdGFja0l0ZXJhdG9yLmNwcApAQCAtNjcsMTggKzY3 LDE4IEBAIHZvaWQgU3RhY2tJdGVyYXRvcjo6ZmluZChKU0Z1bmN0aW9uKiBmdW5jdGlvbk9iaikK IFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpDb2RlVHlwZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6Y29k ZVR5cGUoKSBjb25zdAogewogICAgIGlmICghaXNKU0ZyYW1lKCkpCi0gICAgICAgIHJldHVybiBT dGFja0l0ZXJhdG9yOjpGcmFtZTo6TmF0aXZlOworICAgICAgICByZXR1cm4gQ29kZVR5cGU6Ok5h dGl2ZTsKIAogICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmNvZGVUeXBlKCkpIHsKICAgICBjYXNl IEV2YWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6OkV2YWw7Cisg ICAgICAgIHJldHVybiBDb2RlVHlwZTo6RXZhbDsKICAgICBjYXNlIEZ1bmN0aW9uQ29kZToKLSAg ICAgICAgcmV0dXJuIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpGdW5jdGlvbjsKKyAgICAgICAgcmV0 dXJuIENvZGVUeXBlOjpGdW5jdGlvbjsKICAgICBjYXNlIEdsb2JhbENvZGU6Ci0gICAgICAgIHJl dHVybiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6R2xvYmFsOworICAgICAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKICAgICB9CiAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6Okdsb2JhbDsKKyAgICByZXR1cm4gQ29kZVR5 cGU6Okdsb2JhbDsKIH0KIAogU3RyaW5nIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpmdW5jdGlvbk5h bWUoKQpAQCAtODcsMTcgKzg3LDE3IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6ZnVu Y3Rpb25OYW1lKCkKICAgICBKU09iamVjdCogY2FsbGVlID0gdGhpcy0+Y2FsbGVlKCk7CiAKICAg ICBzd2l0Y2ggKGNvZGVUeXBlKCkpIHsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpF dmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkV2YWw6CiAgICAgICAgIHRyYWNlTGluZSA9ICJldmFs IGNvZGUiOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpO YXRpdmU6CisgICAgY2FzZSBDb2RlVHlwZTo6TmF0aXZlOgogICAgICAgICBpZiAoY2FsbGVlKQog ICAgICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERpc3BsYXlOYW1lKGNhbGxGcmFt ZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTdGFja0l0ZXJh dG9yOjpGcmFtZTo6RnVuY3Rpb246CisgICAgY2FzZSBDb2RlVHlwZTo6RnVuY3Rpb246CiAgICAg ICAgIHRyYWNlTGluZSA9IGdldENhbGN1bGF0ZWREaXNwbGF5TmFtZShjYWxsRnJhbWUoKSwgY2Fs bGVlKS5pbXBsKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJh bWU6Okdsb2JhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpHbG9iYWw6CiAgICAgICAgIHRyYWNlTGlu ZSA9ICJnbG9iYWwgY29kZSI7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTEwOSwxNSArMTA5 LDE1IEBAIFN0cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6c291cmNlVVJMKCkKICAgICBTdHJp bmcgdHJhY2VMaW5lOwogCiAgICAgc3dpdGNoIChjb2RlVHlwZSgpKSB7Ci0gICAgY2FzZSBTdGFj a0l0ZXJhdG9yOjpGcmFtZTo6RXZhbDoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpG dW5jdGlvbjoKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpHbG9iYWw6IHsKKyAgICBj YXNlIENvZGVUeXBlOjpFdmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0aW9uOgorICAgIGNh c2UgQ29kZVR5cGU6Okdsb2JhbDogewogICAgICAgICBTdHJpbmcgc291cmNlVVJMID0gY29kZUJs b2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLT5zb3VyY2VVUkwoKTsKICAgICAgICAgaWYgKCFzb3Vy Y2VVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gc291cmNlVVJMLmltcGwo KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJhbWU6 Ok5hdGl2ZToKKyAgICBjYXNlIENvZGVUeXBlOjpOYXRpdmU6CiAgICAgICAgIHRyYWNlTGluZSA9 ICJbbmF0aXZlIGNvZGVdIjsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMjE5LDcgKzIxOSw3 IEBAIFN0YWNrSXRlcmF0b3I6OkZyYW1lKiBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6bG9naWNhbEZy YW1lKCkKICAgICBpZiAoIW91dGVyTW9zdENvZGVCbG9jay0+Y2FuR2V0Q29kZU9yaWdpbihpbmRl eCkpIHsKICAgICAgICAgLy8gU2VlIGFib3ZlLiBJbiByZWxlYXNlIGJ1aWxkcywgd2UgdHJ5IHRv IHByb3RlY3Qgb3Vyc2VsdmVzIGZyb20gY3Jhc2hpbmcgZXZlbgogICAgICAgICAvLyB0aG91Z2gg c3RhY2sgd2Fsa2luZyB3aWxsIGJlIGdvb2ZlZCB1cC4KLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIENvZGVPcmlnaW4gY29kZU9yaWdpbiA9 IG91dGVyTW9zdENvZGVCbG9jay0+Y29kZU9yaWdpbihpbmRleCk7CkBAIC0zNDIsNyArMzQyLDcg QEAgdm9pZCBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6cHJpbnQoaW50IGluZGVudExldmVsKQogICAg IHByaW50aWYoaSwgImZyYW1lICVwIHtcbiIsIHRoaXMpOwogCiAgICAgQ2FsbEZyYW1lKiBjYWxs ZXJGcmFtZSA9IHRoaXMtPmNhbGxlckZyYW1lKCk7Ci0gICAgdm9pZCogcmV0dXJuUEMgPSBoYXNS ZXR1cm5QQygpID8gdGhpcy0+cmV0dXJuUEMoKS52YWx1ZSgpIDogMDsKKyAgICB2b2lkKiByZXR1 cm5QQyA9IGhhc1JldHVyblBDKCkgPyB0aGlzLT5yZXR1cm5QQygpLnZhbHVlKCkgOiBudWxscHRy OwogCiAgICAgcHJpbnRpZihpLCAiICAgbmFtZSAnJXMnXG4iLCBmdW5jdGlvbk5hbWUoKS51dGY4 KCkuZGF0YSgpKTsKICAgICBwcmludGlmKGksICIgICBzb3VyY2VVUkwgJyVzJ1xuIiwgc291cmNl VVJMKCkudXRmOCgpLmRhdGEoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9FeGVjdXRhYmxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4 ZWN1dGFibGUuY3BwCmluZGV4IDI5ODNlZGIzMmNlOGY2MDI3MDZiZmViMWJiYTQ0NWQ2Njc1ZDQ3 MmYuLjRhNjJmMGEwMzAxYTYxNzQzYzIxNWU1ZWZhMjAxM2UzNzI2NWJlM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCkBAIC0xMjEsNyArMTIxLDcg QEAgRXZhbEV4ZWN1dGFibGUqIEV2YWxFeGVjdXRhYmxlOjpjcmVhdGUoRXhlY1N0YXRlKiBleGVj LCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0ID0gZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpOwogICAgIGlmICghZ2xvYmFsT2JqZWN0 LT5ldmFsRW5hYmxlZCgpKSB7CiAgICAgICAgIHRocm93RXJyb3IoZXhlYywgY3JlYXRlRXZhbEVy cm9yKGV4ZWMsIGdsb2JhbE9iamVjdC0+ZXZhbERpc2FibGVkRXJyb3JNZXNzYWdlKCkpKTsKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIEV2 YWxFeGVjdXRhYmxlKiBleGVjdXRhYmxlID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8RXZh bEV4ZWN1dGFibGU+KCpleGVjLT5oZWFwKCkpKSBFdmFsRXhlY3V0YWJsZShleGVjLCBzb3VyY2Us IGlzSW5TdHJpY3RDb250ZXh0KTsKQEAgLTEyOSw3ICsxMjksNyBAQCBFdmFsRXhlY3V0YWJsZSog RXZhbEV4ZWN1dGFibGU6OmNyZWF0ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNvZGUm IHNvdXJjZQogCiAgICAgVW5saW5rZWRFdmFsQ29kZUJsb2NrKiB1bmxpbmtlZEV2YWxDb2RlID0g Z2xvYmFsT2JqZWN0LT5jcmVhdGVFdmFsQ29kZUJsb2NrKGV4ZWMsIGV4ZWN1dGFibGUpOwogICAg IGlmICghdW5saW5rZWRFdmFsQ29kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgZXhlY3V0YWJsZS0+bV91bmxpbmtlZEV2YWxDb2RlQmxvY2suc2V0 KGV4ZWMtPnZtKCksIGV4ZWN1dGFibGUsIHVubGlua2VkRXZhbENvZGUpOwogCkBAIC0yMTEsNyAr MjExLDcgQEAgaW5saW5lIGNvbnN0IGNoYXIqIHNhbXBsaW5nRGVzY3JpcHRpb24oSklUQ29kZTo6 SklUVHlwZSBqaXRUeXBlKQogICAgICAgICByZXR1cm4gIkZUTCBDb21waWxhdGlvbiAoVE9UQUwp IjsKICAgICBkZWZhdWx0OgogICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogfQogCkBA IC0yMzcsNyArMjM3LDcgQEAgSlNPYmplY3QqIEV2YWxFeGVjdXRhYmxlOjpjb21waWxlSW50ZXJu YWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSklUQ28KICAgICBpZiAocmVzdWx0 KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0 dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTI5Myw3ICsyOTMsNyBA QCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmNoZWNrU3ludGF4KEV4ZWNTdGF0ZSogZXhl YykKICAgICBKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGlj YWxHbG9iYWxPYmplY3QoKTsKICAgICBSZWZQdHI8UHJvZ3JhbU5vZGU+IHByb2dyYW1Ob2RlID0g cGFyc2U8UHJvZ3JhbU5vZGU+KHZtLCBtX3NvdXJjZSwgMCwgSWRlbnRpZmllcigpLCBKU1BhcnNl Tm9ybWFsLCBQcm9ncmFtTm9kZTo6aXNGdW5jdGlvbk5vZGUgPyBKU1BhcnNlRnVuY3Rpb25Db2Rl IDogSlNQYXJzZVByb2dyYW1Db2RlLCBlcnJvcik7CiAgICAgaWYgKHByb2dyYW1Ob2RlKQotICAg ICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgQVNTRVJUKGVycm9y Lm1fdHlwZSAhPSBQYXJzZXJFcnJvcjo6RXJyb3JOb25lKTsKICAgICByZXR1cm4gZXJyb3IudG9F cnJvck9iamVjdChsZXhpY2FsR2xvYmFsT2JqZWN0LCBtX3NvdXJjZSk7CiB9CkBAIC0zNDEsNyAr MzQxLDcgQEAgSlNPYmplY3QqIFByb2dyYW1FeGVjdXRhYmxlOjpjb21waWxlSW50ZXJuYWwoRXhl Y1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzY29wZSwgSkkKICAgICBpZiAocmVzdWx0KQogICAgICAg ICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxw dHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKQEAgLTQxMCw3ICs0MTAsNyBAQCBKU09iamVj dCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKFZNJiB2bSwg Q2FsbEZyYW1lKiBjYWxsRgogCiAgICAgc2l6ZV90IG5ld0dsb2JhbHMgPSB2YXJpYWJsZURlY2xh cmF0aW9ucy5zaXplKCkgKyBmdW5jdGlvbkRlY2xhcmF0aW9ucy5zaXplKCk7CiAgICAgaWYgKCFu ZXdHbG9iYWxzKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgZ2xvYmFsT2JqZWN0LT5hZGRSZWdpc3RlcnMobmV3R2xvYmFscyk7CiAgICAgQ2FsbEZyYW1l KiBnbG9iYWxFeGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAKQEAgLTQzMCw3ICs0 MzAsNyBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9w ZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgogICAgICAgICAgICAgKHZhcmlhYmxlRGVj bGFyYXRpb25zW2ldLnNlY29uZCAmIERlY2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50KSA/IElz Q29uc3RhbnQgOiBJc1ZhcmlhYmxlLAogICAgICAgICAgICAgTm90RnVuY3Rpb25Pck5vdFNwZWNp YWxpemFibGUpOwogICAgIH0KLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0K IAogdm9pZCBQcm9ncmFtRXhlY3V0YWJsZTo6dmlzaXRDaGlsZHJlbihKU0NlbGwqIGNlbGwsIFNs b3RWaXNpdG9yJiB2aXNpdG9yKQpAQCAtNDYyLDcgKzQ2Miw3IEBAIEZ1bmN0aW9uQ29kZUJsb2Nr KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmJhc2VsaW5lQ29kZUJsb2NrRm9yKENvZGVTcGVjaWFsaXph dGlvbktpCiAgICAgICAgIHJlc3VsdCA9IG1fY29kZUJsb2NrRm9yQ29uc3RydWN0LmdldCgpOwog ICAgIH0KICAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIHdoaWxlIChyZXN1bHQtPmFsdGVybmF0aXZlKCkpCiAgICAgICAgIHJl c3VsdCA9IHN0YXRpY19jYXN0PEZ1bmN0aW9uQ29kZUJsb2NrKj4ocmVzdWx0LT5hbHRlcm5hdGl2 ZSgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChyZXN1bHQpOwpAQCAtNTMwLDcgKzUzMCw3IEBAIFBh c3NSZWZQdHI8RnVuY3Rpb25Db2RlQmxvY2s+IEZ1bmN0aW9uRXhlY3V0YWJsZTo6cHJvZHVjZUNv ZGVCbG9ja0ZvcihKU1Njb3BlKiBzCiAKICAgICBpZiAoIXVubGlua2VkQ29kZUJsb2NrKSB7CiAg ICAgICAgIGV4Y2VwdGlvbiA9IGVycm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBtX3Nv dXJjZSk7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAKICAgICBTb3VyY2VQcm92aWRlciogcHJvdmlkZXIgPSBzb3VyY2UoKS5wcm92aWRlcigpOwpA QCAtNTYxLDcgKzU2MSw3IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNvbXBpbGVG b3JDYWxsSW50ZXJuYWwoRXhlY1N0YXRlKiBleGVjLCBKU1Njb3BlKiBzCiAgICAgICAgIGJ5dGVj b2RlSW5kZXgsIENvZGVGb3JDYWxsKTsKICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0 ID0gdGhlUmVzdWx0OwotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiAj aWYgRU5BQkxFKERGR19KSVQpCkBAIC01OTMsNyArNTkzLDcgQEAgSlNPYmplY3QqIEZ1bmN0aW9u RXhlY3V0YWJsZTo6Y29tcGlsZUZvckNvbnN0cnVjdEludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywg SlNTY28KICAgICBpZiAocmVzdWx0KQogICAgICAgICAqcmVzdWx0ID0gdGhlUmVzdWx0OwogCi0g ICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKICNpZiBFTkFCTEUoREZHX0pJ VCkKQEAgLTY3NCw3ICs2NzQsNyBAQCBGdW5jdGlvbkV4ZWN1dGFibGUqIEZ1bmN0aW9uRXhlY3V0 YWJsZTo6ZnJvbUdsb2JhbENvZGUoY29uc3QgSWRlbnRpZmllciYgbmFtZSwgRQogewogICAgIFVu bGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlKiB1bmxpbmtlZEZ1bmN0aW9uID0gVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2RlKG5hbWUsIGV4ZWMsIGRlYnVnZ2VyLCBzb3Vy Y2UsIGV4Y2VwdGlvbik7CiAgICAgaWYgKCF1bmxpbmtlZEZ1bmN0aW9uKQotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgdW5zaWduZWQgZmlyc3RMaW5lID0g c291cmNlLmZpcnN0TGluZSgpICsgdW5saW5rZWRGdW5jdGlvbi0+Zmlyc3RMaW5lT2Zmc2V0KCk7 CiAgICAgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSBzb3VyY2Uuc3RhcnRPZmZzZXQoKSArIHVubGlu a2VkRnVuY3Rpb24tPnN0YXJ0T2Zmc2V0KCk7CiAgICAgdW5zaWduZWQgc3RhcnRDb2x1bW4gPSBz b3VyY2Uuc3RhcnRDb2x1bW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu cHJpIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKaW5kZXggYTFkYTA0NTFhYzVhZjhmMWYy M2QxN2Q0M2MwNWRhZTkxOTk2NmQ4Zi4uY2YxZDU0OWRkYTIxOGVlOWFmMGY0NTY2ZTQzMmE4NmNh ZWI4OGYyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViS2l0Mi5wcmkKQEAgLTg1LDUgKzg1LDMgQEAgaGF2ZT8oUVRRVUlDSyk6 IFFUICs9IHFtbCBxdWljawogaGF2ZT8ocXRsb2NhdGlvbik6ZW5hYmxlPyhHRU9MT0NBVElPTik6 IFFUICs9IGxvY2F0aW9uCiAKIGVuYWJsZT8oU0VDQ09NUF9GSUxURVJTKTogUEtHQ09ORklHICs9 IGxpYnNlY2NvbXAKLQotQ09ORklHICs9IGMrKzExCmRpZmYgLS1naXQgYS8ucW1ha2UuY29uZiBi Ly5xbWFrZS5jb25mCmluZGV4IGQ1NzFhYTI4ZWE4NmMxNGM3ODgwNTMzYmYzYmE2OGU5ZWY0YjNj ODEuLjIyNGNiY2VjODBlNTYxMDUxNjBmMDBkNzExNGI5NDZiZDU2OTgxMzQgMTAwNjQ0Ci0tLSBh Ly5xbWFrZS5jb25mCisrKyBiLy5xbWFrZS5jb25mCkBAIC0xMSwzICsxMSw1IEBAIGV4aXN0cygk JFBXRC8uc3ZuKSB7CiBsb2FkKHF0X2J1aWxkX2NvbmZpZykKIAogTU9EVUxFX1ZFUlNJT04gPSA1 LjIuMAorCitDT05GSUcgKz0gYysrMTEK 207935 2013-08-01 10:31:26 -0700 2013-09-12 04:58:42 -0700 Patch bug-119266-20130801193151.patch text/plain 14874 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 ZTExYzg0ODIzY2NiY2QwYTVkNWRmMjIwNTRiZTQ3ZjQxYWRlY2QyLi4xOGIxZWYxZDE4ODhiYjlh ZGVlZDk2ZWZmMzM1ZmVjNTJiODAxNGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxMy0wOC0wMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oOgor ICAgICAgICAoSlNDOjpHZXRCeUlkU3RhdHVzOjpHZXRCeUlkU3RhdHVzKToKKyAgICAgICAgKiBk ZmcvREZHV29ya2xpc3QuY3BwOgorICAgICAgICAoSlNDOjpERkc6OldvcmtsaXN0Ojp+V29ya2xp c3QpOgorICAgICAgICAqIGludGVycHJldGVyL0NhbGxGcmFtZS5oOgorICAgICAgICAqIGludGVy cHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpTdGFja0l0ZXJhdG9yOjpG cmFtZTo6Y29kZVR5cGUpOgorICAgICAgICAoSlNDOjpTdGFja0l0ZXJhdG9yOjpGcmFtZTo6ZnVu Y3Rpb25OYW1lKToKKyAgICAgICAgKEpTQzo6U3RhY2tJdGVyYXRvcjo6RnJhbWU6OnNvdXJjZVVS TCk6CisgICAgICAgIChKU0M6OlN0YWNrSXRlcmF0b3I6OkZyYW1lOjpsb2dpY2FsRnJhbWUpOgor ICAgICAgICAoSlNDOjpTdGFja0l0ZXJhdG9yOjpGcmFtZTo6cHJpbnQpOgorICAgICAgICAqIHJ1 bnRpbWUvRXhlY3V0YWJsZS5jcHA6CisgICAgICAgIChKU0M6OkV2YWxFeGVjdXRhYmxlOjpjcmVh dGUpOgorICAgICAgICAoSlNDOjpzYW1wbGluZ0Rlc2NyaXB0aW9uKToKKyAgICAgICAgKEpTQzo6 RXZhbEV4ZWN1dGFibGU6OmNvbXBpbGVJbnRlcm5hbCk6CisgICAgICAgIChKU0M6OlByb2dyYW1F eGVjdXRhYmxlOjpjaGVja1N5bnRheCk6CisgICAgICAgIChKU0M6OlByb2dyYW1FeGVjdXRhYmxl Ojpjb21waWxlSW50ZXJuYWwpOgorICAgICAgICAoSlNDOjpQcm9ncmFtRXhlY3V0YWJsZTo6aW5p dGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMpOgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4ZWN1dGFi bGU6OmJhc2VsaW5lQ29kZUJsb2NrRm9yKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRh YmxlOjpwcm9kdWNlQ29kZUJsb2NrRm9yKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRh YmxlOjpjb21waWxlRm9yQ2FsbEludGVybmFsKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVj dXRhYmxlOjpjb21waWxlRm9yQ29uc3RydWN0SW50ZXJuYWwpOgorICAgICAgICAoSlNDOjpGdW5j dGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2RlKToKKwogMjAxMy0wNy0zMSAgR2F2aW4gQmFy cmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgTW9yZSBjbGVhbnVw IGluIFByb3BlcnR5U2xvdApkaWZmIC0tZ2l0IGEvU291cmNlL0NNYWtlTGlzdHMudHh0IGIvU291 cmNlL0NNYWtlTGlzdHMudHh0CmluZGV4IDM3MzZlZWExN2E0NWVmNGExZDc1MjE2NGZhOTI1YTJi ODdmOGFhYTQuLjRlNmYzMjhiMDQyNzY2MDA0YzMwYjQ5MTJlYmQxNmVlZDYzOTBiYzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvQ01ha2VMaXN0cy50eHQK QEAgLTMyLDYgKzMyLDggQEAgZW5kaWYgKCkKIAogV0VCS0lUX1NFVF9FWFRSQV9DT01QSUxFUl9G TEFHUyhXVEYgJHtBRERJVElPTkFMX0ZMQUdTfSkKIFdFQktJVF9TRVRfRVhUUkFfQ09NUElMRVJf RkxBR1MoSmF2YVNjcmlwdENvcmUgJHtBRERJVElPTkFMX0ZMQUdTfSkKK1dFQktJVF9TRVRfRVhU UkFfQ09NUElMRVJfRkxBR1MoanNjICR7QURESVRJT05BTF9GTEFHU30pCitXRUJLSVRfU0VUX0VY VFJBX0NPTVBJTEVSX0ZMQUdTKExMSW50T2Zmc2V0c0V4dHJhY3RvcikKIAogaWYgKEVOQUJMRV9X RUJDT1JFKQogICAgIFdFQktJVF9TRVRfRVhUUkFfQ09NUElMRVJfRkxBR1MoV2ViQ29yZVRlc3RT dXBwb3J0ICR7QURESVRJT05BTF9GTEFHU30pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL0dldEJ5SWRTdGF0dXMuaAppbmRleCA1YTkxZGY0MmVkY2M1ZTY4NzNkYmZlYWQwZjk3 NmFkYjlkY2I5N2ZlLi44NDRhZmE4MzBhZDJjMDg4MjE4YTE4OGZmNjZlOTdmYjg5NWU5ZmJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXRCeUlkU3RhdHVzLmgKQEAg LTYwLDcgKzYwLDcgQEAgcHVibGljOgogICAgIAogICAgIEdldEJ5SWRTdGF0dXMoCiAgICAgICAg IFN0YXRlIHN0YXRlLCBib29sIHdhc1NlZW5JbkpJVCwgY29uc3QgU3RydWN0dXJlU2V0JiBzdHJ1 Y3R1cmVTZXQgPSBTdHJ1Y3R1cmVTZXQoKSwKLSAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0 ID0gaW52YWxpZE9mZnNldCwgSlNWYWx1ZSBzcGVjaWZpY1ZhbHVlID0gSlNWYWx1ZSgpLCBQYXNz UmVmUHRyPEludGVuZGVkU3RydWN0dXJlQ2hhaW4+IGNoYWluID0gMCkKKyAgICAgICAgUHJvcGVy dHlPZmZzZXQgb2Zmc2V0ID0gaW52YWxpZE9mZnNldCwgSlNWYWx1ZSBzcGVjaWZpY1ZhbHVlID0g SlNWYWx1ZSgpLCBQYXNzUmVmUHRyPEludGVuZGVkU3RydWN0dXJlQ2hhaW4+IGNoYWluID0gbnVs bHB0cikKICAgICAgICAgOiBtX3N0YXRlKHN0YXRlKQogICAgICAgICAsIG1fc3RydWN0dXJlU2V0 KHN0cnVjdHVyZVNldCkKICAgICAgICAgLCBtX2NoYWluKGNoYWluKQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3JrbGlzdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcAppbmRleCBhNzNlNTZkNTQ4ZDgwMzBmY2RlZDk0NjI2 NGFkYTYxOGFmNTU4ZTYzLi40NDM2YzBkOTNkMmMyMzM2OTllNjgzYTk3NzY4ODJlY2JmOTg2ODNk IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcApAQCAtNDQsNyAr NDQsNyBAQCBXb3JrbGlzdDo6fldvcmtsaXN0KCkKICAgICB7CiAgICAgICAgIE11dGV4TG9ja2Vy IGxvY2tlcihtX2xvY2spOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBtX3RocmVhZHMuc2l6 ZSgpOyBpLS07KQotICAgICAgICAgICAgbV9xdWV1ZS5hcHBlbmQoUmVmUHRyPFBsYW4+KDApKTsg Ly8gVXNlIG51bGwgcGxhbiB0byBpbmRpY2F0ZSB0aGF0IHdlIHdhbnQgdGhlIHRocmVhZCB0byB0 ZXJtaW5hdGUuCisgICAgICAgICAgICBtX3F1ZXVlLmFwcGVuZChudWxscHRyKTsgLy8gVXNlIG51 bGwgcGxhbiB0byBpbmRpY2F0ZSB0aGF0IHdlIHdhbnQgdGhlIHRocmVhZCB0byB0ZXJtaW5hdGUu CiAgICAgICAgIG1fcGxhbkVucXVldWVkLmJyb2FkY2FzdCgpOwogICAgIH0KICAgICBmb3IgKHVu c2lnbmVkIGkgPSBtX3RocmVhZHMuc2l6ZSgpOyBpLS07KQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0NhbGxGcmFtZS5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ludGVycHJldGVyL0NhbGxGcmFtZS5oCmluZGV4IDY3MDVjYjU2NmVkYTdhYTczZjljZDll YzQ3MGQwZWRmOTA0Y2MzZGEuLjczZDQ0YzFkZmE1YWVjODA4ZjljMTRiNzg0ZDQ5MGMyNTQxOWMz NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJh bWUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgK QEAgLTI3Nyw4ICsyNzcsOCBAQCBuYW1lc3BhY2UgSlNDICB7CiAjZW5kaWYKICAgICAgICAgQ2Fs bEZyYW1lKiBjYWxsZXJGcmFtZU5vRmxhZ3MoKSB7IHJldHVybiBjYWxsZXJGcmFtZSgpLT5yZW1v dmVIb3N0Q2FsbEZyYW1lRmxhZygpOyB9CiAKLSAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgU3Rh Y2tJdGVyYXRvciBiZWdpbihTdGFja0l0ZXJhdG9yOjpGcmFtZUZpbHRlciA9IDApOwotICAgICAg ICBKU19FWFBPUlRfUFJJVkFURSBTdGFja0l0ZXJhdG9yIGZpbmQoSlNGdW5jdGlvbiogY2FsbGVl RnVuY3Rpb25PYmosIFN0YWNrSXRlcmF0b3I6OkZyYW1lRmlsdGVyID0gMCk7CisgICAgICAgIEpT X0VYUE9SVF9QUklWQVRFIFN0YWNrSXRlcmF0b3IgYmVnaW4oU3RhY2tJdGVyYXRvcjo6RnJhbWVG aWx0ZXIgPSBudWxscHRyKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgU3RhY2tJdGVyYXRv ciBmaW5kKEpTRnVuY3Rpb24qIGNhbGxlZUZ1bmN0aW9uT2JqLCBTdGFja0l0ZXJhdG9yOjpGcmFt ZUZpbHRlciA9IG51bGxwdHIpOwogICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBTdGFja0l0ZXJh dG9yOjpGcmFtZSogZW5kKCk7CiAKICAgICBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrSXRlcmF0b3IuY3BwCmluZGV4IDcyYzUyMTBjOTAy MTVhMGRiZDU5MzAwNGVkYmQ3NTk5MTA0NWNmYjIuLmNiNWNmZTg1YWU4MjJmM2RjNTg4MDA0ZmYy MjViMzI1MTA2NjA2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnBy ZXRlci9TdGFja0l0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJw cmV0ZXIvU3RhY2tJdGVyYXRvci5jcHAKQEAgLTY3LDE4ICs2NywxOCBAQCB2b2lkIFN0YWNrSXRl cmF0b3I6OmZpbmQoSlNGdW5jdGlvbiogZnVuY3Rpb25PYmopCiBTdGFja0l0ZXJhdG9yOjpGcmFt ZTo6Q29kZVR5cGUgU3RhY2tJdGVyYXRvcjo6RnJhbWU6OmNvZGVUeXBlKCkgY29uc3QKIHsKICAg ICBpZiAoIWlzSlNGcmFtZSgpKQotICAgICAgICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6RnJhbWU6 Ok5hdGl2ZTsKKyAgICAgICAgcmV0dXJuIENvZGVUeXBlOjpOYXRpdmU7CiAKICAgICBzd2l0Y2gg KGNvZGVCbG9jaygpLT5jb2RlVHlwZSgpKSB7CiAgICAgY2FzZSBFdmFsQ29kZToKLSAgICAgICAg cmV0dXJuIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpFdmFsOworICAgICAgICByZXR1cm4gQ29kZVR5 cGU6OkV2YWw7CiAgICAgY2FzZSBGdW5jdGlvbkNvZGU6Ci0gICAgICAgIHJldHVybiBTdGFja0l0 ZXJhdG9yOjpGcmFtZTo6RnVuY3Rpb247CisgICAgICAgIHJldHVybiBDb2RlVHlwZTo6RnVuY3Rp b247CiAgICAgY2FzZSBHbG9iYWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tJdGVyYXRvcjo6 RnJhbWU6Okdsb2JhbDsKKyAgICAgICAgcmV0dXJuIENvZGVUeXBlOjpHbG9iYWw7CiAgICAgfQog ICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIFN0YWNrSXRlcmF0 b3I6OkZyYW1lOjpHbG9iYWw7CisgICAgcmV0dXJuIENvZGVUeXBlOjpHbG9iYWw7CiB9CiAKIFN0 cmluZyBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6ZnVuY3Rpb25OYW1lKCkKQEAgLTg3LDE3ICs4Nywx NyBAQCBTdHJpbmcgU3RhY2tJdGVyYXRvcjo6RnJhbWU6OmZ1bmN0aW9uTmFtZSgpCiAgICAgSlNP YmplY3QqIGNhbGxlZSA9IHRoaXMtPmNhbGxlZSgpOwogCiAgICAgc3dpdGNoIChjb2RlVHlwZSgp KSB7Ci0gICAgY2FzZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6RXZhbDoKKyAgICBjYXNlIENvZGVU eXBlOjpFdmFsOgogICAgICAgICB0cmFjZUxpbmUgPSAiZXZhbCBjb2RlIjsKICAgICAgICAgYnJl YWs7Ci0gICAgY2FzZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6TmF0aXZlOgorICAgIGNhc2UgQ29k ZVR5cGU6Ok5hdGl2ZToKICAgICAgICAgaWYgKGNhbGxlZSkKICAgICAgICAgICAgIHRyYWNlTGlu ZSA9IGdldENhbGN1bGF0ZWREaXNwbGF5TmFtZShjYWxsRnJhbWUoKSwgY2FsbGVlKS5pbXBsKCk7 CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJhbWU6OkZ1bmN0aW9u OgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0aW9uOgogICAgICAgICB0cmFjZUxpbmUgPSBnZXRD YWxjdWxhdGVkRGlzcGxheU5hbWUoY2FsbEZyYW1lKCksIGNhbGxlZSkuaW1wbCgpOwogICAgICAg ICBicmVhazsKLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpHbG9iYWw6CisgICAgY2Fz ZSBDb2RlVHlwZTo6R2xvYmFsOgogICAgICAgICB0cmFjZUxpbmUgPSAiZ2xvYmFsIGNvZGUiOwog ICAgICAgICBicmVhazsKICAgICB9CkBAIC0xMDksMTUgKzEwOSwxNSBAQCBTdHJpbmcgU3RhY2tJ dGVyYXRvcjo6RnJhbWU6OnNvdXJjZVVSTCgpCiAgICAgU3RyaW5nIHRyYWNlTGluZTsKIAogICAg IHN3aXRjaCAoY29kZVR5cGUoKSkgewotICAgIGNhc2UgU3RhY2tJdGVyYXRvcjo6RnJhbWU6OkV2 YWw6Ci0gICAgY2FzZSBTdGFja0l0ZXJhdG9yOjpGcmFtZTo6RnVuY3Rpb246Ci0gICAgY2FzZSBT dGFja0l0ZXJhdG9yOjpGcmFtZTo6R2xvYmFsOiB7CisgICAgY2FzZSBDb2RlVHlwZTo6RXZhbDoK KyAgICBjYXNlIENvZGVUeXBlOjpGdW5jdGlvbjoKKyAgICBjYXNlIENvZGVUeXBlOjpHbG9iYWw6 IHsKICAgICAgICAgU3RyaW5nIHNvdXJjZVVSTCA9IGNvZGVCbG9jaygpLT5vd25lckV4ZWN1dGFi bGUoKS0+c291cmNlVVJMKCk7CiAgICAgICAgIGlmICghc291cmNlVVJMLmlzRW1wdHkoKSkKICAg ICAgICAgICAgIHRyYWNlTGluZSA9IHNvdXJjZVVSTC5pbXBsKCk7CiAgICAgICAgIGJyZWFrOwog ICAgIH0KLSAgICBjYXNlIFN0YWNrSXRlcmF0b3I6OkZyYW1lOjpOYXRpdmU6CisgICAgY2FzZSBD b2RlVHlwZTo6TmF0aXZlOgogICAgICAgICB0cmFjZUxpbmUgPSAiW25hdGl2ZSBjb2RlXSI7CiAg ICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTIxOSw3ICsyMTksNyBAQCBTdGFja0l0ZXJhdG9yOjpG cmFtZSogU3RhY2tJdGVyYXRvcjo6RnJhbWU6OmxvZ2ljYWxGcmFtZSgpCiAgICAgaWYgKCFvdXRl ck1vc3RDb2RlQmxvY2stPmNhbkdldENvZGVPcmlnaW4oaW5kZXgpKSB7CiAgICAgICAgIC8vIFNl ZSBhYm92ZS4gSW4gcmVsZWFzZSBidWlsZHMsIHdlIHRyeSB0byBwcm90ZWN0IG91cnNlbHZlcyBm cm9tIGNyYXNoaW5nIGV2ZW4KICAgICAgICAgLy8gdGhvdWdoIHN0YWNrIHdhbGtpbmcgd2lsbCBi ZSBnb29mZWQgdXAuCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsK ICAgICB9CiAKICAgICBDb2RlT3JpZ2luIGNvZGVPcmlnaW4gPSBvdXRlck1vc3RDb2RlQmxvY2st PmNvZGVPcmlnaW4oaW5kZXgpOwpAQCAtMzQyLDcgKzM0Miw3IEBAIHZvaWQgU3RhY2tJdGVyYXRv cjo6RnJhbWU6OnByaW50KGludCBpbmRlbnRMZXZlbCkKICAgICBwcmludGlmKGksICJmcmFtZSAl cCB7XG4iLCB0aGlzKTsKIAogICAgIENhbGxGcmFtZSogY2FsbGVyRnJhbWUgPSB0aGlzLT5jYWxs ZXJGcmFtZSgpOwotICAgIHZvaWQqIHJldHVyblBDID0gaGFzUmV0dXJuUEMoKSA/IHRoaXMtPnJl dHVyblBDKCkudmFsdWUoKSA6IDA7CisgICAgdm9pZCogcmV0dXJuUEMgPSBoYXNSZXR1cm5QQygp ID8gdGhpcy0+cmV0dXJuUEMoKS52YWx1ZSgpIDogbnVsbHB0cjsKIAogICAgIHByaW50aWYoaSwg IiAgIG5hbWUgJyVzJ1xuIiwgZnVuY3Rpb25OYW1lKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgcHJp bnRpZihpLCAiICAgc291cmNlVVJMICclcydcbiIsIHNvdXJjZVVSTCgpLnV0ZjgoKS5kYXRhKCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhlY3V0YWJsZS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmNwcAppbmRleCAy OTgzZWRiMzJjZThmNjAyNzA2YmZlYjFiYmE0NDVkNjY3NWQ0NzJmLi40YTYyZjBhMDMwMWE2MTc0 M2MyMTVlNWVmYTIwMTNlMzcyNjViZTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9FeGVjdXRhYmxlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9FeGVjdXRhYmxlLmNwcApAQCAtMTIxLDcgKzEyMSw3IEBAIEV2YWxFeGVjdXRhYmxlKiBF dmFsRXhlY3V0YWJsZTo6Y3JlYXRlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgU291cmNlQ29kZSYg c291cmNlCiAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGljYWxH bG9iYWxPYmplY3QoKTsKICAgICBpZiAoIWdsb2JhbE9iamVjdC0+ZXZhbEVuYWJsZWQoKSkgewog ICAgICAgICB0aHJvd0Vycm9yKGV4ZWMsIGNyZWF0ZUV2YWxFcnJvcihleGVjLCBnbG9iYWxPYmpl Y3QtPmV2YWxEaXNhYmxlZEVycm9yTWVzc2FnZSgpKSk7Ci0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICBFdmFsRXhlY3V0YWJsZSogZXhlY3V0 YWJsZSA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEV2YWxFeGVjdXRhYmxlPigqZXhlYy0+ aGVhcCgpKSkgRXZhbEV4ZWN1dGFibGUoZXhlYywgc291cmNlLCBpc0luU3RyaWN0Q29udGV4dCk7 CkBAIC0xMjksNyArMTI5LDcgQEAgRXZhbEV4ZWN1dGFibGUqIEV2YWxFeGVjdXRhYmxlOjpjcmVh dGUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UKIAogICAgIFVubGlu a2VkRXZhbENvZGVCbG9jayogdW5saW5rZWRFdmFsQ29kZSA9IGdsb2JhbE9iamVjdC0+Y3JlYXRl RXZhbENvZGVCbG9jayhleGVjLCBleGVjdXRhYmxlKTsKICAgICBpZiAoIXVubGlua2VkRXZhbENv ZGUpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGV4 ZWN1dGFibGUtPm1fdW5saW5rZWRFdmFsQ29kZUJsb2NrLnNldChleGVjLT52bSgpLCBleGVjdXRh YmxlLCB1bmxpbmtlZEV2YWxDb2RlKTsKIApAQCAtMjExLDcgKzIxMSw3IEBAIGlubGluZSBjb25z dCBjaGFyKiBzYW1wbGluZ0Rlc2NyaXB0aW9uKEpJVENvZGU6OkpJVFR5cGUgaml0VHlwZSkKICAg ICAgICAgcmV0dXJuICJGVEwgQ29tcGlsYXRpb24gKFRPVEFMKSI7CiAgICAgZGVmYXVsdDoKICAg ICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIH0KIApAQCAtMjM3LDcgKzIzNyw3IEBAIEpT T2JqZWN0KiBFdmFsRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywg SlNTY29wZSogc2NvcGUsIEpJVENvCiAgICAgaWYgKHJlc3VsdCkKICAgICAgICAgKnJlc3VsdCA9 IHRoZVJlc3VsdDsKIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiAj aWYgRU5BQkxFKERGR19KSVQpCkBAIC0yOTMsNyArMjkzLDcgQEAgSlNPYmplY3QqIFByb2dyYW1F eGVjdXRhYmxlOjpjaGVja1N5bnRheChFeGVjU3RhdGUqIGV4ZWMpCiAgICAgSlNHbG9iYWxPYmpl Y3QqIGxleGljYWxHbG9iYWxPYmplY3QgPSBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCk7CiAg ICAgUmVmUHRyPFByb2dyYW1Ob2RlPiBwcm9ncmFtTm9kZSA9IHBhcnNlPFByb2dyYW1Ob2RlPih2 bSwgbV9zb3VyY2UsIDAsIElkZW50aWZpZXIoKSwgSlNQYXJzZU5vcm1hbCwgUHJvZ3JhbU5vZGU6 OmlzRnVuY3Rpb25Ob2RlID8gSlNQYXJzZUZ1bmN0aW9uQ29kZSA6IEpTUGFyc2VQcm9ncmFtQ29k ZSwgZXJyb3IpOwogICAgIGlmIChwcm9ncmFtTm9kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIEFTU0VSVChlcnJvci5tX3R5cGUgIT0gUGFyc2VyRXJy b3I6OkVycm9yTm9uZSk7CiAgICAgcmV0dXJuIGVycm9yLnRvRXJyb3JPYmplY3QobGV4aWNhbEds b2JhbE9iamVjdCwgbV9zb3VyY2UpOwogfQpAQCAtMzQxLDcgKzM0MSw3IEBAIEpTT2JqZWN0KiBQ cm9ncmFtRXhlY3V0YWJsZTo6Y29tcGlsZUludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywgSlNTY29w ZSogc2NvcGUsIEpJCiAgICAgaWYgKHJlc3VsdCkKICAgICAgICAgKnJlc3VsdCA9IHRoZVJlc3Vs dDsKIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiAjaWYgRU5BQkxF KERGR19KSVQpCkBAIC00MTAsNyArNDEwLDcgQEAgSlNPYmplY3QqIFByb2dyYW1FeGVjdXRhYmxl Ojppbml0aWFsaXplR2xvYmFsUHJvcGVydGllcyhWTSYgdm0sIENhbGxGcmFtZSogY2FsbEYKIAog ICAgIHNpemVfdCBuZXdHbG9iYWxzID0gdmFyaWFibGVEZWNsYXJhdGlvbnMuc2l6ZSgpICsgZnVu Y3Rpb25EZWNsYXJhdGlvbnMuc2l6ZSgpOwogICAgIGlmICghbmV3R2xvYmFscykKLSAgICAgICAg cmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIGdsb2JhbE9iamVjdC0+YWRk UmVnaXN0ZXJzKG5ld0dsb2JhbHMpOwogICAgIENhbGxGcmFtZSogZ2xvYmFsRXhlYyA9IGdsb2Jh bE9iamVjdC0+Z2xvYmFsRXhlYygpOwogCkBAIC00MzAsNyArNDMwLDcgQEAgSlNPYmplY3QqIFBy b2dyYW1FeGVjdXRhYmxlOjppbml0aWFsaXplR2xvYmFsUHJvcGVydGllcyhWTSYgdm0sIENhbGxG cmFtZSogY2FsbEYKICAgICAgICAgICAgICh2YXJpYWJsZURlY2xhcmF0aW9uc1tpXS5zZWNvbmQg JiBEZWNsYXJhdGlvblN0YWNrczo6SXNDb25zdGFudCkgPyBJc0NvbnN0YW50IDogSXNWYXJpYWJs ZSwKICAgICAgICAgICAgIE5vdEZ1bmN0aW9uT3JOb3RTcGVjaWFsaXphYmxlKTsKICAgICB9Ci0g ICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKIHZvaWQgUHJvZ3JhbUV4ZWN1 dGFibGU6OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWxsLCBTbG90VmlzaXRvciYgdmlzaXRvcikK QEAgLTQ2Miw3ICs0NjIsNyBAQCBGdW5jdGlvbkNvZGVCbG9jayogRnVuY3Rpb25FeGVjdXRhYmxl OjpiYXNlbGluZUNvZGVCbG9ja0ZvcihDb2RlU3BlY2lhbGl6YXRpb25LaQogICAgICAgICByZXN1 bHQgPSBtX2NvZGVCbG9ja0ZvckNvbnN0cnVjdC5nZXQoKTsKICAgICB9CiAgICAgaWYgKCFyZXN1 bHQpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB3aGls ZSAocmVzdWx0LT5hbHRlcm5hdGl2ZSgpKQogICAgICAgICByZXN1bHQgPSBzdGF0aWNfY2FzdDxG dW5jdGlvbkNvZGVCbG9jayo+KHJlc3VsdC0+YWx0ZXJuYXRpdmUoKSk7CiAgICAgUkVMRUFTRV9B U1NFUlQocmVzdWx0KTsKQEAgLTUzMCw3ICs1MzAsNyBAQCBQYXNzUmVmUHRyPEZ1bmN0aW9uQ29k ZUJsb2NrPiBGdW5jdGlvbkV4ZWN1dGFibGU6OnByb2R1Y2VDb2RlQmxvY2tGb3IoSlNTY29wZSog cwogCiAgICAgaWYgKCF1bmxpbmtlZENvZGVCbG9jaykgewogICAgICAgICBleGNlcHRpb24gPSBl cnJvci50b0Vycm9yT2JqZWN0KGdsb2JhbE9iamVjdCwgbV9zb3VyY2UpOwotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAgICAgU291cmNlUHJvdmlk ZXIqIHByb3ZpZGVyID0gc291cmNlKCkucHJvdmlkZXIoKTsKQEAgLTU2MSw3ICs1NjEsNyBAQCBK U09iamVjdCogRnVuY3Rpb25FeGVjdXRhYmxlOjpjb21waWxlRm9yQ2FsbEludGVybmFsKEV4ZWNT dGF0ZSogZXhlYywgSlNTY29wZSogcwogICAgICAgICBieXRlY29kZUluZGV4LCBDb2RlRm9yQ2Fs bCk7CiAgICAgaWYgKHJlc3VsdCkKICAgICAgICAgKnJlc3VsdCA9IHRoZVJlc3VsdDsKLSAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogI2lmIEVOQUJMRShERkdfSklUKQpA QCAtNTkzLDcgKzU5Myw3IEBAIEpTT2JqZWN0KiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNvbXBpbGVG b3JDb25zdHJ1Y3RJbnRlcm5hbChFeGVjU3RhdGUqIGV4ZWMsIEpTU2NvCiAgICAgaWYgKHJlc3Vs dCkKICAgICAgICAgKnJlc3VsdCA9IHRoZVJlc3VsdDsKIAotICAgIHJldHVybiAwOworICAgIHJl dHVybiBudWxscHRyOwogfQogCiAjaWYgRU5BQkxFKERGR19KSVQpCkBAIC02NzQsNyArNjc0LDcg QEAgRnVuY3Rpb25FeGVjdXRhYmxlKiBGdW5jdGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2Rl KGNvbnN0IElkZW50aWZpZXImIG5hbWUsIEUKIHsKICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0 YWJsZSogdW5saW5rZWRGdW5jdGlvbiA9IFVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlOjpmcm9t R2xvYmFsQ29kZShuYW1lLCBleGVjLCBkZWJ1Z2dlciwgc291cmNlLCBleGNlcHRpb24pOwogICAg IGlmICghdW5saW5rZWRGdW5jdGlvbikKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIHVuc2lnbmVkIGZpcnN0TGluZSA9IHNvdXJjZS5maXJzdExpbmUoKSAr IHVubGlua2VkRnVuY3Rpb24tPmZpcnN0TGluZU9mZnNldCgpOwogICAgIHVuc2lnbmVkIHN0YXJ0 T2Zmc2V0ID0gc291cmNlLnN0YXJ0T2Zmc2V0KCkgKyB1bmxpbmtlZEZ1bmN0aW9uLT5zdGFydE9m ZnNldCgpOwogICAgIHVuc2lnbmVkIHN0YXJ0Q29sdW1uID0gc291cmNlLnN0YXJ0Q29sdW1uKCk7 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmJm YTNhYWI5ZGFmMzdhZjBjM2EyNjJiMTY5YWFiNDhlMjZmZmZjNi4uM2RkNThlN2I3OGQ1MjI5MjRj M2Y5OWRiMjIzOWE0OWNiYjFkNjdhMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEzLTA4LTAxICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGJhY2sgYysrMTEgZmVh dHVyZXMgcmVtb3ZlZCBieSBidWlsZGZpeGVzIGFmdGVyIGFsbCBwb3J0cyBkaWQgdGhlIHN3aXRj aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MjY2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDTWFr ZUxpc3RzLnR4dDoKKwogMjAxMy0wOC0wMSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdl YmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE1MzUxOC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL0NNYWtlTGlzdHMudHh0IGIvVG9vbHMvQ01ha2VMaXN0cy50eHQKaW5k ZXggNWNlNzlhOWZjZTM1ZjBiODc5ZGZhNTIyZTNjYmI3ZTg5ZjE5ZjA3OS4uNjliODQzZGU1OTE5 OTcxMjU1Mjc2NTUxYzhkZjVmOTY1NzNlMjcyNSAxMDA2NDQKLS0tIGEvVG9vbHMvQ01ha2VMaXN0 cy50eHQKKysrIGIvVG9vbHMvQ01ha2VMaXN0cy50eHQKQEAgLTEsNSArMSw2IEBACiBpZiAoRU5B QkxFX1dFQktJVDIgQU5EIE5PVCgiJHtQT1JUfSIgU1RSRVFVQUwgIkdUSyIpKQogICAgIGFkZF9z dWJkaXJlY3RvcnkoV2ViS2l0VGVzdFJ1bm5lcikKKyAgICBXRUJLSVRfU0VUX0VYVFJBX0NPTVBJ TEVSX0ZMQUdTKFdlYktpdFRlc3RSdW5uZXIpCiBlbmRpZiAoKQogCiBpZiAoIiR7UE9SVH0iIFNU UkVRVUFMICJFZmwiKQpAQCAtOCwxMSArOSwxNCBAQCBpZiAoIiR7UE9SVH0iIFNUUkVRVUFMICJF ZmwiKQogCiAgICAgaWYgKEVOQUJMRV9XRUJLSVQpCiAgICAgICAgIGFkZF9zdWJkaXJlY3Rvcnko RHVtcFJlbmRlclRyZWUvZWZsKQorICAgICAgICBXRUJLSVRfU0VUX0VYVFJBX0NPTVBJTEVSX0ZM QUdTKER1bXBSZW5kZXJUcmVlKQogICAgICAgICBhZGRfc3ViZGlyZWN0b3J5KEVXZWJMYXVuY2hl cikKKyAgICAgICAgV0VCS0lUX1NFVF9FWFRSQV9DT01QSUxFUl9GTEFHUyhFV2ViTGF1bmNoZXIp CiAgICAgZW5kaWYgKCkKIAogICAgIGlmIChFTkFCTEVfV0VCS0lUMikKICAgICAgICAgYWRkX3N1 YmRpcmVjdG9yeShNaW5pQnJvd3Nlci9lZmwpCisgICAgICAgIFdFQktJVF9TRVRfRVhUUkFfQ09N UElMRVJfRkxBR1MoTWluaUJyb3dzZXIpCiAgICAgZW5kaWYgKCkKICAgICBhZGRfc3ViZGlyZWN0 b3J5KER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbikKIGVsc2VpZiAoIiR7UE9SVH0i IFNUUkVRVUFMICJHVEsiKQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4 IDI0M2NmZjg3NDA3ZTk4ZmFlYzI5MDBlNjM2MjIwNDhhYWQwODVjOTUuLjQxNjg2Mzg3ZTRmNjJm MDkwMDA1YWJiMDM5ODJlMTZkMTAxZmJlZGUgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMy0wOC0wMSAgQ3NhYmEgT3N6dHJvZ29uw6Fj ICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJl bW92ZWQgYnkgYnVpbGRmaXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL0NNYWtl TGlzdHMudHh0OgorCiAyMDEzLTA3LTMwICDDgWTDoW0gS2FsbGFpICA8a2FkYW1AaW5mLnUtc3pl Z2VkLmh1PgogCiAgICAgICAgIFtRdF0gV29ya2Fyb3VuZCB0byBtYWtlIHN5bmNxdCBydW4gYW5k IGdlbmVyYXRlIGZvcndhcmRpbmcgaGVhZGVycyBpbiBTVk4gcmVwb3NpdG9yaWVzIHRvby4K 211419 2013-09-12 04:58:48 -0700 2013-09-12 05:07:20 -0700 Patch bug-119266-20130912135906.patch text/plain 6565 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZjlkODA0ZmM2Yjg5MmJlODY0NzY4YzczMWNkMDFlOTNkOTAxZWNiLi4xMWZhZjNhZGMwOWFlZGI5 NmE4NTAxYTg5OTExNWRhYjQzYTk4ZGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxMy0wOS0xMiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oOgor ICAgICAgICAoSlNDOjpHZXRCeUlkU3RhdHVzOjpHZXRCeUlkU3RhdHVzKToKKyAgICAgICAgKiBk ZmcvREZHV29ya2xpc3QuY3BwOgorICAgICAgICAoSlNDOjpERkc6OldvcmtsaXN0Ojp+V29ya2xp c3QpOgorICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAgICAgKEpT Qzo6Z2V0U3RhY2tGcmFtZUNvZGVUeXBlKToKKyAgICAgICAgKiBpbnRlcnByZXRlci9TdGFja1Zp c2l0b3IuY3BwOgorICAgICAgICAoSlNDOjpTdGFja1Zpc2l0b3I6OkZyYW1lOjpjb2RlVHlwZSk6 CisgICAgICAgIChKU0M6OlN0YWNrVmlzaXRvcjo6RnJhbWU6OmZ1bmN0aW9uTmFtZSk6CisgICAg ICAgIChKU0M6OlN0YWNrVmlzaXRvcjo6RnJhbWU6OnNvdXJjZVVSTCk6CisgICAgICAgIChKU0M6 OlN0YWNrVmlzaXRvcjo6RnJhbWU6OnByaW50KToKKwogMjAxMy0wOS0xMiAgTWlraGFpbCBQb3pk bnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAogICAgICAgICBSZW1vdmUg aG9tZS1icmV3ZWQgbnVsbHB0cgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL0dldEJ5SWRTdGF0dXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9H ZXRCeUlkU3RhdHVzLmgKaW5kZXggZTg4ZDAzYWMxZjBiZDlhMmY2ODU4Yjk2ZmY2ZWQ2ZmI3N2Q3 YTk5My4uNWMxZjA3ZDc0ODMxYmZkZTEwZjc3MDk5Y2E0MzhlNDVhNmQ5OGNlNyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dldEJ5SWRTdGF0dXMuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCkBAIC01OSw3ICs1 OSw3IEBAIHB1YmxpYzoKICAgICAKICAgICBHZXRCeUlkU3RhdHVzKAogICAgICAgICBTdGF0ZSBz dGF0ZSwgYm9vbCB3YXNTZWVuSW5KSVQsIGNvbnN0IFN0cnVjdHVyZVNldCYgc3RydWN0dXJlU2V0 ID0gU3RydWN0dXJlU2V0KCksCi0gICAgICAgIFByb3BlcnR5T2Zmc2V0IG9mZnNldCA9IGludmFs aWRPZmZzZXQsIEpTVmFsdWUgc3BlY2lmaWNWYWx1ZSA9IEpTVmFsdWUoKSwgUGFzc1JlZlB0cjxJ bnRlbmRlZFN0cnVjdHVyZUNoYWluPiBjaGFpbiA9IDApCisgICAgICAgIFByb3BlcnR5T2Zmc2V0 IG9mZnNldCA9IGludmFsaWRPZmZzZXQsIEpTVmFsdWUgc3BlY2lmaWNWYWx1ZSA9IEpTVmFsdWUo KSwgUGFzc1JlZlB0cjxJbnRlbmRlZFN0cnVjdHVyZUNoYWluPiBjaGFpbiA9IG51bGxwdHIpCiAg ICAgICAgIDogbV9zdGF0ZShzdGF0ZSkKICAgICAgICAgLCBtX3N0cnVjdHVyZVNldChzdHJ1Y3R1 cmVTZXQpCiAgICAgICAgICwgbV9jaGFpbihjaGFpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdXb3JrbGlzdC5jcHAKaW5kZXggOThkZTZmYWRhMjNiNmM0N2I0MjM3ZTA4ZjRlNDc3Zjc1 YWE1M2I4OC4uNzdiMmZjMDk2NjYyY2YyMDM5MDMxM2RhYTJjNDI0OTk1NmEwOTEyMyAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3JrbGlzdC5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3JrbGlzdC5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAg V29ya2xpc3Q6On5Xb3JrbGlzdCgpCiAgICAgewogICAgICAgICBNdXRleExvY2tlciBsb2NrZXIo bV9sb2NrKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gbV90aHJlYWRzLnNpemUoKTsgaS0t OykKLSAgICAgICAgICAgIG1fcXVldWUuYXBwZW5kKFJlZlB0cjxQbGFuPigwKSk7IC8vIFVzZSBu dWxsIHBsYW4gdG8gaW5kaWNhdGUgdGhhdCB3ZSB3YW50IHRoZSB0aHJlYWQgdG8gdGVybWluYXRl LgorICAgICAgICAgICAgbV9xdWV1ZS5hcHBlbmQobnVsbHB0cik7IC8vIFVzZSBudWxsIHBsYW4g dG8gaW5kaWNhdGUgdGhhdCB3ZSB3YW50IHRoZSB0aHJlYWQgdG8gdGVybWluYXRlLgogICAgICAg ICBtX3BsYW5FbnF1ZXVlZC5icm9hZGNhc3QoKTsKICAgICB9CiAgICAgZm9yICh1bnNpZ25lZCBp ID0gbV90aHJlYWRzLnNpemUoKTsgaS0tOykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCmluZGV4IGVhNTU5Y2QxMzdmMWFmMDczZjQxNGU5 YzY4NWJhNDA1N2I3ZTlkZjYuLmI3OTIzMTIwMmE4Mjk3NGE0OWFkYmMyN2RjOTMyYTAyMWE5MmY2 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnBy ZXRlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJl dGVyLmNwcApAQCAtNDM0LDEzICs0MzQsMTMgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUgY29uc3Qg U3RyaW5nIGdldFNvdXJjZVVSTEZyb21DYWxsRnJhbWUoQ2FsbEZyYW1lKiBjYWxsRnJhbWUKIHN0 YXRpYyBTdGFja0ZyYW1lQ29kZVR5cGUgZ2V0U3RhY2tGcmFtZUNvZGVUeXBlKFN0YWNrVmlzaXRv ciYgdmlzaXRvcikKIHsKICAgICBzd2l0Y2ggKHZpc2l0b3ItPmNvZGVUeXBlKCkpIHsKLSAgICBj YXNlIFN0YWNrVmlzaXRvcjo6RnJhbWU6OkV2YWw6CisgICAgY2FzZSBDb2RlVHlwZTo6RXZhbDoK ICAgICAgICAgcmV0dXJuIFN0YWNrRnJhbWVFdmFsQ29kZTsKLSAgICBjYXNlIFN0YWNrVmlzaXRv cjo6RnJhbWU6OkZ1bmN0aW9uOgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0aW9uOgogICAgICAg ICByZXR1cm4gU3RhY2tGcmFtZUZ1bmN0aW9uQ29kZTsKLSAgICBjYXNlIFN0YWNrVmlzaXRvcjo6 RnJhbWU6Okdsb2JhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpHbG9iYWw6CiAgICAgICAgIHJldHVy biBTdGFja0ZyYW1lR2xvYmFsQ29kZTsKLSAgICBjYXNlIFN0YWNrVmlzaXRvcjo6RnJhbWU6Ok5h dGl2ZToKKyAgICBjYXNlIENvZGVUeXBlOjpOYXRpdmU6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgICAgICByZXR1cm4gU3RhY2tGcmFtZU5hdGl2ZUNvZGU7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrVmlzaXRvci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcApp bmRleCAxNmNhZTE2MjJmZWQyZWMyZWQ3YzQwYzc2YjY1MjAzYjI3YTk1MDA0Li5iNDlkNTNjMzEx MDEwOTdhZmQ0NjY4ZTVkMzNkOTlkNzk1MDA5ODkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcApAQCAtMTY3LDE4ICsxNjcsMTgg QEAgdm9pZCBTdGFja1Zpc2l0b3I6OnJlYWRJbmxpbmVkRnJhbWUoQ2FsbEZyYW1lKiBjYWxsRnJh bWUsIENvZGVPcmlnaW4qIGNvZGVPcmlnaW4KIFN0YWNrVmlzaXRvcjo6RnJhbWU6OkNvZGVUeXBl IFN0YWNrVmlzaXRvcjo6RnJhbWU6OmNvZGVUeXBlKCkgY29uc3QKIHsKICAgICBpZiAoIWlzSlNG cmFtZSgpKQotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6TmF0aXZlOworICAg ICAgICByZXR1cm4gQ29kZVR5cGU6Ok5hdGl2ZTsKIAogICAgIHN3aXRjaCAoY29kZUJsb2NrKCkt PmNvZGVUeXBlKCkpIHsKICAgICBjYXNlIEV2YWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tW aXNpdG9yOjpGcmFtZTo6RXZhbDsKKyAgICAgICAgcmV0dXJuIENvZGVUeXBlOjpFdmFsOwogICAg IGNhc2UgRnVuY3Rpb25Db2RlOgotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6 RnVuY3Rpb247CisgICAgICAgIHJldHVybiBDb2RlVHlwZTo6RnVuY3Rpb247CiAgICAgY2FzZSBH bG9iYWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6R2xvYmFsOwor ICAgICAgICByZXR1cm4gQ29kZVR5cGU6Okdsb2JhbDsKICAgICB9CiAgICAgUkVMRUFTRV9BU1NF UlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6R2xvYmFs OworICAgIHJldHVybiBDb2RlVHlwZTo6R2xvYmFsOwogfQogCiBTdHJpbmcgU3RhY2tWaXNpdG9y OjpGcmFtZTo6ZnVuY3Rpb25OYW1lKCkKQEAgLTE4NywxNyArMTg3LDE3IEBAIFN0cmluZyBTdGFj a1Zpc2l0b3I6OkZyYW1lOjpmdW5jdGlvbk5hbWUoKQogICAgIEpTT2JqZWN0KiBjYWxsZWUgPSB0 aGlzLT5jYWxsZWUoKTsKIAogICAgIHN3aXRjaCAoY29kZVR5cGUoKSkgewotICAgIGNhc2UgU3Rh Y2tWaXNpdG9yOjpGcmFtZTo6RXZhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpFdmFsOgogICAgICAg ICB0cmFjZUxpbmUgPSAiZXZhbCBjb2RlIjsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTdGFj a1Zpc2l0b3I6OkZyYW1lOjpOYXRpdmU6CisgICAgY2FzZSBDb2RlVHlwZTo6TmF0aXZlOgogICAg ICAgICBpZiAoY2FsbGVlKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERp c3BsYXlOYW1lKGNhbGxGcmFtZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpGdW5jdGlvbjoKKyAgICBjYXNlIENvZGVUeXBl OjpGdW5jdGlvbjoKICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERpc3BsYXlOYW1l KGNhbGxGcmFtZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBT dGFja1Zpc2l0b3I6OkZyYW1lOjpHbG9iYWw6CisgICAgY2FzZSBDb2RlVHlwZTo6R2xvYmFsOgog ICAgICAgICB0cmFjZUxpbmUgPSAiZ2xvYmFsIGNvZGUiOwogICAgICAgICBicmVhazsKICAgICB9 CkBAIC0yMDksMTUgKzIwOSwxNSBAQCBTdHJpbmcgU3RhY2tWaXNpdG9yOjpGcmFtZTo6c291cmNl VVJMKCkKICAgICBTdHJpbmcgdHJhY2VMaW5lOwogCiAgICAgc3dpdGNoIChjb2RlVHlwZSgpKSB7 Ci0gICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpFdmFsOgotICAgIGNhc2UgU3RhY2tWaXNp dG9yOjpGcmFtZTo6RnVuY3Rpb246Ci0gICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpHbG9i YWw6IHsKKyAgICBjYXNlIENvZGVUeXBlOjpFdmFsOgorICAgIGNhc2UgQ29kZVR5cGU6OkZ1bmN0 aW9uOgorICAgIGNhc2UgQ29kZVR5cGU6Okdsb2JhbDogewogICAgICAgICBTdHJpbmcgc291cmNl VVJMID0gY29kZUJsb2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLT5zb3VyY2VVUkwoKTsKICAgICAg ICAgaWYgKCFzb3VyY2VVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gc291 cmNlVVJMLmltcGwoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgU3RhY2tWaXNp dG9yOjpGcmFtZTo6TmF0aXZlOgorICAgIGNhc2UgQ29kZVR5cGU6Ok5hdGl2ZToKICAgICAgICAg dHJhY2VMaW5lID0gIltuYXRpdmUgY29kZV0iOwogICAgICAgICBicmVhazsKICAgICB9CkBAIC0z NjAsNyArMzYwLDcgQEAgdm9pZCBTdGFja1Zpc2l0b3I6OkZyYW1lOjpwcmludChpbnQgaW5kZW50 TGV2ZWwpCiAKICAgICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IG1fY2FsbEZyYW1lOwogICAgIENh bGxGcmFtZSogY2FsbGVyRnJhbWUgPSB0aGlzLT5jYWxsZXJGcmFtZSgpOwotICAgIHZvaWQqIHJl dHVyblBDID0gY2FsbEZyYW1lLT5oYXNSZXR1cm5QQygpID8gY2FsbEZyYW1lLT5yZXR1cm5QQygp LnZhbHVlKCkgOiAwOworICAgIHZvaWQqIHJldHVyblBDID0gY2FsbEZyYW1lLT5oYXNSZXR1cm5Q QygpID8gY2FsbEZyYW1lLT5yZXR1cm5QQygpLnZhbHVlKCkgOiBudWxscHRyOwogCiAgICAgcHJp bnRpZihpLCAiICAgbmFtZSAnJXMnXG4iLCBmdW5jdGlvbk5hbWUoKS51dGY4KCkuZGF0YSgpKTsK ICAgICBwcmludGlmKGksICIgICBzb3VyY2VVUkwgJyVzJ1xuIiwgc291cmNlVVJMKCkudXRmOCgp LmRhdGEoKSk7Cg== 211421 2013-09-12 05:11:04 -0700 2013-09-12 08:27:17 -0700 Patch bug-119266-20130912141122.patch text/plain 5491 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZjlkODA0ZmM2Yjg5MmJlODY0NzY4YzczMWNkMDFlOTNkOTAxZWNiLi45NDJhMmRiYjE2ZDg5Y2E5 Mjc4OTZmNWYxODNlZGRiOGMwMTAzOWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMy0wOS0xMiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEFkZCBiYWNrIGMrKzExIGZlYXR1cmVzIHJlbW92ZWQgYnkgYnVpbGRm aXhlcyBhZnRlciBhbGwgcG9ydHMgZGlkIHRoZSBzd2l0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTI2NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oOgor ICAgICAgICAoSlNDOjpHZXRCeUlkU3RhdHVzOjpHZXRCeUlkU3RhdHVzKToKKyAgICAgICAgKiBk ZmcvREZHV29ya2xpc3QuY3BwOgorICAgICAgICAoSlNDOjpERkc6OldvcmtsaXN0Ojp+V29ya2xp c3QpOgorICAgICAgICAqIGludGVycHJldGVyL1N0YWNrVmlzaXRvci5jcHA6CisgICAgICAgIChK U0M6OlN0YWNrVmlzaXRvcjo6RnJhbWU6OmNvZGVUeXBlKToKKyAgICAgICAgKEpTQzo6U3RhY2tW aXNpdG9yOjpGcmFtZTo6ZnVuY3Rpb25OYW1lKToKKyAgICAgICAgKEpTQzo6U3RhY2tWaXNpdG9y OjpGcmFtZTo6c291cmNlVVJMKToKKyAgICAgICAgKEpTQzo6U3RhY2tWaXNpdG9yOjpGcmFtZTo6 cHJpbnQpOgorCiAyMDEzLTA5LTEyICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRu eWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFJlbW92ZSBob21lLWJyZXdlZCBudWxscHRyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dldEJ5SWRTdGF0dXMuaAppbmRleCBl ODhkMDNhYzFmMGJkOWEyZjY4NThiOTZmZjZlZDZmYjc3ZDdhOTkzLi41YzFmMDdkNzQ4MzFiZmRl MTBmNzcwOTljYTQzOGU0NWE2ZDk4Y2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9HZXRCeUlkU3RhdHVzLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIAog ICAgIEdldEJ5SWRTdGF0dXMoCiAgICAgICAgIFN0YXRlIHN0YXRlLCBib29sIHdhc1NlZW5JbkpJ VCwgY29uc3QgU3RydWN0dXJlU2V0JiBzdHJ1Y3R1cmVTZXQgPSBTdHJ1Y3R1cmVTZXQoKSwKLSAg ICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gaW52YWxpZE9mZnNldCwgSlNWYWx1ZSBzcGVj aWZpY1ZhbHVlID0gSlNWYWx1ZSgpLCBQYXNzUmVmUHRyPEludGVuZGVkU3RydWN0dXJlQ2hhaW4+ IGNoYWluID0gMCkKKyAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gaW52YWxpZE9mZnNl dCwgSlNWYWx1ZSBzcGVjaWZpY1ZhbHVlID0gSlNWYWx1ZSgpLCBQYXNzUmVmUHRyPEludGVuZGVk U3RydWN0dXJlQ2hhaW4+IGNoYWluID0gbnVsbHB0cikKICAgICAgICAgOiBtX3N0YXRlKHN0YXRl KQogICAgICAgICAsIG1fc3RydWN0dXJlU2V0KHN0cnVjdHVyZVNldCkKICAgICAgICAgLCBtX2No YWluKGNoYWluKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3Jr bGlzdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcAppbmRl eCA5OGRlNmZhZGEyM2I2YzQ3YjQyMzdlMDhmNGU0NzdmNzVhYTUzYjg4Li43N2IyZmMwOTY2NjJj ZjIwMzkwMzEzZGFhMmM0MjQ5OTU2YTA5MTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1dvcmtsaXN0LmNwcApAQCAtNDQsNyArNDQsNyBAQCBXb3JrbGlzdDo6fldvcmtsaXN0KCkK ICAgICB7CiAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2xvY2spOwogICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSBtX3RocmVhZHMuc2l6ZSgpOyBpLS07KQotICAgICAgICAgICAgbV9xdWV1 ZS5hcHBlbmQoUmVmUHRyPFBsYW4+KDApKTsgLy8gVXNlIG51bGwgcGxhbiB0byBpbmRpY2F0ZSB0 aGF0IHdlIHdhbnQgdGhlIHRocmVhZCB0byB0ZXJtaW5hdGUuCisgICAgICAgICAgICBtX3F1ZXVl LmFwcGVuZChudWxscHRyKTsgLy8gVXNlIG51bGwgcGxhbiB0byBpbmRpY2F0ZSB0aGF0IHdlIHdh bnQgdGhlIHRocmVhZCB0byB0ZXJtaW5hdGUuCiAgICAgICAgIG1fcGxhbkVucXVldWVkLmJyb2Fk Y2FzdCgpOwogICAgIH0KICAgICBmb3IgKHVuc2lnbmVkIGkgPSBtX3RocmVhZHMuc2l6ZSgpOyBp LS07KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNr VmlzaXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNp dG9yLmNwcAppbmRleCAxNmNhZTE2MjJmZWQyZWMyZWQ3YzQwYzc2YjY1MjAzYjI3YTk1MDA0Li5i NDlkNTNjMzExMDEwOTdhZmQ0NjY4ZTVkMzNkOTlkNzk1MDA5ODkxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvU3RhY2tWaXNpdG9yLmNwcApAQCAtMTY3LDE4 ICsxNjcsMTggQEAgdm9pZCBTdGFja1Zpc2l0b3I6OnJlYWRJbmxpbmVkRnJhbWUoQ2FsbEZyYW1l KiBjYWxsRnJhbWUsIENvZGVPcmlnaW4qIGNvZGVPcmlnaW4KIFN0YWNrVmlzaXRvcjo6RnJhbWU6 OkNvZGVUeXBlIFN0YWNrVmlzaXRvcjo6RnJhbWU6OmNvZGVUeXBlKCkgY29uc3QKIHsKICAgICBp ZiAoIWlzSlNGcmFtZSgpKQotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6TmF0 aXZlOworICAgICAgICByZXR1cm4gQ29kZVR5cGU6Ok5hdGl2ZTsKIAogICAgIHN3aXRjaCAoY29k ZUJsb2NrKCktPmNvZGVUeXBlKCkpIHsKICAgICBjYXNlIEV2YWxDb2RlOgotICAgICAgICByZXR1 cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6RXZhbDsKKyAgICAgICAgcmV0dXJuIENvZGVUeXBlOjpF dmFsOwogICAgIGNhc2UgRnVuY3Rpb25Db2RlOgotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9y OjpGcmFtZTo6RnVuY3Rpb247CisgICAgICAgIHJldHVybiBDb2RlVHlwZTo6RnVuY3Rpb247CiAg ICAgY2FzZSBHbG9iYWxDb2RlOgotICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFtZTo6 R2xvYmFsOworICAgICAgICByZXR1cm4gQ29kZVR5cGU6Okdsb2JhbDsKICAgICB9CiAgICAgUkVM RUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpGcmFt ZTo6R2xvYmFsOworICAgIHJldHVybiBDb2RlVHlwZTo6R2xvYmFsOwogfQogCiBTdHJpbmcgU3Rh Y2tWaXNpdG9yOjpGcmFtZTo6ZnVuY3Rpb25OYW1lKCkKQEAgLTE4NywxNyArMTg3LDE3IEBAIFN0 cmluZyBTdGFja1Zpc2l0b3I6OkZyYW1lOjpmdW5jdGlvbk5hbWUoKQogICAgIEpTT2JqZWN0KiBj YWxsZWUgPSB0aGlzLT5jYWxsZWUoKTsKIAogICAgIHN3aXRjaCAoY29kZVR5cGUoKSkgewotICAg IGNhc2UgU3RhY2tWaXNpdG9yOjpGcmFtZTo6RXZhbDoKKyAgICBjYXNlIENvZGVUeXBlOjpFdmFs OgogICAgICAgICB0cmFjZUxpbmUgPSAiZXZhbCBjb2RlIjsKICAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpOYXRpdmU6CisgICAgY2FzZSBDb2RlVHlwZTo6TmF0 aXZlOgogICAgICAgICBpZiAoY2FsbGVlKQogICAgICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2Fs Y3VsYXRlZERpc3BsYXlOYW1lKGNhbGxGcmFtZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpGdW5jdGlvbjoKKyAgICBjYXNl IENvZGVUeXBlOjpGdW5jdGlvbjoKICAgICAgICAgdHJhY2VMaW5lID0gZ2V0Q2FsY3VsYXRlZERp c3BsYXlOYW1lKGNhbGxGcmFtZSgpLCBjYWxsZWUpLmltcGwoKTsKICAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpHbG9iYWw6CisgICAgY2FzZSBDb2RlVHlwZTo6 R2xvYmFsOgogICAgICAgICB0cmFjZUxpbmUgPSAiZ2xvYmFsIGNvZGUiOwogICAgICAgICBicmVh azsKICAgICB9CkBAIC0yMDksMTUgKzIwOSwxNSBAQCBTdHJpbmcgU3RhY2tWaXNpdG9yOjpGcmFt ZTo6c291cmNlVVJMKCkKICAgICBTdHJpbmcgdHJhY2VMaW5lOwogCiAgICAgc3dpdGNoIChjb2Rl VHlwZSgpKSB7Ci0gICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZyYW1lOjpFdmFsOgotICAgIGNhc2Ug U3RhY2tWaXNpdG9yOjpGcmFtZTo6RnVuY3Rpb246Ci0gICAgY2FzZSBTdGFja1Zpc2l0b3I6OkZy YW1lOjpHbG9iYWw6IHsKKyAgICBjYXNlIENvZGVUeXBlOjpFdmFsOgorICAgIGNhc2UgQ29kZVR5 cGU6OkZ1bmN0aW9uOgorICAgIGNhc2UgQ29kZVR5cGU6Okdsb2JhbDogewogICAgICAgICBTdHJp bmcgc291cmNlVVJMID0gY29kZUJsb2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLT5zb3VyY2VVUkwo KTsKICAgICAgICAgaWYgKCFzb3VyY2VVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgdHJhY2VM aW5lID0gc291cmNlVVJMLmltcGwoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2Ug U3RhY2tWaXNpdG9yOjpGcmFtZTo6TmF0aXZlOgorICAgIGNhc2UgQ29kZVR5cGU6Ok5hdGl2ZToK ICAgICAgICAgdHJhY2VMaW5lID0gIltuYXRpdmUgY29kZV0iOwogICAgICAgICBicmVhazsKICAg ICB9CkBAIC0zNjAsNyArMzYwLDcgQEAgdm9pZCBTdGFja1Zpc2l0b3I6OkZyYW1lOjpwcmludChp bnQgaW5kZW50TGV2ZWwpCiAKICAgICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IG1fY2FsbEZyYW1l OwogICAgIENhbGxGcmFtZSogY2FsbGVyRnJhbWUgPSB0aGlzLT5jYWxsZXJGcmFtZSgpOwotICAg IHZvaWQqIHJldHVyblBDID0gY2FsbEZyYW1lLT5oYXNSZXR1cm5QQygpID8gY2FsbEZyYW1lLT5y ZXR1cm5QQygpLnZhbHVlKCkgOiAwOworICAgIHZvaWQqIHJldHVyblBDID0gY2FsbEZyYW1lLT5o YXNSZXR1cm5QQygpID8gY2FsbEZyYW1lLT5yZXR1cm5QQygpLnZhbHVlKCkgOiBudWxscHRyOwog CiAgICAgcHJpbnRpZihpLCAiICAgbmFtZSAnJXMnXG4iLCBmdW5jdGlvbk5hbWUoKS51dGY4KCku ZGF0YSgpKTsKICAgICBwcmludGlmKGksICIgICBzb3VyY2VVUkwgJyVzJ1xuIiwgc291cmNlVVJM KCkudXRmOCgpLmRhdGEoKSk7Cg==