126717 2014-01-09 13:49:33 -0800 Web Inspector: Consolidate developerExtrasEnabled to just InspectorEnvironment 2014-01-09 14:49:25 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck mkwst timothy webkit-bug-importer oldest_to_newest 966055 0 joepeck 2014-01-09 13:49:33 -0800 Currently there are multiple inspector agents (Inspector, Console) that have developerExtrasEnabled checks. They all route to InspectorEnvironment (*InspectorController), so just use the InspectorEnvironment call directly. Note, all WebCore agents have InstrumentingAgents, so put InspectorEnvironment on InstrumentingAgents to make it available to all agents. 966057 1 webkit-bug-importer 2014-01-09 13:51:11 -0800 <rdar://problem/15785810> 966058 2 220766 joepeck 2014-01-09 13:51:21 -0800 Created attachment 220766 [PATCH] Proposed Fix 966081 3 220766 commit-queue 2014-01-09 14:49:23 -0800 Comment on attachment 220766 [PATCH] Proposed Fix Clearing flags on attachment: 220766 Committed r161588: <http://trac.webkit.org/changeset/161588> 966082 4 commit-queue 2014-01-09 14:49:25 -0800 All reviewed patches have been landed. Closing bug. 220766 2014-01-09 13:51:21 -0800 2014-01-09 14:49:23 -0800 [PATCH] Proposed Fix developerExtrasEnabled.patch text/plain 20202 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYWVjM2FlLi41ODNjMmJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDgg QEAKIDIwMTQtMDEtMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb25zb2xpZGF0ZSBkZXZlbG9wZXJFeHRyYXNFbmFibGVk IHRvIGp1c3QgSW5zcGVjdG9yRW52aXJvbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjcxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZXkgYWxsIHJvdXRlIHRvIEluc3BlY3RvckVudmlyb25t ZW50OjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkLCBzbyBtYWtlCisgICAgICAgIEluc3BlY3RvckVu dmlyb25tZW50IGF2YWlsYWJsZSB0byBhbGwgYWdlbnRzIHRocm91Z2ggSW5zdHJ1bWVudGluZ0Fn ZW50cworICAgICAgICBhbmQgdXNlIHRoYXQgd2hlcmUgbmVlZGVkLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFn ZW50OjpJbnNwZWN0b3JBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50 Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6Y3JlYXRlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmRpZEZpbmlzaFhIUkxvYWRpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2Up OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmFkZENvbnNvbGVN ZXNzYWdlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50Lmg6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjplbmFibGVkKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlSW1w bCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENvbW1p dExvYWRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6 ZnJhbWVEb2N1bWVudFVwZGF0ZWRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkT3BlbkRhdGFiYXNlSW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNvY2tldEltcGwpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3RydW1lbnRpbmdBZ2VudHM6Okluc3RydW1lbnRpbmdBZ2VudHMpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmg6CisgICAgICAgIChXZWJDb3JlOjpJbnN0cnVt ZW50aW5nQWdlbnRzOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zdHJ1bWVudGluZ0Fn ZW50czo6aW5zcGVjdG9yRW52aXJvbm1lbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9QYWdlQ29u c29sZUFnZW50LmNwcDoKKyAgICAgICAgKiBpbnNwZWN0b3IvUGFnZUNvbnNvbGVBZ2VudC5oOgor ICAgICAgICAqIGluc3BlY3Rvci9Xb3JrZXJDb25zb2xlQWdlbnQuY3BwOgorICAgICAgICAqIGlu c3BlY3Rvci9Xb3JrZXJDb25zb2xlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvV29ya2Vy SW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJJbnNwZWN0 b3JDb250cm9sbGVyOjpXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKToKKworMjAxNC0wMS0wOSAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFJlbW92ZSBVbm5lY2Vzc2FyeSBJbnNwZWN0b3JBZ2VudCBwYXJhbWV0ZXJzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3MTIKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKaW5kZXggNDE3NjdjZi4u NTJjYzNiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFn ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3Bw CkBAIC0zNSw4ICszNSw2IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yQWdlbnQuaCIKIAogI2luY2x1 ZGUgIkluc3RydW1lbnRpbmdBZ2VudHMuaCIKLSNpbmNsdWRlICJQYWdlLmgiCi0jaW5jbHVkZSAi U2V0dGluZ3MuaCIKICNpbmNsdWRlIDxiaW5kaW5ncy9TY3JpcHRWYWx1ZS5oPgogI2luY2x1ZGUg PGluc3BlY3Rvci9JbnNwZWN0b3JKU0Zyb250ZW5kRGlzcGF0Y2hlcnMuaD4KICNpbmNsdWRlIDxp bnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg+CkBAIC00NywxMiArNDUsMTAgQEAgdXNpbmcgbmFt ZXNwYWNlIEluc3BlY3RvcjsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1JbnNwZWN0b3JBZ2Vu dDo6SW5zcGVjdG9yQWdlbnQoUGFnZSogcGFnZSwgSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1 bWVudGluZ0FnZW50cykKK0luc3BlY3RvckFnZW50OjpJbnNwZWN0b3JBZ2VudChJbnN0cnVtZW50 aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzKQogICAgIDogSW5zcGVjdG9yQWdlbnRCYXNl KEFTQ0lJTGl0ZXJhbCgiSW5zcGVjdG9yIiksIGluc3RydW1lbnRpbmdBZ2VudHMpCi0gICAgLCBt X2luc3BlY3RlZFBhZ2UocGFnZSkKICAgICAsIG1fZW5hYmxlZChmYWxzZSkKIHsKLSAgICBBU1NF UlRfQVJHKHBhZ2UsIHBhZ2UpOwogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVj dG9yQWdlbnQodGhpcyk7CiB9CiAKQEAgLTExNSwxMyArMTExLDYgQEAgdm9pZCBJbnNwZWN0b3JB Z2VudDo6aW5zcGVjdChQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6 OlJlbW90ZU8KICAgICBtX3BlbmRpbmdJbnNwZWN0RGF0YS5zZWNvbmQgPSBoaW50czsKIH0KIAot Ym9vbCBJbnNwZWN0b3JBZ2VudDo6ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpIGNvbnN0Ci17Ci0g ICAgaWYgKCFtX2luc3BlY3RlZFBhZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1 cm4gbV9pbnNwZWN0ZWRQYWdlLT5zZXR0aW5ncygpLmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKTsK LX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKElOU1BFQ1RP UikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgKaW5kZXggZWI5ZWY3 Zi4uY2NhNTllNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgK QEAgLTQ0LDI2ICs0NCwyMCBAQCBjbGFzcyBJbnNwZWN0b3JJbnNwZWN0b3JGcm9udGVuZERpc3Bh dGNoZXI7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgRE9NV3JhcHBlcldvcmxkOwot Y2xhc3MgRG9jdW1lbnRMb2FkZXI7Ci1jbGFzcyBGcmFtZTsKIGNsYXNzIEluc3RydW1lbnRpbmdB Z2VudHM7Ci1jbGFzcyBQYWdlOwogCiB0eXBlZGVmIFN0cmluZyBFcnJvclN0cmluZzsKIAogY2xh c3MgSW5zcGVjdG9yQWdlbnQgOiBwdWJsaWMgSW5zcGVjdG9yQWdlbnRCYXNlLCBwdWJsaWMgSW5z cGVjdG9yOjpJbnNwZWN0b3JJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIgewogICAg IFdURl9NQUtFX05PTkNPUFlBQkxFKEluc3BlY3RvckFnZW50KTsKIHB1YmxpYzoKLSAgICBzdGF0 aWMgUGFzc093blB0cjxJbnNwZWN0b3JBZ2VudD4gY3JlYXRlKFBhZ2UqIHBhZ2UsIEluc3RydW1l bnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMpCisgICAgc3RhdGljIFBhc3NPd25QdHI8 SW5zcGVjdG9yQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5n QWdlbnRzKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJbnNwZWN0b3JBZ2Vu dChwYWdlLCBpbnN0cnVtZW50aW5nQWdlbnRzKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgSW5zcGVjdG9yQWdlbnQoaW5zdHJ1bWVudGluZ0FnZW50cykpOwogICAgIH0KIAogICAgIHZp cnR1YWwgfkluc3BlY3RvckFnZW50KCk7CiAKLSAgICBib29sIGRldmVsb3BlckV4dHJhc0VuYWJs ZWQoKSBjb25zdDsKLQogICAgIC8vIEluc3BlY3RvciBmcm9udC1lbmQgQVBJLgogICAgIHZvaWQg ZW5hYmxlKEVycm9yU3RyaW5nKik7CiAgICAgdm9pZCBkaXNhYmxlKEVycm9yU3RyaW5nKik7CkBA IC03NywxNSArNzEsMTIgQEAgcHVibGljOgogICAgIHZvaWQgaW5zcGVjdChQYXNzUmVmUHRyPElu c3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlJlbW90ZU9iamVjdD4gb2JqZWN0VG9JbnNw ZWN0LCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBoaW50cyk7CiAKIHBy aXZhdGU6Ci0gICAgSW5zcGVjdG9yQWdlbnQoUGFnZSosIEluc3RydW1lbnRpbmdBZ2VudHMqKTsK KyAgICBJbnNwZWN0b3JBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKik7CiAKLSAgICBQYWdlKiBt X2luc3BlY3RlZFBhZ2U7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9y SW5zcGVjdG9yRnJvbnRlbmREaXNwYXRjaGVyPiBtX2Zyb250ZW5kRGlzcGF0Y2hlcjsKICAgICBS ZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcj4gbV9i YWNrZW5kRGlzcGF0Y2hlcjsKLQogICAgIFZlY3RvcjxzdGQ6OnBhaXI8bG9uZywgU3RyaW5nPj4g bV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHM7CiAgICAgc3RkOjpwYWlyPFJlZlB0cjxJbnNw ZWN0b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1lOjpSZW1vdGVPYmplY3Q+LCBSZWZQdHI8SW5zcGVj dG9yOjpJbnNwZWN0b3JPYmplY3Q+PiBtX3BlbmRpbmdJbnNwZWN0RGF0YTsKLQogICAgIGJvb2wg bV9lbmFibGVkOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnNvbGVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29uc29sZUFnZW50LmNwcAppbmRleCBkNjA5NTg3Li44ZTY1ZjkzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcApAQCAtMTQx LDcgKzE0MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50Ojp3aWxsRGVzdHJveUZyb250 ZW5kQW5kQmFja2VuZCgpCiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjphZGRNZXNzYWdl VG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlVHlwZSB0eXBlLCBNZXNzYWdl TGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgUGFzc1JlZlB0cjxTY3JpcHRDYWxs U3RhY2s+IGNhbGxTdGFjaywgdW5zaWduZWQgbG9uZyByZXF1ZXN0SWRlbnRpZmllcikKIHsKLSAg ICBpZiAoIWRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKKyAgICBpZiAoIW1faW5zdHJ1bWVudGlu Z0FnZW50cy0+aW5zcGVjdG9yRW52aXJvbm1lbnQoKS5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICh0eXBlID09IENsZWFyTWVzc2FnZVR5cGUpIHsK QEAgLTE1NCw3ICsxNTQsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2Fn ZVRvQ29uc29sZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cAogCiB2b2lkIEluc3Bl Y3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlIHNvdXJj ZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxldmVsIGxldmVsLCBjb25zdCBTdHJpbmcmIG1l c3NhZ2UsIEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+ IGFyZ3VtZW50cywgdW5zaWduZWQgbG9uZyByZXF1ZXN0SWRlbnRpZmllcikKIHsKLSAgICBpZiAo IWRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKKyAgICBpZiAoIW1faW5zdHJ1bWVudGluZ0FnZW50 cy0+aW5zcGVjdG9yRW52aXJvbm1lbnQoKS5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGlmICh0eXBlID09IENsZWFyTWVzc2FnZVR5cGUpIHsKQEAgLTE2 Nyw3ICsxNjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRvQ29u c29sZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cAogCiB2b2lkIEluc3BlY3RvckNv bnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVz c2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxldmVsIGxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2Us IGNvbnN0IFN0cmluZyYgc2NyaXB0SUQsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIHVuc2lnbmVkIGNv bHVtbk51bWJlciwgSlNDOjpFeGVjU3RhdGUqIHN0YXRlLCB1bnNpZ25lZCBsb25nIHJlcXVlc3RJ ZGVudGlmaWVyKQogewotICAgIGlmICghZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQorICAgIGlm ICghbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JFbnZpcm9ubWVudCgpLmRldmVsb3Bl ckV4dHJhc0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHR5cGUgPT0gQ2xl YXJNZXNzYWdlVHlwZSkgewpAQCAtMjUxLDcgKzI1MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29s ZUFnZW50OjpmcmFtZVdpbmRvd0Rpc2NhcmRlZChET01XaW5kb3cqIHdpbmRvdykKIAogdm9pZCBJ bnNwZWN0b3JDb25zb2xlQWdlbnQ6OmRpZEZpbmlzaFhIUkxvYWRpbmcodW5zaWduZWQgbG9uZyBy ZXF1ZXN0SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgc2VuZFVS TCwgdW5zaWduZWQgc2VuZExpbmVOdW1iZXIsIHVuc2lnbmVkIHNlbmRDb2x1bW5OdW1iZXIpCiB7 Ci0gICAgaWYgKCFkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkpCisgICAgaWYgKCFtX2luc3RydW1l bnRpbmdBZ2VudHMtPmluc3BlY3RvckVudmlyb25tZW50KCkuZGV2ZWxvcGVyRXh0cmFzRW5hYmxl ZCgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKG1fZnJvbnRlbmREaXNwYXRjaGVyICYmIG1f bW9uaXRvcmluZ1hIUkVuYWJsZWQpIHsKICAgICAgICAgU3RyaW5nIG1lc3NhZ2UgPSAiWEhSIGZp bmlzaGVkIGxvYWRpbmc6IFwiIiArIHVybCArICJcIi4iOwpAQCAtMjYxLDcgKzI2MSw3IEBAIHZv aWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGaW5pc2hYSFJMb2FkaW5nKHVuc2lnbmVkIGxv bmcgcmVxdWVzdElkZW50aWZpZXIsCiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRS ZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyByZXF1ZXN0SWRlbnRpZmllciwgY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7Ci0gICAgaWYgKCFkZXZlbG9wZXJFeHRyYXNFbmFi bGVkKCkpCisgICAgaWYgKCFtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckVudmlyb25t ZW50KCkuZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBp ZiAocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSA+PSA0MDApIHsKQEAgLTI3Miw3ICsyNzIsNyBA QCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVk IGxvbmcgcmVxdWVzdElkZW50aWZpZXIsCiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50Ojpk aWRGYWlsTG9hZGluZyh1bnNpZ25lZCBsb25nIHJlcXVlc3RJZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKIHsKLSAgICBpZiAoIWRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkK KyAgICBpZiAoIW1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yRW52aXJvbm1lbnQoKS5k ZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoZXJyb3Iu aXNDYW5jZWxsYXRpb24oKSkgLy8gUmVwb3J0IGZhaWx1cmVzIG9ubHkuCiAgICAgICAgIHJldHVy bjsKQEAgLTI5OSw3ICsyOTksNyBAQCBzdGF0aWMgYm9vbCBpc0dyb3VwTWVzc2FnZShNZXNzYWdl VHlwZSB0eXBlKQogCiB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkQ29uc29sZU1lc3Nh Z2UoUGFzc093blB0cjxDb25zb2xlTWVzc2FnZT4gY29uc29sZU1lc3NhZ2UpCiB7Ci0gICAgQVNT RVJUKGRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSk7CisgICAgQVNTRVJUKG1faW5zdHJ1bWVudGlu Z0FnZW50cy0+aW5zcGVjdG9yRW52aXJvbm1lbnQoKS5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkp OwogICAgIEFTU0VSVF9BUkcoY29uc29sZU1lc3NhZ2UsIGNvbnNvbGVNZXNzYWdlKTsKIAogICAg IGlmIChtX3ByZXZpb3VzTWVzc2FnZSAmJiAhaXNHcm91cE1lc3NhZ2UobV9wcmV2aW91c01lc3Nh Z2UtPnR5cGUoKSkgJiYgbV9wcmV2aW91c01lc3NhZ2UtPmlzRXF1YWwoY29uc29sZU1lc3NhZ2Uu Z2V0KCkpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29uc29sZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29s ZUFnZW50LmgKaW5kZXggZjcyMzgwMy4uNDhhODA3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaApAQCAtOTgsOCArOTgsNiBAQCBwdWJs aWM6CiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBhZGRDb25zb2xlTWVzc2FnZShQYXNzT3duUHRyPENv bnNvbGVNZXNzYWdlPik7CiAKLSAgICB2aXJ0dWFsIGJvb2wgZGV2ZWxvcGVyRXh0cmFzRW5hYmxl ZCgpID0gMDsKLQogICAgIFBhZ2VJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3I6Okluc3BlY3RvckNvbnNv bGVGcm9udGVuZERpc3BhdGNoZXI+IG1fZnJvbnRlbmREaXNwYXRjaGVyOwogICAgIFJlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3RvckNvbnNvbGVCYWNrZW5kRGlzcGF0Y2hlcj4gbV9iYWNrZW5kRGlz cGF0Y2hlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcAppbmRleCA1MjJiMGE0Li5hZmRkNzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC04Myw3ICs4Myw3IEBAIHVzaW5n IG5hbWVzcGFjZSBJbnNwZWN0b3I7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEluc3BlY3RvckNv bnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50 KiBpbnNwZWN0b3JDbGllbnQpCi0gICAgOiBtX2luc3RydW1lbnRpbmdBZ2VudHMoSW5zdHJ1bWVu dGluZ0FnZW50czo6Y3JlYXRlKCkpCisgICAgOiBtX2luc3RydW1lbnRpbmdBZ2VudHMoSW5zdHJ1 bWVudGluZ0FnZW50czo6Y3JlYXRlKCp0aGlzKSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKHN0ZDo6bWFrZV91bmlxdWU8UGFnZUluamVjdGVkU2NyaXB0TWFuYWdlcj4oKnRoaXMsIFBh Z2VJbmplY3RlZFNjcmlwdEhvc3Q6OmNyZWF0ZSgpKSkKICAgICAsIG1fb3ZlcmxheShJbnNwZWN0 b3JPdmVybGF5OjpjcmVhdGUocGFnZSwgaW5zcGVjdG9yQ2xpZW50KSkKICAgICAsIG1faW5zcGVj dG9yRnJvbnRlbmRDaGFubmVsKG51bGxwdHIpCkBAIC05Niw3ICs5Niw3IEBAIEluc3BlY3RvckNv bnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50 KiBpbnNwZWN0b3JDCiB7CiAgICAgQVNTRVJUX0FSRyhpbnNwZWN0b3JDbGllbnQsIGluc3BlY3Rv ckNsaWVudCk7CiAKLSAgICBPd25QdHI8SW5zcGVjdG9yQWdlbnQ+IGluc3BlY3RvckFnZW50UHRy KEluc3BlY3RvckFnZW50OjpjcmVhdGUocGFnZSwgbV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgp KSk7CisgICAgT3duUHRyPEluc3BlY3RvckFnZW50PiBpbnNwZWN0b3JBZ2VudFB0cihJbnNwZWN0 b3JBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSkpOwogICAgIG1faW5z cGVjdG9yQWdlbnQgPSBpbnNwZWN0b3JBZ2VudFB0ci5nZXQoKTsKICAgICBtX2FnZW50cy5hcHBl bmQoaW5zcGVjdG9yQWdlbnRQdHIucmVsZWFzZSgpKTsKIApAQCAtMzYyLDcgKzM2Miw3IEBAIHZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdChOb2RlKiBub2RlKQogCiBib29sIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmVuYWJsZWQoKSBjb25zdAogewotICAgIHJldHVybiBtX2luc3BlY3Rv ckFnZW50LT5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCk7CisgICAgcmV0dXJuIGRldmVsb3BlckV4 dHJhc0VuYWJsZWQoKTsKIH0KIAogUGFnZSogSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdGVk UGFnZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDhlNTg2YzguLjI1MThiOTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw CkBAIC02MTQsOCArNjE0LDcgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Om1hcmtS ZXNvdXJjZUFzQ2FjaGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnMKIAogdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZUltcGwo SW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRG9jdW1lbnRMb2FkZXIq IGxvYWRlciwgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlKQogewotICAgIEluc3BlY3Rv ckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFn ZW50KCk7Ci0gICAgaWYgKCFpbnNwZWN0b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmRldmVs b3BlckV4dHJhc0VuYWJsZWQoKSkKKyAgICBpZiAoIWluc3RydW1lbnRpbmdBZ2VudHMtPmluc3Bl Y3RvckVudmlyb25tZW50KCkuZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAgICAgICByZXR1 cm47CiAgICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0 cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JSZXNvdXJjZUFnZW50KCkpCiAgICAgICAgIHJlc291 cmNlQWdlbnQtPmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShsb2FkZXIsIGNhY2hlZFJl c291cmNlKTsKQEAgLTgxNyw4ICs4MTYsNyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZnJhbWVEZXRhY2hlZEZyb21QYXJlbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqCiAKIHZv aWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkSW1wbChJbnN0cnVtZW50 aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQYWdlKiBwYWdlLCBEb2N1bWVudExvYWRl ciogbG9hZGVyKQogewotICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3Ry dW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYgKCFpbnNwZWN0b3JBZ2Vu dCB8fCAhaW5zcGVjdG9yQWdlbnQtPmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKKyAgICBpZiAo IWluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckVudmlyb25tZW50KCkuZGV2ZWxvcGVyRXh0 cmFzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobG9hZGVyLT5mcmFtZSgp LT5pc01haW5GcmFtZSgpKSB7CkBAIC04NTYsMTAgKzg1NCw4IEBAIHZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0 cnVtZW50CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZURvY3VtZW50VXBk YXRlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUq IGZyYW1lKQogewotICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3RydW1l bnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYgKCFpbnNwZWN0b3JBZ2VudCB8 fCAhaW5zcGVjdG9yQWdlbnQtPmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKKyAgICBpZiAoIWlu c3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckVudmlyb25tZW50KCkuZGV2ZWxvcGVyRXh0cmFz RW5hYmxlZCgpKQogICAgICAgICByZXR1cm47Ci0KICAgICBpZiAoSW5zcGVjdG9yRE9NQWdlbnQq IGRvbUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yRE9NQWdlbnQoKSkKICAg ICAgICAgZG9tQWdlbnQtPmZyYW1lRG9jdW1lbnRVcGRhdGVkKGZyYW1lKTsKIH0KQEAgLTEwMjYs OCArMTAyMiw3IEBAIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpwcm9maWxlckVuYWJs ZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lCiAjaWYgRU5BQkxFKFNRTF9EQVRB QkFTRSkKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRPcGVuRGF0YWJhc2VJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIFBhc3NSZWZQdHI8RGF0 YWJhc2U+IGRhdGFiYXNlLCBjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIHZlcnNpb24pCiB7Ci0gICAgSW5zcGVjdG9yQWdlbnQqIGluc3BlY3Rv ckFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQWdlbnQoKTsKLSAgICBpZiAo IWluc3BlY3RvckFnZW50IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxl ZCgpKQorICAgIGlmICghaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yRW52aXJvbm1lbnQo KS5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoSW5z cGVjdG9yRGF0YWJhc2VBZ2VudCogZGJBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3Bl Y3RvckRhdGFiYXNlQWdlbnQoKSkKICAgICAgICAgZGJBZ2VudC0+ZGlkT3BlbkRhdGFiYXNlKGRh dGFiYXNlLCBkb21haW4sIG5hbWUsIHZlcnNpb24pOwpAQCAtMTA3NSw4ICsxMDcwLDcgQEAgdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondvcmtlckdsb2JhbFNjb3BlVGVybWluYXRlZElt cGwoSW5zdHJ1bWVudGluZ0FnZW4KICNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCiB2b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ3JlYXRlV2ViU29ja2V0SW1wbChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCwg RG9jdW1lbnQqIGRvY3VtZW50KQogewotICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2Vu dCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYgKCFpbnNw ZWN0b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkK KyAgICBpZiAoIWluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckVudmlyb25tZW50KCkuZGV2 ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKEluc3BlY3Rv clJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNw ZWN0b3JSZXNvdXJjZUFnZW50KCkpCiAgICAgICAgIHJlc291cmNlQWdlbnQtPmRpZENyZWF0ZVdl YlNvY2tldChpZGVudGlmaWVyLCByZXF1ZXN0VVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNwcAppbmRleCA2MjhmMTI4Li5hMjIzOGU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3Bw CkBAIC0yOSwxMSArMjksMTAgQEAKICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0KLSNpZiBF TkFCTEUoSU5TUEVDVE9SKQotCiAjaW5jbHVkZSAiSW5zdHJ1bWVudGluZ0FnZW50cy5oIgogCisj aWYgRU5BQkxFKElOU1BFQ1RPUikKKwogI2luY2x1ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiV29ya2VyR2xvYmFsU2NvcGUuaCIKQEAgLTQ0 LDggKzQzLDkgQEAgdXNpbmcgbmFtZXNwYWNlIEluc3BlY3RvcjsKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1JbnN0cnVtZW50aW5nQWdlbnRzOjpJbnN0cnVtZW50aW5nQWdlbnRzKCkKLSAgICA6 IG1faW5zcGVjdG9yQWdlbnQoMCkKK0luc3RydW1lbnRpbmdBZ2VudHM6Okluc3RydW1lbnRpbmdB Z2VudHMoSW5zcGVjdG9yRW52aXJvbm1lbnQmIGVudmlyb25tZW50KQorICAgIDogbV9lbnZpcm9u bWVudChlbnZpcm9ubWVudCkKKyAgICAsIG1faW5zcGVjdG9yQWdlbnQoMCkKICAgICAsIG1faW5z cGVjdG9yUGFnZUFnZW50KDApCiAgICAgLCBtX2luc3BlY3RvckNTU0FnZW50KDApCiAjaWYgVVNF KEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnN0cnVtZW50aW5nQWdlbnRzLmgKaW5kZXggODZjOTE0My4uZDM0YzNkNDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuaApAQCAtMzEsNiArMzEs NyBAQAogI2lmbmRlZiBJbnN0cnVtZW50aW5nQWdlbnRzX2gKICNkZWZpbmUgSW5zdHJ1bWVudGlu Z0FnZW50c19oCiAKKyNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yRW52aXJvbm1lbnQuaD4K ICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CkBAIC02NSwxMyArNjYsMTUgQEAgY2xhc3Mg SW5zdHJ1bWVudGluZ0FnZW50cyA6IHB1YmxpYyBSZWZDb3VudGVkPEluc3RydW1lbnRpbmdBZ2Vu dHM+IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShJbnN0cnVtZW50aW5nQWdlbnRzKTsKICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0 cjxJbnN0cnVtZW50aW5nQWdlbnRzPiBjcmVhdGUoKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPElu c3RydW1lbnRpbmdBZ2VudHM+IGNyZWF0ZShJbnNwZWN0b3I6Okluc3BlY3RvckVudmlyb25tZW50 JiBlbnZpcm9ubWVudCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zdHJ1 bWVudGluZ0FnZW50cygpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJbnN0cnVtZW50 aW5nQWdlbnRzKGVudmlyb25tZW50KSk7CiAgICAgfQogICAgIH5JbnN0cnVtZW50aW5nQWdlbnRz KCkgeyB9CiAgICAgdm9pZCByZXNldCgpOwogCisgICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JFbnZp cm9ubWVudCYgaW5zcGVjdG9yRW52aXJvbm1lbnQoKSBjb25zdCB7IHJldHVybiBtX2Vudmlyb25t ZW50OyB9CisKICAgICBJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQoKSBjb25zdCB7IHJl dHVybiBtX2luc3BlY3RvckFnZW50OyB9CiAgICAgdm9pZCBzZXRJbnNwZWN0b3JBZ2VudChJbnNw ZWN0b3JBZ2VudCogYWdlbnQpIHsgbV9pbnNwZWN0b3JBZ2VudCA9IGFnZW50OyB9CiAKQEAgLTEz OSw3ICsxNDIsOSBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJpdmF0ZToKLSAgICBJbnN0cnVtZW50 aW5nQWdlbnRzKCk7CisgICAgSW5zdHJ1bWVudGluZ0FnZW50cyhJbnNwZWN0b3I6Okluc3BlY3Rv ckVudmlyb25tZW50Jik7CisKKyAgICBJbnNwZWN0b3I6Okluc3BlY3RvckVudmlyb25tZW50JiBt X2Vudmlyb25tZW50OwogCiAgICAgSW5zcGVjdG9yQWdlbnQqIG1faW5zcGVjdG9yQWdlbnQ7CiAg ICAgSW5zcGVjdG9yUGFnZUFnZW50KiBtX2luc3BlY3RvclBhZ2VBZ2VudDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdlQ29uc29sZUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9QYWdlQ29uc29sZUFnZW50LmNwcAppbmRleCBjMWRiYjJhLi42OWVh NjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZUNvbnNvbGVBZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VDb25zb2xlQWdlbnQuY3Bw CkBAIC04NiwxMSArODYsNiBAQCB2b2lkIFBhZ2VDb25zb2xlQWdlbnQ6OmFkZEluc3BlY3RlZE5v ZGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgbm9kZUlkKQogICAgICAgICBjb21tYW5k TGluZUFQSUhvc3QtPmFkZEluc3BlY3RlZE9iamVjdChhZG9wdFB0cihuZXcgSW5zcGVjdGFibGVO b2RlKG5vZGUpKSk7CiB9CiAKLWJvb2wgUGFnZUNvbnNvbGVBZ2VudDo6ZGV2ZWxvcGVyRXh0cmFz RW5hYmxlZCgpCi17Ci0gICAgcmV0dXJuIG1faW5zcGVjdG9yQWdlbnQtPmRldmVsb3BlckV4dHJh c0VuYWJsZWQoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5B QkxFKElOU1BFQ1RPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdl Q29uc29sZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZUNvbnNvbGVBZ2Vu dC5oCmluZGV4IGJkYzE5NzUuLmVlYzgzMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9QYWdlQ29uc29sZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L1BhZ2VDb25zb2xlQWdlbnQuaApAQCAtNTYsNyArNTYsNiBAQCBwcml2YXRlOgogICAgIFBhZ2VD b25zb2xlQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvckFnZW50KiwgUGFnZUlu amVjdGVkU2NyaXB0TWFuYWdlciosIEluc3BlY3RvckRPTUFnZW50Kik7CiAgICAgdmlydHVhbCB2 b2lkIGNsZWFyTWVzc2FnZXMoRXJyb3JTdHJpbmcqKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkSW5z cGVjdGVkTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQpOwotICAgIHZpcnR1YWwgYm9vbCBk ZXZlbG9wZXJFeHRyYXNFbmFibGVkKCk7CiAKICAgICBJbnNwZWN0b3JBZ2VudCogbV9pbnNwZWN0 b3JBZ2VudDsKICAgICBJbnNwZWN0b3JET01BZ2VudCogbV9pbnNwZWN0b3JET01BZ2VudDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJDb25zb2xlQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckNvbnNvbGVBZ2VudC5jcHAKaW5kZXgg YTU5Y2U0NS4uOWYxMDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dv cmtlckNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtl ckNvbnNvbGVBZ2VudC5jcHAKQEAgLTUyLDExICs1Miw2IEBAIHZvaWQgV29ya2VyQ29uc29sZUFn ZW50OjphZGRJbnNwZWN0ZWROb2RlKEVycm9yU3RyaW5nKiBlcnJvciwgaW50KQogICAgICplcnJv ciA9ICJhZGRJbnNwZWN0ZWROb2RlIGlzIG5vdCBzdXBwb3J0ZWQgZm9yIHdvcmtlcnMiOwogfQog Ci1ib29sIFdvcmtlckNvbnNvbGVBZ2VudDo6ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpCi17Ci0g ICAgcmV0dXJuIHRydWU7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8v IEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv V29ya2VyQ29uc29sZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VyQ29u c29sZUFnZW50LmgKaW5kZXggMmI5Y2UzMC4uNGRmZmRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL1dvcmtlckNvbnNvbGVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9Xb3JrZXJDb25zb2xlQWdlbnQuaApAQCAtNTIsNyArNTIsNiBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIFdvcmtlckNvbnNvbGVBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwg UGFnZUluamVjdGVkU2NyaXB0TWFuYWdlciopOwogICAgIHZpcnR1YWwgdm9pZCBhZGRJbnNwZWN0 ZWROb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCk7Ci0gICAgdmlydHVhbCBib29sIGRldmVs b3BlckV4dHJhc0VuYWJsZWQoKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy LmNwcAppbmRleCA4ZjkyM2MzLi42NDgxYTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC04MSw3ICs4MSw3 IEBAIHByaXZhdGU6CiAKIFdvcmtlckluc3BlY3RvckNvbnRyb2xsZXI6Oldvcmtlckluc3BlY3Rv ckNvbnRyb2xsZXIoV29ya2VyR2xvYmFsU2NvcGUqIHdvcmtlckdsb2JhbFNjb3BlKQogICAgIDog bV93b3JrZXJHbG9iYWxTY29wZSh3b3JrZXJHbG9iYWxTY29wZSkKLSAgICAsIG1faW5zdHJ1bWVu dGluZ0FnZW50cyhJbnN0cnVtZW50aW5nQWdlbnRzOjpjcmVhdGUoKSkKKyAgICAsIG1faW5zdHJ1 bWVudGluZ0FnZW50cyhJbnN0cnVtZW50aW5nQWdlbnRzOjpjcmVhdGUoKnRoaXMpKQogICAgICwg bV9pbmplY3RlZFNjcmlwdE1hbmFnZXIoc3RkOjptYWtlX3VuaXF1ZTxQYWdlSW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyPigqdGhpcywgUGFnZUluamVjdGVkU2NyaXB0SG9zdDo6Y3JlYXRlKCkpKQogICAg ICwgbV9ydW50aW1lQWdlbnQoMCkKIHsK