165688 2016-12-09 14:48:32 -0800 Web Inspector: Cleanup some InspectorInstrumentation network loading notifications 2016-12-11 15:40:54 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg cdumez commit-queue dbates japhet joepeck mattbaker mkwst nvasilyev timothy webkit-bug-importer youennf oldest_to_newest 1258364 0 joepeck 2016-12-09 14:48:32 -0800 Summary: Cleanup some InspectorInstrumentation network loading notifications There is a lot of code that does: InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(&m_frame); InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, r, resourceLoader); In which case the will* call that produces a cookie is entirely unnecessary. Simplify this code and related code. 1258437 1 296732 joepeck 2016-12-09 16:11:46 -0800 Created attachment 296732 [PATCH] Proposed Fix 1258894 2 296732 bburg 2016-12-11 15:14:41 -0800 Comment on attachment 296732 [PATCH] Proposed Fix r=me 1258900 3 296732 commit-queue 2016-12-11 15:40:48 -0800 Comment on attachment 296732 [PATCH] Proposed Fix Clearing flags on attachment: 296732 Committed r209687: <http://trac.webkit.org/changeset/209687> 1258901 4 commit-queue 2016-12-11 15:40:54 -0800 All reviewed patches have been landed. Closing bug. 296732 2016-12-09 16:11:46 -0800 2016-12-11 15:40:48 -0800 [PATCH] Proposed Fix cleanup-1.patch text/plain 19286 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZjUzOTNhLi40ZGEzZmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTYtMTItMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbnVwIHNvbWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uIG5ldHdvcmsgbG9hZGluZyBub3RpZmljYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbGltaW5hdGUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UgYnkgZm9sZGluZworICAgICAgICBpdCBp bnRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2Uu IFNpbXBsaWZ5IG90aGVyCisgICAgICAgIHJlbGF0ZWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u IGNhbGxzIGJ5IHVzaW5nIHJlZmVyZW5jZXMgYW5kIHVzaW5nIG1vcmUKKyAgICAgICAgY29uc2lz dGVudCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24gcGF0dGVybnMuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFJlY2VpdmVS ZXNvdXJjZVJlc3BvbnNlSW1wbCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlQnV0Q2FuY2VsZWRJ bXBsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6Y29udGludWVBZnRlclhGcmFtZU9wdGlvbnNEZW5pZWRJbXBsKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29udGludWVXaXRoUG9saWN5 RG93bmxvYWRJbXBsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6Y29udGludWVXaXRoUG9saWN5SWdub3JlSW1wbCk6IERlbGV0ZWQuCisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25z ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnRpbnVl QWZ0ZXJYRnJhbWVPcHRpb25zRGVuaWVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6Y29udGludWVXaXRoUG9saWN5RG93bmxvYWQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lJZ25vcmUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2 ZVJlc291cmNlUmVzcG9uc2UpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9Dcm9zc09yaWdp blByZWZsaWdodENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3Jvc3NPcmlnaW5QcmVm bGlnaHRDaGVja2VyOjp2YWxpZGF0ZVByZWZsaWdodFJlc3BvbnNlKToKKyAgICAgICAgKiBsb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6 OnN0b3BMb2FkaW5nQWZ0ZXJYRnJhbWVPcHRpb25zT3JDb250ZW50U2VjdXJpdHlQb2xpY3lEZW5p ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJDb250 ZW50UG9saWN5KToKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkTm90aWZpZXI6OmRpc3BhdGNoRGlkUmVjZWl2 ZVJlc3BvbnNlKToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdy b3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKworMjAxNi0xMi0wOSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNvbWUgcmVzb3VyY2VzIGZldGNo ZWQgdmlhIEZldGNoIEFQSSBkbyBub3QgaGF2ZSBkYXRhCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUyMzAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI5NDQ5MjIwPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCA4ZDRjMTBkLi4yZTQzMzc5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApA QCAtNTgyLDUxICs1ODIsMTcgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZExv YWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZUltcGwoSW5zdHJ1bWVudGluZ0EKICAgICAgICAgbmV0 d29ya0FnZW50LT5kaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoKmxvYWRlciwgKmNhY2hl ZFJlc291cmNlKTsKIH0KIAotSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6d2lsbFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzKQordm9pZCBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBSZXNv dXJjZUxvYWRlciogcmVzb3VyY2VMb2FkZXIpCiB7Ci0gICAgcmV0dXJuIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZShpbnN0cnVtZW50aW5nQWdlbnRzLCAwKTsKLX0KLQotdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChjb25z dCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmIGNvb2tpZSwgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZXNwb25zZSwgUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyKQotewotICAgIGlmICgh Y29va2llLmlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKCFsb2FkZXIpCiAg ICAgICAgIHJldHVybjsKIAotICAgIEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdB Z2VudHMgPSAqY29va2llLmluc3RydW1lbnRpbmdBZ2VudHMoKTsKLQogICAgIGlmIChJbnNwZWN0 b3JOZXR3b3JrQWdlbnQqIG5ldHdvcmtBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMuaW5zcGVj dG9yTmV0d29ya0FnZW50KCkpCiAgICAgICAgIG5ldHdvcmtBZ2VudC0+ZGlkUmVjZWl2ZVJlc3Bv bnNlKGlkZW50aWZpZXIsICpsb2FkZXIsIHJlc3BvbnNlLCByZXNvdXJjZUxvYWRlcik7CiAgICAg aWYgKFdlYkNvbnNvbGVBZ2VudCogY29uc29sZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy53 ZWJDb25zb2xlQWdlbnQoKSkKICAgICAgICAgY29uc29sZUFnZW50LT5kaWRSZWNlaXZlUmVzcG9u c2UoaWRlbnRpZmllciwgcmVzcG9uc2UpOyAvLyBUaGlzIHNob3VsZCBjb21lIEFGVEVSIHJlc291 cmNlIG5vdGlmaWNhdGlvbiwgZnJvbnQtZW5kIHJlbGllcyBvbiB0aGlzLgogfQogCi12b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VCdXRDYW5j ZWxlZEltcGwoRnJhbWUqIGZyYW1lLCBEb2N1bWVudExvYWRlciYgbG9hZGVyLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCi17Ci0gICAgaWYgKCFm cmFtZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFJlY2VpdmVSZXNvdXJj ZVJlc3BvbnNlKGZyYW1lKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2Vp dmVSZXNvdXJjZVJlc3BvbnNlKGNvb2tpZSwgaWRlbnRpZmllciwgJmxvYWRlciwgciwgbnVsbHB0 cik7Ci19Ci0KLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZUFmdGVyWEZy YW1lT3B0aW9uc0RlbmllZEltcGwoRnJhbWUqIGZyYW1lLCBEb2N1bWVudExvYWRlciYgbG9hZGVy LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCi17 Ci0gICAgZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VCdXRDYW5jZWxlZEltcGwoZnJhbWUsIGxv YWRlciwgaWRlbnRpZmllciwgcik7Ci19Ci0KLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Ojpjb250aW51ZVdpdGhQb2xpY3lEb3dubG9hZEltcGwoRnJhbWUqIGZyYW1lLCBEb2N1bWVudExv YWRlciYgbG9hZGVyLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHIpCi17Ci0gICAgZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VCdXRDYW5jZWxlZElt cGwoZnJhbWUsIGxvYWRlciwgaWRlbnRpZmllciwgcik7Ci19Ci0KLXZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lJZ25vcmVJbXBsKEZyYW1lKiBmcmFtZSwg RG9jdW1lbnRMb2FkZXImIGxvYWRlciwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByKQotewotICAgIGRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlQnV0 Q2FuY2VsZWRJbXBsKGZyYW1lLCBsb2FkZXIsIGlkZW50aWZpZXIsIHIpOwotfQotCiB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVRocmVhZGFibGVMb2FkZXJSZXNwb25z ZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgRG9jdW1lbnRU aHJlYWRhYmxlTG9hZGVyJiBkb2N1bWVudFRocmVhZGFibGVMb2FkZXIsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllcikKIHsKICAgICBpZiAoSW5zcGVjdG9yTmV0d29ya0FnZW50KiBuZXR3b3JrQWdl bnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3Rvck5ldHdvcmtBZ2VudCgpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmlu ZGV4IDQxZTJjZGUuLjliNjAwMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTE1NCwxNSArMTU0LDE1IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgdm9pZCBjb250aW51ZUFmdGVyUGluZ0xvYWRlcihGcmFtZSYsIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqLCBSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgc3RhdGljIHZvaWQgbWFya1Jlc291cmNlQXND YWNoZWQoUGFnZSYsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CiAgICAgc3RhdGljIHZvaWQg ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKFBhZ2UmLCBEb2N1bWVudExvYWRlciosIENh Y2hlZFJlc291cmNlKik7Ci0gICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tp ZSB3aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UoRnJhbWUqKTsKLSAgICBzdGF0aWMgdm9pZCBk aWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYsIFJlc291cmNlTG9hZGVyKik7Ci0gICAgc3RhdGljIHZvaWQgY29u dGludWVBZnRlclhGcmFtZU9wdGlvbnNEZW5pZWQoRnJhbWUqLCBEb2N1bWVudExvYWRlciYsIHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwotICAgIHN0 YXRpYyB2b2lkIGNvbnRpbnVlV2l0aFBvbGljeURvd25sb2FkKEZyYW1lKiwgRG9jdW1lbnRMb2Fk ZXImLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsK LSAgICBzdGF0aWMgdm9pZCBjb250aW51ZVdpdGhQb2xpY3lJZ25vcmUoRnJhbWUqLCBEb2N1bWVu dExvYWRlciYsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYpOworICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKEZyYW1lJiwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmLCBSZXNvdXJjZUxvYWRlciopOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVU aHJlYWRhYmxlTG9hZGVyUmVzcG9uc2UoRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyJiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyKTsKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlRGF0YShGcmFt ZSosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2hhciogZGF0YSwgaW50IGRhdGFM ZW5ndGgsIGludCBlbmNvZGVkRGF0YUxlbmd0aCk7CiAgICAgc3RhdGljIHZvaWQgZGlkRmluaXNo TG9hZGluZyhGcmFtZSosIERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgc3RhdGljIHZvaWQgZGlkRmFpbExvYWRpbmcoRnJh bWUqLCBEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVz b3VyY2VFcnJvciYpOworICAgIHN0YXRpYyB2b2lkIGNvbnRpbnVlQWZ0ZXJYRnJhbWVPcHRpb25z RGVuaWVkKEZyYW1lJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciYs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKKyAgICBzdGF0aWMgdm9pZCBjb250aW51ZVdpdGhQ b2xpY3lEb3dubG9hZChGcmFtZSYsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRM b2FkZXImLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgc3RhdGljIHZvaWQgY29udGlu dWVXaXRoUG9saWN5SWdub3JlKEZyYW1lJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1 bWVudExvYWRlciYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKKwogICAgIHN0YXRpYyB2b2lk IGRpZEZpbmlzaFhIUkxvYWRpbmcoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgc3RkOjpvcHRpb25hbDxTdHJpbmc+IGRlY29kZWRUZXh0LCBjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBzZW5kVVJMLCB1bnNpZ25lZCBzZW5kTGluZU51bWJl ciwgdW5zaWduZWQgc2VuZENvbHVtbk51bWJlcik7CiAgICAgc3RhdGljIHZvaWQgd2lsbExvYWRY SFJTeW5jaHJvbm91c2x5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAgICBzdGF0aWMgdm9p ZCBkaWRMb2FkWEhSU3luY2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CkBAIC0z MjQsMTIgKzMyNCw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgY29udGludWVBZnRlclBp bmdMb2FkZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIERvY3VtZW50TG9hZGVyKiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYpOwogICAgIHN0YXRpYyB2b2lkIG1hcmtSZXNvdXJjZUFzQ2FjaGVkSW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKICAgICBzdGF0aWMgdm9p ZCBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGVJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMm LCBEb2N1bWVudExvYWRlciosIENhY2hlZFJlc291cmNlKik7Ci0gICAgc3RhdGljIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKElu c3RydW1lbnRpbmdBZ2VudHMmKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlUmVzb3VyY2VS ZXNwb25zZUltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmLCBSZXNvdXJjZUxvYWRlciopOwotICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVSZXNvdXJj ZVJlc3BvbnNlQnV0Q2FuY2VsZWRJbXBsKEZyYW1lKiwgRG9jdW1lbnRMb2FkZXImLCB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKLSAgICBzdGF0aWMg dm9pZCBjb250aW51ZUFmdGVyWEZyYW1lT3B0aW9uc0RlbmllZEltcGwoRnJhbWUqLCBEb2N1bWVu dExvYWRlciYsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYpOwotICAgIHN0YXRpYyB2b2lkIGNvbnRpbnVlV2l0aFBvbGljeURvd25sb2FkSW1wbChGcmFt ZSosIERvY3VtZW50TG9hZGVyJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJik7Ci0gICAgc3RhdGljIHZvaWQgY29udGludWVXaXRoUG9saWN5SWdub3Jl SW1wbChGcmFtZSosIERvY3VtZW50TG9hZGVyJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVJlc291 cmNlUmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlc291cmNl TG9hZGVyKik7CiAgICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVRocmVhZGFibGVMb2FkZXJSZXNw b25zZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlciYs IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CiAgICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZURh dGFJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IGNoYXIqIGRhdGEsIGludCBkYXRhTGVuZ3RoLCBpbnQgZW5jb2RlZERhdGFMZW5ndGgpOwog ICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaExvYWRpbmdJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMm LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgZG91YmxlIGZpbmlz aFRpbWUpOwpAQCAtODUwLDM1ICs4NDUsMTAgQEAgaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoUGFnZSYgcGFnZSwKICAg ICBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGVJbXBsKGluc3RydW1lbnRpbmdBZ2VudHNG b3JQYWdlKHBhZ2UpLCBsb2FkZXIsIHJlc291cmNlKTsKIH0KIAotaW5saW5lIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNlaXZl UmVzb3VyY2VSZXNwb25zZShGcmFtZSogZnJhbWUpCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKEZyYW1lJiBmcmFtZSwgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiByZXNwb25zZSwgUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyKQog ewogICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5z dHJ1bWVudGluZ0FnZW50c0ZvckZyYW1lKGZyYW1lKSkKLSAgICAgICAgcmV0dXJuIHdpbGxSZWNl aXZlUmVzb3VyY2VSZXNwb25zZUltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMpOwotICAgIHJldHVy biBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUoKTsKLX0KLQotaW5saW5lIHZvaWQgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShjb25zdCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmIGNvb2tpZSwgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSwgUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyKQotewotICAgIC8vIENhbGwg dGhpcyB1bmNvbmRpdGlvbmFsbHkgc28gdGhhdCB3ZSdyZSBhYmxlIHRvIGxvZyB0byBjb25zb2xl IHdpdGggbm8gZnJvbnQtZW5kIGF0dGFjaGVkLgotICAgIGRpZFJlY2VpdmVSZXNvdXJjZVJlc3Bv bnNlSW1wbChjb29raWUsIGlkZW50aWZpZXIsIGxvYWRlciwgcmVzcG9uc2UsIHJlc291cmNlTG9h ZGVyKTsKLX0KLQotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51 ZUFmdGVyWEZyYW1lT3B0aW9uc0RlbmllZChGcmFtZSogZnJhbWUsIERvY3VtZW50TG9hZGVyJiBs b2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cikKLXsKLSAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFModm9pZCgpKTsKLSAgICBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnRpbnVlQWZ0ZXJYRnJhbWVPcHRpb25zRGVuaWVkSW1w bChmcmFtZSwgbG9hZGVyLCBpZGVudGlmaWVyLCByKTsKLX0KLQotaW5saW5lIHZvaWQgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lEb3dubG9hZChGcmFtZSogZnJh bWUsIERvY3VtZW50TG9hZGVyJiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgcikKLXsKLSAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVO RFModm9pZCgpKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnRpbnVlV2l0aFBv bGljeURvd25sb2FkSW1wbChmcmFtZSwgbG9hZGVyLCBpZGVudGlmaWVyLCByKTsKLX0KLQotaW5s aW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lJZ25v cmUoRnJhbWUqIGZyYW1lLCBEb2N1bWVudExvYWRlciYgbG9hZGVyLCB1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCi17Ci0gICAgRkFTVF9SRVRVUk5f SUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpj b250aW51ZVdpdGhQb2xpY3lJZ25vcmVJbXBsKGZyYW1lLCBsb2FkZXIsIGlkZW50aWZpZXIsIHIp OworICAgICAgICBkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZUltcGwoKmluc3RydW1lbnRpbmdB Z2VudHMsIGlkZW50aWZpZXIsIGxvYWRlciwgcmVzcG9uc2UsIHJlc291cmNlTG9hZGVyKTsKIH0K IAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlVGhyZWFk YWJsZUxvYWRlclJlc3BvbnNlKERvY3VtZW50VGhyZWFkYWJsZUxvYWRlciYgZG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCkBAIC05MDUsNiArODc1LDI3 IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFpbExvYWRpbmco RnJhbWUqIGZyYW1lLCBEb2N1bWVudExvYWRlCiAgICAgICAgIGRpZEZhaWxMb2FkaW5nSW1wbCgq aW5zdHJ1bWVudGluZ0FnZW50cywgaWRlbnRpZmllciwgbG9hZGVyLCBlcnJvcik7CiB9CiAKK2lu bGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29udGludWVBZnRlclhGcmFtZU9w dGlvbnNEZW5pZWQoRnJhbWUmIGZyYW1lLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3Vt ZW50TG9hZGVyJiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQorewor ICAgIC8vIFRyZWF0IHRoZSBzYW1lIGFzIGRpZFJlY2VpdmVSZXNwb25zZS4KKyAgICBpZiAoSW5z dHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2Vu dHNGb3JGcmFtZShmcmFtZSkpCisgICAgICAgIGRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1w bCgqaW5zdHJ1bWVudGluZ0FnZW50cywgaWRlbnRpZmllciwgJmxvYWRlciwgcmVzcG9uc2UsIG51 bGxwdHIpOworfQorCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnRp bnVlV2l0aFBvbGljeURvd25sb2FkKEZyYW1lJiBmcmFtZSwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBEb2N1bWVudExvYWRlciYgbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSkKK3sKKyAgICAvLyBUcmVhdCB0aGUgc2FtZSBhcyBkaWRSZWNlaXZlUmVzcG9uc2UuCisg ICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVt ZW50aW5nQWdlbnRzRm9yRnJhbWUoZnJhbWUpKQorICAgICAgICBkaWRSZWNlaXZlUmVzb3VyY2VS ZXNwb25zZUltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50aWZpZXIsICZsb2FkZXIsIHJl c3BvbnNlLCBudWxscHRyKTsKK30KKworaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpjb250aW51ZVdpdGhQb2xpY3lJZ25vcmUoRnJhbWUmIGZyYW1lLCB1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyJiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQoreworICAgIC8vIFRyZWF0IHRoZSBzYW1lIGFzIGRpZFJlY2VpdmVSZXNw b25zZS4KKyAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9 IGluc3RydW1lbnRpbmdBZ2VudHNGb3JGcmFtZShmcmFtZSkpCisgICAgICAgIGRpZFJlY2VpdmVS ZXNvdXJjZVJlc3BvbnNlSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgaWRlbnRpZmllciwgJmxv YWRlciwgcmVzcG9uc2UsIG51bGxwdHIpOworfQorCiBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZEZpbmlzaFhIUkxvYWRpbmcoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4g ZGVjb2RlZFRleHQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHNlbmRVUkwsIHVu c2lnbmVkIHNlbmRMaW5lTnVtYmVyLCB1bnNpZ25lZCBzZW5kQ29sdW1uTnVtYmVyKQogewogICAg IGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVu dGluZ0FnZW50c0ZvckNvbnRleHQoY29udGV4dCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvQ3Jvc3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwCmluZGV4IGQ3YTVhMzUuLmRm MTljODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZs aWdodENoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblBy ZWZsaWdodENoZWNrZXIuY3BwCkBAIC04Myw4ICs4Myw3IEBAIHZvaWQgQ3Jvc3NPcmlnaW5QcmVm bGlnaHRDaGVja2VyOjp2YWxpZGF0ZVByZWZsaWdodFJlc3BvbnNlKERvY3VtZW50VGhyZWFkYWJs ZUxvCiAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xNjQ4ODk+IFdlYiBJbnNw ZWN0b3I6IFNob3cgUHJlZmxpZ2h0IFJlcXVlc3QgaW5mb3JtYXRpb24gaW4gaW5zcGVjdG9yCiAg ICAgLy8gVGhpcyBpcyBvbmx5IHNob3dpbmcgc3VjY2VzcyBwcmVmbGlnaHQgcmVxdWVzdHMgYW5k IHJlc3BvbnNlcyBidXQgd2Ugc2hvdWxkIHNob3cgbmV0d29yayBldmVudHMKICAgICAvLyBmb3Ig cHJlZmxpZ2h0IGZhaWx1cmVzIGFuZCBkaXN0aW5ndWlzaCB0aGVtIGJldHRlciBmcm9tIG5vbi1w cmVmbGlnaHQgcmVxdWVzdHMuCi0gICAgYXV0byBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OndpbGxSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShmcmFtZSk7Ci0gICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShjb29raWUsIGlkZW50 aWZpZXIsIGZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCByZXNwb25zZSwgbnVsbHB0 cik7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNw b25zZSgqZnJhbWUsIGlkZW50aWZpZXIsIGZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigp LCByZXNwb25zZSwgbnVsbHB0cik7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRG aW5pc2hMb2FkaW5nKGZyYW1lLCBmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSwgaWRl bnRpZmllciwgMCk7CiAKICAgICBDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlOjpzaW5n bGV0b24oKS5hcHBlbmRFbnRyeShsb2FkZXIuc2VjdXJpdHlPcmlnaW4oKS50b1N0cmluZygpLCBy ZXF1ZXN0LnVybCgpLCBXVEZNb3ZlKHJlc3VsdCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKaW5kZXggYmY2NmMyZi4uNGFlYzMwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtNjM1LDcgKzYzNSw3IEBAIHZvaWQgRG9jdW1l bnRMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVx dWVzdCYsIGJvb2wKIAogdm9pZCBEb2N1bWVudExvYWRlcjo6c3RvcExvYWRpbmdBZnRlclhGcmFt ZU9wdGlvbnNPckNvbnRlbnRTZWN1cml0eVBvbGljeURlbmllZCh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6Y29udGludWVBZnRlclhGcmFtZU9wdGlvbnNEZW5pZWQobV9mcmFt ZSwgKnRoaXMsIGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmNvbnRpbnVlQWZ0ZXJYRnJhbWVPcHRpb25zRGVuaWVkKCptX2ZyYW1lLCBpZGVudGlm aWVyLCAqdGhpcywgcmVzcG9uc2UpOwogICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmVuZm9yY2VT YW5kYm94RmxhZ3MoU2FuZGJveE9yaWdpbik7CiAgICAgaWYgKEhUTUxGcmFtZU93bmVyRWxlbWVu dCogb3duZXJFbGVtZW50ID0gbV9mcmFtZS0+b3duZXJFbGVtZW50KCkpCiAgICAgICAgIG93bmVy RWxlbWVudC0+ZGlzcGF0Y2hFdmVudChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5sb2FkRXZl bnQsIGZhbHNlLCBmYWxzZSkpOwpAQCAtNzk0LDcgKzc5NCw3IEBAIHZvaWQgRG9jdW1lbnRMb2Fk ZXI6OmNvbnRpbnVlQWZ0ZXJDb250ZW50UG9saWN5KFBvbGljeUFjdGlvbiBwb2xpY3kpCiAgICAg ICAgIH0KIAogICAgICAgICBpZiAoUmVzb3VyY2VMb2FkZXIqIG1haW5SZXNvdXJjZUxvYWRlciA9 IHRoaXMtPm1haW5SZXNvdXJjZUxvYWRlcigpKQotICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lEb3dubG9hZChtX2ZyYW1lLCAqdGhpcywgbWFp blJlc291cmNlTG9hZGVyLT5pZGVudGlmaWVyKCksIG1fcmVzcG9uc2UpOworICAgICAgICAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lEb3dubG9hZCgqbV9m cmFtZSwgbWFpblJlc291cmNlTG9hZGVyLT5pZGVudGlmaWVyKCksICp0aGlzLCBtX3Jlc3BvbnNl KTsKIAogICAgICAgICAvLyBXaGVuIHN0YXJ0aW5nIHRoZSByZXF1ZXN0LCB3ZSBkaWRuJ3Qga25v dyB0aGF0IGl0IHdvdWxkIHJlc3VsdCBpbiBkb3dubG9hZCBhbmQgbm90IG5hdmlnYXRpb24uIE5v dyB3ZSBrbm93IHRoYXQgbWFpbiBkb2N1bWVudCBVUkwgZGlkbid0IGNoYW5nZS4KICAgICAgICAg Ly8gRG93bmxvYWQgbWF5IHVzZSB0aGlzIGtub3dsZWRnZSBmb3IgcHVycG9zZXMgdW5yZWxhdGVk IHRvIGNvb2tpZXMsIG5vdGFibHkgZm9yIHNldHRpbmcgZmlsZSBxdWFyYW50aW5lIGRhdGEuCkBA IC04MTcsNyArODE3LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlckNvbnRl bnRQb2xpY3koUG9saWN5QWN0aW9uIHBvbGljeSkKICAgICB9CiAgICAgY2FzZSBQb2xpY3lJZ25v cmU6CiAgICAgICAgIGlmIChSZXNvdXJjZUxvYWRlciogbWFpblJlc291cmNlTG9hZGVyID0gdGhp cy0+bWFpblJlc291cmNlTG9hZGVyKCkpCi0gICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmNvbnRpbnVlV2l0aFBvbGljeUlnbm9yZShtX2ZyYW1lLCAqdGhpcywgbWFpblJlc291 cmNlTG9hZGVyLT5pZGVudGlmaWVyKCksIG1fcmVzcG9uc2UpOworICAgICAgICAgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpjb250aW51ZVdpdGhQb2xpY3lJZ25vcmUoKm1fZnJhbWUsIG1h aW5SZXNvdXJjZUxvYWRlci0+aWRlbnRpZmllcigpLCAqdGhpcywgbV9yZXNwb25zZSk7CiAgICAg ICAgIHN0b3BMb2FkaW5nRm9yUG9saWN5Q2hhbmdlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcAppbmRl eCBmYzI2ZDA1Li41NmQ0NjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkTm90aWZpZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWROb3RpZmllci5jcHAKQEAgLTE0Nyw4ICsxNDcsNyBAQCB2b2lkIFJlc291cmNlTG9hZE5v dGlmaWVyOjpkaXNwYXRjaERpZFJlY2VpdmVSZXNwb25zZShEb2N1bWVudExvYWRlciogbG9hZGVy LCB1bgogICAgIFJlZjxGcmFtZT4gcHJvdGVjdChtX2ZyYW1lKTsKICAgICBtX2ZyYW1lLmxvYWRl cigpLmNsaWVudCgpLmRpc3BhdGNoRGlkUmVjZWl2ZVJlc3BvbnNlKGxvYWRlciwgaWRlbnRpZmll ciwgcik7CiAKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2llID0gSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UoJm1fZnJh bWUpOwotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVz cG9uc2UoY29va2llLCBpZGVudGlmaWVyLCBsb2FkZXIsIHIsIHJlc291cmNlTG9hZGVyKTsKKyAg ICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKG1f ZnJhbWUsIGlkZW50aWZpZXIsIGxvYWRlciwgciwgcmVzb3VyY2VMb2FkZXIpOwogfQogCiB2b2lk IFJlc291cmNlTG9hZE5vdGlmaWVyOjpkaXNwYXRjaERpZFJlY2VpdmVEYXRhKERvY3VtZW50TG9h ZGVyKiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2hhciogZGF0YSwg aW50IGRhdGFMZW5ndGgsIGludCBlbmNvZGVkRGF0YUxlbmd0aCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKaW5k ZXggMzdhYzc1ZC4uODZlOWE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Fw cGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKQEAgLTQ5Miw4ICs0OTIsNyBA QCBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6Y3JlYXRlUmVz b3VyY2VIYW5kbGUoY29uc3QgVVJMJiB1cgogdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmRp ZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBSZXNvdXJjZVJlc3BvbnNl JiYgcmVzcG9uc2UpCiB7CiAgICAgQVNTRVJUKG1fZnJhbWUpOwotICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxS ZWNlaXZlUmVzb3VyY2VSZXNwb25zZShtX2ZyYW1lKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKGNvb2tpZSwgbV9jdXJyZW50UmVzb3Vy Y2VJZGVudGlmaWVyLCBtX2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCByZXNwb25z ZSwgMCk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VS ZXNwb25zZSgqbV9mcmFtZSwgbV9jdXJyZW50UmVzb3VyY2VJZGVudGlmaWVyLCBtX2ZyYW1lLT5s b2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCByZXNwb25zZSwgbnVsbHB0cik7CiAKICAgICBpZiAo aGFuZGxlID09IG1fbWFuaWZlc3RIYW5kbGUpIHsKICAgICAgICAgZGlkUmVjZWl2ZU1hbmlmZXN0 UmVzcG9uc2UocmVzcG9uc2UpOwo=