64746 2011-07-18 13:31:37 -0700 Web Inspector: Backend should provide network resource identifiers that are unique across navigation. 2011-07-19 09:38:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein caseq joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 438668 0 vsevik 2011-07-18 13:31:37 -0700 Backend should provide network resource identifiers that are unique across navigation. 439120 1 101309 vsevik 2011-07-19 06:35:01 -0700 Created attachment 101309 Patch 439211 2 vsevik 2011-07-19 09:38:57 -0700 Committed r91264: <http://trac.webkit.org/changeset/91264> 101309 2011-07-19 06:35:01 -0700 2011-07-19 09:00:55 -0700 Patch bug-64746-20110719173459.patch text/plain 56382 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4N2E2N2NjMGRkNjc3MGI5OGI5ODQ3 OWZlYWQyMTU2ZDkyNDMwMGIyLi5jMTY1ZDhlNTEwZmRjYzc0YTRkZmM0OTE3NzJlYWFlNDYwZTJi MDQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDctMTkgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQmFja2VuZCBz aG91bGQgcHJvdmlkZSBuZXR3b3JrIHJlc291cmNlIGlkZW50aWZpZXJzIHRoYXQgYXJlIHVuaXF1 ZSBhY3Jvc3MgbmF2aWdhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtbmV0d29yay1yZXNvdXJj ZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL3Rp bWVsaW5lL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2UtZXhwZWN0ZWQudHh0OgorCiAyMDExLTA3 LTE5ICBKZXJlbXkgTW9za292aWNoICA8amVyZW15QGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggbWljcm9waG9uZSBpY29uIHBsYWNlbWVudCBpbiBzcGVlY2ggaW5wdXQgY29udHJvbCBmb3Ig ZGlyPXJ0bC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1l bGluZS1uZXR3b3JrLXJlc291cmNlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLWV4cGVjdGVkLnR4dAppbmRleCAx ZTU4NGI5MDdlMDJhYjk1YWE4MGM1YzI4OTEzOWY1OWZiMDc4MWQ2Li42MzZjMTA0YzZmOTQzN2M0 OTRhZWMzM2RkMjIwYjQ3ZDFiMjFjMGYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtbmV0d29yay1yZXNvdXJjZS1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2Ut ZXhwZWN0ZWQudHh0CkBAIC03LDcgKzcsNyBAQCBSZXNvdXJjZVNlbmRSZXF1ZXN0IFByb3BlcnRp ZXM6CiB7CiAgICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBkYXRhIDogewotICAgICAgICBp ZGVudGlmaWVyIDogPG51bWJlcj4KKyAgICAgICAgaWRlbnRpZmllciA6IDxzdHJpbmc+CiAgICAg ICAgIHVybCA6IDxzdHJpbmc+CiAgICAgICAgIHJlcXVlc3RNZXRob2QgOiAiR0VUIgogICAgIH0K QEAgLTIwLDcgKzIwLDcgQEAgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UgUHJvcGVydGllczoKIHsK ICAgICBzdGFydFRpbWUgOiA8bnVtYmVyPgogICAgIGRhdGEgOiB7Ci0gICAgICAgIGlkZW50aWZp ZXIgOiA8bnVtYmVyPgorICAgICAgICBpZGVudGlmaWVyIDogPHN0cmluZz4KICAgICAgICAgc3Rh dHVzQ29kZSA6IDAKICAgICAgICAgbWltZVR5cGUgOiA8c3RyaW5nPgogICAgIH0KQEAgLTM1LDcg KzM1LDcgQEAgUmVzb3VyY2VGaW5pc2ggUHJvcGVydGllczoKIHsKICAgICBzdGFydFRpbWUgOiA8 bnVtYmVyPgogICAgIGRhdGEgOiB7Ci0gICAgICAgIGlkZW50aWZpZXIgOiA8bnVtYmVyPgorICAg ICAgICBpZGVudGlmaWVyIDogPHN0cmluZz4KICAgICAgICAgZGlkRmFpbCA6IGZhbHNlCiAgICAg fQogICAgIHR5cGUgOiAiUmVzb3VyY2VGaW5pc2giCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9jaHJvbWl1bS9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtbmV0d29yay1yZXNv dXJjZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9pbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtbmV0d29yay1yZXNvdXJjZS1leHBlY3RlZC50eHQKaW5kZXgg ODMzMjQ3NGQ3YTZmMDY1N2ExOThjYWEyZjcxM2JiMTEwYmRmNTRiNy4uNTYxYjRhNGMxODQ3MjIy YmM4YjE5ZmVmZDlkOGE4MTQzZDUyZTczZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2Ut ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2luc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLWV4cGVjdGVkLnR4dApAQCAtOCw3 ICs4LDcgQEAgUmVzb3VyY2VTZW5kUmVxdWVzdCBQcm9wZXJ0aWVzOgogICAgIHN0YXJ0VGltZSA6 IDxudW1iZXI+CiAgICAgc3RhY2tUcmFjZSA6IDxvYmplY3Q+CiAgICAgZGF0YSA6IHsKLSAgICAg ICAgaWRlbnRpZmllciA6IDxudW1iZXI+CisgICAgICAgIGlkZW50aWZpZXIgOiA8c3RyaW5nPgog ICAgICAgICB1cmwgOiA8c3RyaW5nPgogICAgICAgICByZXF1ZXN0TWV0aG9kIDogIkdFVCIKICAg ICB9CkBAIC0yMSw3ICsyMSw3IEBAIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIFByb3BlcnRpZXM6 CiB7CiAgICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBkYXRhIDogewotICAgICAgICBpZGVu dGlmaWVyIDogPG51bWJlcj4KKyAgICAgICAgaWRlbnRpZmllciA6IDxzdHJpbmc+CiAgICAgICAg IHN0YXR1c0NvZGUgOiAwCiAgICAgICAgIG1pbWVUeXBlIDogPHN0cmluZz4KICAgICB9CkBAIC0z Niw3ICszNiw3IEBAIFJlc291cmNlRmluaXNoIFByb3BlcnRpZXM6CiB7CiAgICAgc3RhcnRUaW1l IDogPG51bWJlcj4KICAgICBkYXRhIDogewotICAgICAgICBpZGVudGlmaWVyIDogPG51bWJlcj4K KyAgICAgICAgaWRlbnRpZmllciA6IDxzdHJpbmc+CiAgICAgICAgIGRpZEZhaWwgOiBmYWxzZQog ICAgIH0KICAgICB0eXBlIDogIlJlc291cmNlRmluaXNoIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGIwZjk0NmFk ZDQ0ZDczM2U4ODFiMjI2ZWQ4ZGIyN2IzYzA0NTgxYmEuLjlkODMxNWY5OThlOGMyODkzMmFiYWEy NjIzNDk1MTgwOGRlNjgxZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw3MiBAQAogMjAxMS0wNy0x OSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBCYWNrZW5kIHNob3VsZCBwcm92aWRlIG5ldHdvcmsgcmVzb3VyY2UgaWRlbnRp ZmllcnMgdGhhdCBhcmUgdW5pcXVlIGFjcm9zcyBuYXZpZ2F0aW9uLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ3NDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2Fn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlTWVzc2FnZTo6Q29uc29sZU1lc3NhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRlbmQpOgorICAg ICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5oOgorICAgICAgICAqIGluc3BlY3Rvci9J ZGVudGlmaWVyc0ZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWRlbnRpZmllcnNGYWN0 b3J5OjpjcmVhdGVJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6OklkZW50aWZpZXJzRmFj dG9yeTo6cmVzb3VyY2VJZCk6CisgICAgICAgIChXZWJDb3JlOjpJZGVudGlmaWVyc0ZhY3Rvcnk6 OmFkZFByb2Nlc3NJZFByZWZpeFRvKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSWRlbnRpZmllcnNG YWN0b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGluZyk6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JSZXNvdXJjZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291 cmNlQWdlbnQ6OndpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JS ZXNvdXJjZUFnZW50OjptYXJrUmVzb3VyY2VBc0NhY2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRGYWlsTG9hZGluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRMb2FkUmVzb3VyY2VG cm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dDo6c2V0SW5pdGlhbFNjcmlwdENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y UmVzb3VyY2VBZ2VudDo6c2V0SW5pdGlhbFhIUkNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVhIUlJlc3BvbnNlKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZENyZWF0ZVdlYlNvY2tldCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxsU2VuZFdlYlNvY2tl dEhhbmRzaGFrZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VB Z2VudDo6ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZENsb3NlV2ViU29ja2V0KToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmdldFJlc291cmNlQ29udGVudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsUmVjZWl2ZVJlc291cmNl RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsUmVj ZWl2ZVJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6ZGlkRmluaXNoTG9hZGluZ1Jlc291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv TmV0d29ya1Jlc291cmNlc0RhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1Jlc291 cmNlc0RhdGE6OlJlc291cmNlRGF0YTo6UmVzb3VyY2VEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtSZXNvdXJjZXNEYXRhOjpyZXNvdXJjZUNyZWF0ZWQpOgorICAgICAgICAoV2ViQ29y ZTo6TmV0d29ya1Jlc291cmNlc0RhdGE6OnJlc3BvbnNlUmVjZWl2ZWQpOgorICAgICAgICAoV2Vi Q29yZTo6TmV0d29ya1Jlc291cmNlc0RhdGE6OnNldFJlc291cmNlVHlwZSk6CisgICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrUmVzb3VyY2VzRGF0YTo6cmVzb3VyY2VUeXBlKToKKyAgICAgICAgKFdl YkNvcmU6Ok5ldHdvcmtSZXNvdXJjZXNEYXRhOjpzZXRSZXNvdXJjZUNvbnRlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TmV0d29ya1Jlc291cmNlc0RhdGE6Om1heWJlQWRkUmVzb3VyY2VEYXRhKToK KyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtSZXNvdXJjZXNEYXRhOjptYXliZURlY29kZURhdGFU b0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1Jlc291cmNlc0RhdGE6OmFkZENh Y2hlZFJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtSZXNvdXJjZXNEYXRhOjph ZGRSZXNvdXJjZVNoYXJlZEJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrUmVzb3Vy Y2VzRGF0YTo6ZGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrUmVzb3VyY2VzRGF0YTo6 Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1Jlc291cmNlc0RhdGE6OmVuc3VyZU5v RGF0YUZvclJlc291cmNlSWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1Jlc291cmNlc0Rh dGE6OmVuc3VyZUZyZWVTcGFjZSk6CisgICAgICAgICogaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJj ZXNEYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVzb3Vy Y2VEYXRhOjpyZXNvdXJjZUlkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRG YWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3Jl YXRlUmVzb3VyY2VTZW5kUmVxdWVzdERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlzaERh dGEpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZWNl aXZlUmVzb3VyY2VEYXRhKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5Lmg6CisKKzIwMTEtMDctMTkgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5v cmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVuYW1lIGFnZW50SWRlbnRpZmllclByZWZp eCB0byBwcm9jZXNzSWQsIG1vdmUgb3V0IGZyb20gcGFnZSBhZ2VudCBhbmQgbWFrZSBzdGF0aWMu CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDcyOQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcAppbmRleCA1ZWY3 YjY3ZDNmMjU2ZTE4ZDA0YjIyNWQ5MTk5N2JkOGRjNTRiYTU2Li41NDVhOTA5MGI4MDM2ZmNlODEx NjZiODI0NjFhYWY5Y2VmZWUxYmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvQ29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db25z b2xlTWVzc2FnZS5jcHAKQEAgLTUyLDcgKzUyLDYgQEAgQ29uc29sZU1lc3NhZ2U6OkNvbnNvbGVN ZXNzYWdlKE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVzc2FnZUxldmVsIGwsIGMK ICAgICAsIG1fbGluZShsaSkKICAgICAsIG1fdXJsKHUpCiAgICAgLCBtX3JlcGVhdENvdW50KDEp Ci0gICAgLCBtX3JlcXVlc3RJZCgwKQogewogfQogCkBAIC02NiwxMSArNjUsMTAgQEAgQ29uc29s ZU1lc3NhZ2U6OkNvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwg TWVzc2FnZUxldmVsIGwsIGMKICAgICAsIG1fbGluZSgwKQogICAgICwgbV91cmwoKQogICAgICwg bV9yZXBlYXRDb3VudCgxKQotICAgICwgbV9yZXF1ZXN0SWQoMCkKIHsKIH0KIAotQ29uc29sZU1l c3NhZ2U6OkNvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVz c2FnZUxldmVsIGwsIGNvbnN0IFN0cmluZyYgbSwgY29uc3QgU3RyaW5nJiByZXNwb25zZVVybCwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQorQ29uc29sZU1lc3NhZ2U6OkNvbnNvbGVNZXNzYWdl KE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVzc2FnZUxldmVsIGwsIGNvbnN0IFN0 cmluZyYgbSwgY29uc3QgU3RyaW5nJiByZXNwb25zZVVybCwgY29uc3QgU3RyaW5nJiByZXNvdXJj ZUlkKQogICAgIDogbV9zb3VyY2UocykKICAgICAsIG1fdHlwZSh0KQogICAgICwgbV9sZXZlbChs KQpAQCAtNzgsNyArNzYsNyBAQCBDb25zb2xlTWVzc2FnZTo6Q29uc29sZU1lc3NhZ2UoTWVzc2Fn ZVNvdXJjZSBzLCBNZXNzYWdlVHlwZSB0LCBNZXNzYWdlTGV2ZWwgbCwgYwogICAgICwgbV9saW5l KDApCiAgICAgLCBtX3VybChyZXNwb25zZVVybCkKICAgICAsIG1fcmVwZWF0Q291bnQoMSkKLSAg ICAsIG1fcmVxdWVzdElkKGlkZW50aWZpZXIpCisgICAgLCBtX3JlcXVlc3RJZChyZXNvdXJjZUlk KQogewogfQogCkBAIC0xMzgsNyArMTM2LDcgQEAgdm9pZCBDb25zb2xlTWVzc2FnZTo6YWRkVG9G cm9udGVuZChJbnNwZWN0b3JGcm9udGVuZDo6Q29uc29sZSogZnJvbnRlbmQsIEluamVjdGUKICAg ICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGljX2Nhc3Q8aW50PihtX3Jl cGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0IiwgbV9tZXNzYWdlKTsK ICAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlKSAKLSAgICAgICAganNv bk9iai0+c2V0TnVtYmVyKCJuZXR3b3JrSWRlbnRpZmllciIsIG1fcmVxdWVzdElkKTsKKyAgICAg ICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrSWRlbnRpZmllciIsIG1fcmVxdWVzdElkKTsK ICAgICBpZiAobV9hcmd1bWVudHMgJiYgbV9hcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKSkgewog ICAgICAgICBJbmplY3RlZFNjcmlwdCBpbmplY3RlZFNjcmlwdCA9IGluamVjdGVkU2NyaXB0TWFu YWdlci0+aW5qZWN0ZWRTY3JpcHRGb3IobV9hcmd1bWVudHMtPmdsb2JhbFN0YXRlKCkpOwogICAg ICAgICBpZiAoIWluamVjdGVkU2NyaXB0Lmhhc05vVmFsdWUoKSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuaAppbmRleCAwYWYyYmMzZmU5MmYwNDliYTA0MTFkOWJm Y2Q3ZWVjNWQ0Y2Y0MWVlLi4zMmQwYWQ5M2Y0YTE0NjNlODI5NzJlNjhhYTExNGRmNDM4ZGM2OWZj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuaApAQCAtNTMsNyAr NTMsNyBAQCBjbGFzcyBDb25zb2xlTWVzc2FnZSB7CiBwdWJsaWM6CiAgICAgQ29uc29sZU1lc3Nh Z2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5n JiBtLCB1bnNpZ25lZCBsaSwgY29uc3QgU3RyaW5nJiB1KTsKICAgICBDb25zb2xlTWVzc2FnZShN ZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJpbmcmIG0s IFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiwgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+ KTsKLSAgICBDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2Fn ZUxldmVsLCBjb25zdCBTdHJpbmcmIG0sIGNvbnN0IFN0cmluZyYgcmVzcG9uc2VVcmwsIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllcik7CisgICAgQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwg TWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5nJiBtLCBjb25zdCBTdHJpbmcm IHJlc3BvbnNlVXJsLCBjb25zdCBTdHJpbmcmIHJlc291cmNlSWQpOwogICAgIH5Db25zb2xlTWVz c2FnZSgpOwogCiAgICAgdm9pZCBhZGRUb0Zyb250ZW5kKEluc3BlY3RvckZyb250ZW5kOjpDb25z b2xlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CkBAIC03Nyw3ICs3Nyw3IEBAIHByaXZhdGU6 CiAgICAgdW5zaWduZWQgbV9saW5lOwogICAgIFN0cmluZyBtX3VybDsKICAgICB1bnNpZ25lZCBt X3JlcGVhdENvdW50OwotICAgIHVuc2lnbmVkIGludCBtX3JlcXVlc3RJZDsKKyAgICBTdHJpbmcg bV9yZXF1ZXN0SWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSWRlbnRpZmllcnNGYWN0b3J5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JZGVudGlmaWVyc0ZhY3RvcnkuY3BwCmluZGV4IGEzODFkYzk1MTdi ZWNmNjMyNDQ5NmE1Yjk0NGZmYjlkYzMyMzU5ZmMuLjU0M2RlZjc1NTkzMzA5YTQxMTY0OTRhNzE0 ODBjYTYzNjFiYThjZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JZGVu dGlmaWVyc0ZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JZGVudGlm aWVyc0ZhY3RvcnkuY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiSWRlbnRpZmllcnNGYWN0b3J5LmgiCiAKKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJp bmdCdWlsZGVyLmg+CisKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogCiAjaW5jbHVkZSA8d3RmL3Rl eHQvU3RyaW5nQnVpbGRlci5oPgpAQCAtNDIsMTAgKzQ0LDIyIEBAIGxvbmcgSWRlbnRpZmllcnNG YWN0b3J5OjpzX3Byb2Nlc3NJZDsKIC8vIHN0YXRpYwogU3RyaW5nIElkZW50aWZpZXJzRmFjdG9y eTo6Y3JlYXRlSWRlbnRpZmllcigpCiB7CisgICAgcmV0dXJuIGFkZFByb2Nlc3NJZFByZWZpeFRv KFN0cmluZzo6bnVtYmVyKCsrc19sYXN0VXNlZElkZW50aWZpZXIpKTsKK30KKworLy8gc3RhdGlj CitTdHJpbmcgSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllcikKK3sKKyAgICByZXR1cm4gYWRkUHJvY2Vzc0lkUHJlZml4VG8oU3RyaW5nOjpudW1i ZXIoaWRlbnRpZmllcikpOworfQorCisvLyBzdGF0aWMKK1N0cmluZyBJZGVudGlmaWVyc0ZhY3Rv cnk6OmFkZFByb2Nlc3NJZFByZWZpeFRvKGNvbnN0IFN0cmluZyYgaWQpCit7CiAgICAgU3RyaW5n QnVpbGRlciBidWlsZGVyOwogICAgIGJ1aWxkZXIuYXBwZW5kKFN0cmluZzo6bnVtYmVyKHNfcHJv Y2Vzc0lkKSk7CiAgICAgYnVpbGRlci5hcHBlbmQoIi4iKTsKLSAgICBidWlsZGVyLmFwcGVuZChT dHJpbmc6Om51bWJlcigrK3NfbGFzdFVzZWRJZGVudGlmaWVyKSk7CisgICAgYnVpbGRlci5hcHBl bmQoaWQpOwogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JZGVudGlmaWVyc0ZhY3RvcnkuaCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JZGVudGlmaWVyc0ZhY3RvcnkuaAppbmRleCBkMGYyZWRjYTI0NTI0 ZmU3OGY0ZGJjMGEzZTcxNzhmODNlMmFkNzZiLi5lZmEzZWQ0NWRiYzVlMjgxYTgyZjIxYmM1N2E1 ZjUyYzdiYzNkYzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSWRlbnRp ZmllcnNGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lkZW50aWZpZXJz RmFjdG9yeS5oCkBAIC0zNiw3ICszNiwxMCBAQCBjbGFzcyBJZGVudGlmaWVyc0ZhY3Rvcnkgewog cHVibGljOgogICAgIHN0YXRpYyB2b2lkIHNldFByb2Nlc3NJZChsb25nIHByb2Nlc3NJZCkgeyBz X3Byb2Nlc3NJZCA9IHByb2Nlc3NJZDsgfQogICAgIHN0YXRpYyBTdHJpbmcgY3JlYXRlSWRlbnRp ZmllcigpOworICAgIHN0YXRpYyBTdHJpbmcgcmVzb3VyY2VJZCh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIpOwogcHJpdmF0ZToKKyAgICBzdGF0aWMgU3RyaW5nIGFkZFByb2Nlc3NJZFByZWZpeFRv KGNvbnN0IFN0cmluZyYgaWQpOworCiAgICAgc3RhdGljIGxvbmcgc19wcm9jZXNzSWQ7CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggMTI3OTkwYjE2YjE2 MzI1Nzk3NGIyN2VlNTMxZjVhNmRlNTQ1NDYxNi4uYjg3OTMwNTBhMWIzYmM2YzUyMmY4ZDQ3Nzc4 NThlMWRmNzcwZDYzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpA QCAtNDk0LDcgKzQ5NCw3IEBACiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0UmVzb3VyY2VD b250ZW50IiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmV0dXJucyBjb250ZW50 IG9mIHRoZSBnaXZlbiByZXNvdXJjZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjog WwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIHJlc291cmNlIHRvIGdl dCBjb250ZW50IGZvci4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlm aWVyIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhl IHJlc291cmNlIHRvIGdldCBjb250ZW50IGZvci4iIH0KICAgICAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImNvbnRlbnQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVzb3VyY2UgY29u dGVudC4iIH0sCkBAIC01MTUsNyArNTE1LDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6ICJy ZXF1ZXN0V2lsbEJlU2VudCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVk IHdoZW4gcGFnZSBpcyBhYm91dCB0byBzZW5kIEhUVFAgcmVxdWVzdC4iLAogICAgICAgICAgICAg ICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50 aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRp Zmllci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lSWQiLCAidHlwZSI6ICJzdHJpbmci LCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24i OiAiTG9hZGVyIGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImRvY3VtZW50VVJMIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0 aGUgZG9jdW1lbnQgdGhpcyByZXNvdXJjZSBpcyBsb2FkZWQgZm9yLiIgfSwKQEAgLTUyOSwxNCAr NTI5LDE0IEBACiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVzb3VyY2VNYXJrZWRBc0NhY2hl ZCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gcmVxdWVzdCBp cyBrbm93biB0byBiZSBzZXJ2ZWQgZnJvbSBkaXNrIGNhY2hlLiIsCiAgICAgICAgICAgICAgICAg InBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmll ciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVy LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfQogICAgICAg ICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAg ICAgIm5hbWUiOiAicmVzcG9uc2VSZWNlaXZlZCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0 aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXNwb25zZSBpcyBhdmFpbGFibGUuIiwKICAgICAgICAg ICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJp ZGVudGlmaWVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlk ZW50aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIi LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIg fSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAidHlwZSI6ICJu dW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKICAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJ0eXBlIiwgIiRyZWYiOiAiUGFnZS5SZXNvdXJjZVR5cGUiLCAiZGVzY3Jp cHRpb24iOiAiUmVzb3VyY2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVzcG9uc2UiLCAiJHJlZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwgImRlc2NyaXB0aW9uIjog IlJlc3BvbnNlIGRhdGEuIiB9CkBAIC01NDYsNyArNTQ2LDcgQEAKICAgICAgICAgICAgICAgICAi bmFtZSI6ICJkYXRhUmVjZWl2ZWQiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJG aXJlZCB3aGVuIGRhdGEgY2h1bmsgd2FzIHJlY2VpdmVkIG92ZXIgdGhlIG5ldHdvcmsuIiwKICAg ICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1 ZXN0IGlkZW50aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50 aWZpZXIiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlm aWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAidHlw ZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJkYXRhTGVuZ3RoIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNj cmlwdGlvbiI6ICJEYXRhIGNodW5rIGxlbmd0aC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZW5jb2RlZERhdGFMZW5ndGgiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0 aW9uIjogIkFjdHVhbCBieXRlcyByZWNlaXZlZCAobWlnaHQgYmUgbGVzcyB0aGFuIGRhdGFMZW5n dGggZm9yIGNvbXByZXNzZWQgZW5jb2RpbmdzKS4iIH0KQEAgLTU1Niw3ICs1NTYsNyBAQAogICAg ICAgICAgICAgICAgICJuYW1lIjogImxvYWRpbmdGaW5pc2hlZCIsCiAgICAgICAgICAgICAgICAg ImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXF1ZXN0IGhhcyBmaW5pc2hlZCBsb2Fk aW5nLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlcXVl c3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0 YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0KICAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LApAQCAtNTY0LDcgKzU2NCw3IEBACiAgICAg ICAgICAgICAgICAgIm5hbWUiOiAibG9hZGluZ0ZhaWxlZCIsCiAgICAgICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXF1ZXN0IGhhcyBmYWlsZWQgdG8gbG9hZC4i LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi aWRlbnRpZmllciIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlk ZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWVzdGFtcCIs ICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImVycm9yVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJk ZXNjcmlwdGlvbiI6ICJVc2VyIGZyaWVuZGx5IGVycm9yIG1lc3NhZ2UuIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImNhbmNlbGVkIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmIGxvYWRpbmcgd2FzIGNhbmNlbGVk LiIgfQpAQCAtNTc0LDcgKzU3NCw3IEBACiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVzb3Vy Y2VMb2FkZWRGcm9tTWVtb3J5Q2FjaGUiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJGaXJlZCB3aGVuIEhUVFAgcmVxdWVzdCBoYXMgYmVlbiBzZXJ2ZWQgZnJvbSBtZW1vcnkgY2Fj aGUuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlv biI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVz dCBpZGVudGlmaWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUlk IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkZyYW1lIGlkZW50aWZpZXIuIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvYWRlcklkIiwgInR5cGUiOiAic3Ry aW5nIiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBpZGVudGlmaWVyLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJkb2N1bWVudFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNj cmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50IHRoaXMgcmVzb3VyY2UgaXMgbG9hZGVkIGZv ci4iIH0sCkBAIC01ODYsNyArNTg2LDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6ICJpbml0 aWFsQ29udGVudFNldCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIGZv ciB3b3JrZXIgc2NyaXB0cyB3aGVuIHRoZWlyIGNvbnRlbnQgYmVjb21lcyBhdmFpbGFibGUuIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJS ZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlk ZW50aWZpZXIiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVu dGlmaWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb250ZW50IiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIGNvbnRlbnQuIiB9LAogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAiJHJlZiI6ICJQYWdlLlJlc291cmNl VHlwZSIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSB0eXBlLiIgfQogICAgICAgICAgICAgICAg IF0KQEAgLTU5NSw3ICs1OTUsNyBAQAogICAgICAgICAgICAgICAgICJuYW1lIjogIndlYlNvY2tl dFdpbGxTZW5kSGFuZHNoYWtlUmVxdWVzdCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9u IjogIkZpcmVkIHdoZW4gV2ViU29ja2V0IGlzIGFib3V0IHRvIGluaXRpYXRlIGhhbmRzaGFrZS4i LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi aWRlbnRpZmllciIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlk ZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWVzdGFtcCIs ICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInJlcXVlc3QiLCAidHlwZSI6ICJvYmplY3QiLCAiZGVz Y3JpcHRpb24iOiAiV2ViU29ja2V0IHJlcXVlc3QgZGF0YS4iIH0KICAgICAgICAgICAgICAgICBd CkBAIC02MDQsNyArNjA0LDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6ICJ3ZWJTb2NrZXRI YW5kc2hha2VSZXNwb25zZVJlY2VpdmVkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiRmlyZWQgd2hlbiBXZWJTb2NrZXQgaGFuZHNoYWtlIHJlc3BvbnNlIGJlY29tZXMgYXZhaWxh YmxlLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlcXVl c3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0 YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzcG9uc2UiLCAidHlwZSI6ICJvYmplY3Qi LCAiZGVzY3JpcHRpb24iOiAiV2ViU29ja2V0IHJlc3BvbnNlIGRhdGEuIiB9CiAgICAgICAgICAg ICAgICAgXQpAQCAtNjEzLDcgKzYxMyw3IEBACiAgICAgICAgICAgICAgICAgIm5hbWUiOiAid2Vi U29ja2V0Q3JlYXRlZCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHVw b24gV2ViU29ja2V0IGNyZWF0aW9uLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBb Ci0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImlu dGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIldlYlNv Y2tldCByZXF1ZXN0IFVSTC4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LApA QCAtNjIxLDcgKzYyMSw3IEBACiAgICAgICAgICAgICAgICAgIm5hbWUiOiAid2ViU29ja2V0Q2xv c2VkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBXZWJTb2Nr ZXQgaXMgY2xvc2VkLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAi ZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9u IjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFt cC4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwCmluZGV4IDNmYzk5MTM2 YmE3YWRjMjYyNTcwYzc4ZDAwMzE3OTVjZWExZDY2ODMuLjA4NjdjOTZkY2VhMDhmMDYzMmU1ZDdk NzI4NTQ0NDBjZDA0ZWE0ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiQ29u c29sZS5oIgogI2luY2x1ZGUgIkNvbnNvbGVNZXNzYWdlLmgiCiAjaW5jbHVkZSAiRE9NV2luZG93 LmgiCisjaW5jbHVkZSAiSWRlbnRpZmllcnNGYWN0b3J5LmgiCiAjaW5jbHVkZSAiSW5qZWN0ZWRT Y3JpcHRIb3N0LmgiCiAjaW5jbHVkZSAiSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmgiCiAjaW5jbHVk ZSAiSW5zcGVjdG9yQWdlbnQuaCIKQEAgLTIyNSw3ICsyMjYsOCBAQCB2b2lkIEluc3BlY3RvckNv bnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgUgogCiAgICAgaWYgKHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPj0gNDAwKSB7CiAg ICAgICAgIFN0cmluZyBtZXNzYWdlID0gIkZhaWxlZCB0byBsb2FkIHJlc291cmNlOiB0aGUgc2Vy dmVyIHJlc3BvbmRlZCB3aXRoIGEgc3RhdHVzIG9mICIgKyBTdHJpbmc6Om51bWJlcihyZXNwb25z ZS5odHRwU3RhdHVzQ29kZSgpKSArICIgKCIgKyByZXNwb25zZS5odHRwU3RhdHVzVGV4dCgpICsg JyknOwotICAgICAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3Nh Z2UoT3RoZXJNZXNzYWdlU291cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNz YWdlTGV2ZWwsIG1lc3NhZ2UsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCBpZGVudGlmaWVyKSkp OworICAgICAgICBTdHJpbmcgcmVzb3VyY2VJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVzb3Vy Y2VJZChpZGVudGlmaWVyKTsKKyAgICAgICAgYWRkQ29uc29sZU1lc3NhZ2UoYWRvcHRQdHIobmV3 IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9yTWVzc2FnZVR5 cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwg cmVzb3VyY2VJZCkpKTsKICAgICB9CiB9CiAKQEAgLTIzOCw3ICsyNDAsOCBAQCB2b2lkIEluc3Bl Y3RvckNvbnNvbGVBZ2VudDo6ZGlkRmFpbExvYWRpbmcodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdQogICAgIFN0cmluZyBtZXNzYWdlID0gIkZhaWxlZCB0byBsb2FkIHJlc291 cmNlIjsKICAgICBpZiAoIWVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkuaXNFbXB0eSgpKQog ICAgICAgICBtZXNzYWdlICs9ICI6ICIgKyBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpOwot ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShPdGhlck1l c3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwg bWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCBpZGVudGlmaWVyKSkpOworICAgIFN0cmluZyBy ZXNvdXJjZUlkID0gSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpOwor ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShPdGhlck1l c3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwg bWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXNvdXJjZUlkKSkpOwogfQogCiB2b2lkIElu c3BlY3RvckNvbnNvbGVBZ2VudDo6c2V0TW9uaXRvcmluZ1hIUkVuYWJsZWQoRXJyb3JTdHJpbmcq LCBib29sIGVuYWJsZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUGFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFn ZUFnZW50LmgKaW5kZXggMDVkODc2MzhhOGFmNjU5MzA2NWZmNjI3MmYxOGYzMzQ5YzgwOGZjMy4u ODliYzliZmYyNjc5MDYwNmE3ZmJiZjY1MjVhOWUyOGMyNTc2ZTI4ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtMTExLDYgKzExMSw3IEBA IHB1YmxpYzoKIAogICAgIC8vIENyb3NzLWFnZW50cyBBUEkKICAgICBGcmFtZSogbWFpbkZyYW1l KCk7CisgICAgU3RyaW5nIGNyZWF0ZUlkZW50aWZpZXIoKTsKICAgICBGcmFtZSogZnJhbWVGb3JJ ZChjb25zdCBTdHJpbmcmIGZyYW1lSWQpOwogICAgIFN0cmluZyBmcmFtZUlkKEZyYW1lKik7CiAg ICAgU3RyaW5nIGxvYWRlcklkKERvY3VtZW50TG9hZGVyKik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggNGQ1MGRjNzZh MjdjMzMxYWQzMGI2NGUxODUxYTRhOTkyNzBiZDZlYy4uNWFlMzExMmNjMWY4MWY3NTYwNDY4MmMw Zjk1YWQ3ZWU2NjdlMWU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtNDEsNiArNDEsNyBAQAogI2luY2x1ZGUgIkZy YW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJIVFRQSGVhZGVyTWFw LmgiCisjaW5jbHVkZSAiSWRlbnRpZmllcnNGYWN0b3J5LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y Q2xpZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNw ZWN0b3JGcm9udGVuZENoYW5uZWwuaCIKQEAgLTE5OSw3ICsyMDAsOCBAQCBJbnNwZWN0b3JSZXNv dXJjZUFnZW50Ojp+SW5zcGVjdG9yUmVzb3VyY2VBZ2VudCgpCiAKIHZvaWQgSW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6d2lsbFNlbmRSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9j dW1lbnRMb2FkZXIqIGxvYWRlciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewotICAgIG1fcmVzb3VyY2VzRGF0YS0+ cmVzb3VyY2VDcmVhdGVkKGlkZW50aWZpZXIsIG1fcGFnZUFnZW50LT5sb2FkZXJJZChsb2FkZXIp KTsKKyAgICBTdHJpbmcgcmVzb3VyY2VJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVzb3VyY2VJ ZChpZGVudGlmaWVyKTsKKyAgICBtX3Jlc291cmNlc0RhdGEtPnJlc291cmNlQ3JlYXRlZChyZXNv dXJjZUlkLCBtX3BhZ2VBZ2VudC0+bG9hZGVySWQobG9hZGVyKSk7CiAKICAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBoZWFkZXJzID0gbV9zdGF0ZS0+Z2V0T2JqZWN0KFJlc291cmNlQWdlbnRT dGF0ZTo6ZXh0cmFSZXF1ZXN0SGVhZGVycyk7CiAKQEAgLTIyMSwxNiArMjIzLDE3IEBAIHZvaWQg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgRG9jdW1lbnRMCiAgICAgICAgIGNhbGxTdGFja1ZhbHVlID0gY2FsbFN0YWNrLT5i dWlsZEluc3BlY3RvckFycmF5KCk7CiAgICAgZWxzZQogICAgICAgICBjYWxsU3RhY2tWYWx1ZSA9 IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKLSAgICBtX2Zyb250ZW5kLT5yZXF1ZXN0V2lsbEJl U2VudChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBtX3BhZ2VBZ2VudC0+ZnJhbWVJZChs b2FkZXItPmZyYW1lKCkpLCBtX3BhZ2VBZ2VudC0+bG9hZGVySWQobG9hZGVyKSwgbG9hZGVyLT51 cmwoKS5zdHJpbmcoKSwgYnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCksIGN1 cnJlbnRUaW1lKCksIGNhbGxTdGFja1ZhbHVlLCBidWlsZE9iamVjdEZvclJlc291cmNlUmVzcG9u c2UocmVkaXJlY3RSZXNwb25zZSkpOworICAgIG1fZnJvbnRlbmQtPnJlcXVlc3RXaWxsQmVTZW50 KHJlc291cmNlSWQsIG1fcGFnZUFnZW50LT5mcmFtZUlkKGxvYWRlci0+ZnJhbWUoKSksIG1fcGFn ZUFnZW50LT5sb2FkZXJJZChsb2FkZXIpLCBsb2FkZXItPnVybCgpLnN0cmluZygpLCBidWlsZE9i amVjdEZvclJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSwgY3VycmVudFRpbWUoKSwgY2FsbFN0YWNr VmFsdWUsIGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShyZWRpcmVjdFJlc3BvbnNlKSk7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bWFya1Jlc291cmNlQXNDYWNoZWQo dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQogewotICAgIG1fZnJvbnRlbmQtPnJlc291cmNlTWFy a2VkQXNDYWNoZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSk7CisgICAgbV9mcm9udGVu ZC0+cmVzb3VyY2VNYXJrZWRBc0NhY2hlZChJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlc291cmNlSWQo aWRlbnRpZmllcikpOwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2Vp dmVSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2Fk ZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogeworICAgIFN0cmluZyByZXNv dXJjZUlkID0gSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpOwogICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc291cmNlUmVzcG9uc2UgPSBidWlsZE9iamVjdEZv clJlc291cmNlUmVzcG9uc2UocmVzcG9uc2UpOwogICAgIEluc3BlY3RvclBhZ2VBZ2VudDo6UmVz b3VyY2VUeXBlIHR5cGUgPSBJbnNwZWN0b3JQYWdlQWdlbnQ6Ok90aGVyUmVzb3VyY2U7CiAgICAg bG9uZyBjYWNoZWRSZXNvdXJjZVNpemUgPSAwOwpAQCAtMjQ0LDE5ICsyNDcsMTkgQEAgdm9pZCBJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBEb2N1bWUKICAgICAgICAgICAgIGlmIChyZXNwb25zZS5taW1lVHlwZSgpLmlz RW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXNvdXJjZVJlc3BvbnNlLT5zZXRTdHJpbmcoIm1p bWVUeXBlIiwgY2FjaGVkUmVzb3VyY2UtPnJlc3BvbnNlKCkubWltZVR5cGUoKSk7CiAKLSAgICAg ICAgICAgIG1fcmVzb3VyY2VzRGF0YS0+YWRkQ2FjaGVkUmVzb3VyY2UoaWRlbnRpZmllciwgY2Fj aGVkUmVzb3VyY2UpOworICAgICAgICAgICAgbV9yZXNvdXJjZXNEYXRhLT5hZGRDYWNoZWRSZXNv dXJjZShyZXNvdXJjZUlkLCBjYWNoZWRSZXNvdXJjZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYg KGVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIocmVzcG9uc2UudXJsKCksIGxvYWRlci0+ ZnJhbWVMb2FkZXIoKS0+aWNvbigpLT51cmwoKSkpCiAgICAgICAgICAgICB0eXBlID0gSW5zcGVj dG9yUGFnZUFnZW50OjpJbWFnZVJlc291cmNlOwogICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9y aW5nRnJhZ21lbnRJZGVudGlmaWVyKHJlc3BvbnNlLnVybCgpLCBsb2FkZXItPnVybCgpKSAmJiB0 eXBlID09IEluc3BlY3RvclBhZ2VBZ2VudDo6T3RoZXJSZXNvdXJjZSkKICAgICAgICAgICAgIHR5 cGUgPSBJbnNwZWN0b3JQYWdlQWdlbnQ6OkRvY3VtZW50UmVzb3VyY2U7Ci0gICAgICAgIGVsc2Ug aWYgKG1fbG9hZGluZ1hIUlN5bmNocm9ub3VzbHkgfHwgbV9yZXNvdXJjZXNEYXRhLT5yZXNvdXJj ZVR5cGUoaWRlbnRpZmllcikgPT0gSW5zcGVjdG9yUGFnZUFnZW50OjpYSFJSZXNvdXJjZSkKKyAg ICAgICAgZWxzZSBpZiAobV9sb2FkaW5nWEhSU3luY2hyb25vdXNseSB8fCBtX3Jlc291cmNlc0Rh dGEtPnJlc291cmNlVHlwZShyZXNvdXJjZUlkKSA9PSBJbnNwZWN0b3JQYWdlQWdlbnQ6OlhIUlJl c291cmNlKQogICAgICAgICAgICAgdHlwZSA9IEluc3BlY3RvclBhZ2VBZ2VudDo6WEhSUmVzb3Vy Y2U7CiAKLSAgICAgICAgbV9yZXNvdXJjZXNEYXRhLT5yZXNwb25zZVJlY2VpdmVkKGlkZW50aWZp ZXIsIG1fcGFnZUFnZW50LT5mcmFtZUlkKGxvYWRlci0+ZnJhbWUoKSksIHJlc3BvbnNlKTsKKyAg ICAgICAgbV9yZXNvdXJjZXNEYXRhLT5yZXNwb25zZVJlY2VpdmVkKHJlc291cmNlSWQsIG1fcGFn ZUFnZW50LT5mcmFtZUlkKGxvYWRlci0+ZnJhbWUoKSksIHJlc3BvbnNlKTsKICAgICB9Ci0gICAg bV9yZXNvdXJjZXNEYXRhLT5zZXRSZXNvdXJjZVR5cGUoaWRlbnRpZmllciwgdHlwZSk7Ci0gICAg bV9mcm9udGVuZC0+cmVzcG9uc2VSZWNlaXZlZChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIp LCBjdXJyZW50VGltZSgpLCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlVHlwZVN0cmluZyh0 eXBlKSwgcmVzb3VyY2VSZXNwb25zZSk7CisgICAgbV9yZXNvdXJjZXNEYXRhLT5zZXRSZXNvdXJj ZVR5cGUocmVzb3VyY2VJZCwgdHlwZSk7CisgICAgbV9mcm9udGVuZC0+cmVzcG9uc2VSZWNlaXZl ZChyZXNvdXJjZUlkLCBjdXJyZW50VGltZSgpLCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNl VHlwZVN0cmluZyh0eXBlKSwgcmVzb3VyY2VSZXNwb25zZSk7CiAgICAgLy8gSWYgd2UgcmV2YWxp ZGF0ZWQgdGhlIHJlc291cmNlIGFuZCBnb3QgTm90IG1vZGlmaWVkLCBzZW5kIGNvbnRlbnQgbGVu Z3RoIGZvbGxvd2luZyBkaWRSZWNlaXZlUmVzcG9uc2UKICAgICAvLyBhcyB0aGVyZSB3aWxsIGJl IG5vIGNhbGxzIHRvIGRpZFJlY2VpdmVEYXRhIGZyb20gdGhlIG5ldHdvcmsgc3RhY2suCiAgICAg aWYgKGNhY2hlZFJlc291cmNlU2l6ZSAmJiByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID09IDMw NCkKQEAgLTI2NSwzMSArMjY4LDM0IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlk UmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lCiAKIHZvaWQg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZURhdGEodW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCwgaW50IGVuY29kZWREYXRh TGVuZ3RoKQogewotICAgIGlmIChkYXRhICYmIG1fcmVzb3VyY2VzRGF0YS0+cmVzb3VyY2VUeXBl KGlkZW50aWZpZXIpID09IEluc3BlY3RvclBhZ2VBZ2VudDo6T3RoZXJSZXNvdXJjZSkKLSAgICAg ICAgbV9yZXNvdXJjZXNEYXRhLT5tYXliZUFkZFJlc291cmNlRGF0YShpZGVudGlmaWVyLCBkYXRh LCBkYXRhTGVuZ3RoKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VJZCA9IElkZW50aWZpZXJzRmFjdG9y eTo6cmVzb3VyY2VJZChpZGVudGlmaWVyKTsKKyAgICBpZiAoZGF0YSAmJiBtX3Jlc291cmNlc0Rh dGEtPnJlc291cmNlVHlwZShyZXNvdXJjZUlkKSA9PSBJbnNwZWN0b3JQYWdlQWdlbnQ6Ok90aGVy UmVzb3VyY2UpCisgICAgICAgIG1fcmVzb3VyY2VzRGF0YS0+bWF5YmVBZGRSZXNvdXJjZURhdGEo cmVzb3VyY2VJZCwgZGF0YSwgZGF0YUxlbmd0aCk7CiAKLSAgICBtX2Zyb250ZW5kLT5kYXRhUmVj ZWl2ZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSwgZGF0YUxl bmd0aCwgZW5jb2RlZERhdGFMZW5ndGgpOworICAgIG1fZnJvbnRlbmQtPmRhdGFSZWNlaXZlZChy ZXNvdXJjZUlkLCBjdXJyZW50VGltZSgpLCBkYXRhTGVuZ3RoLCBlbmNvZGVkRGF0YUxlbmd0aCk7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkRmluaXNoTG9hZGluZyh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGRvdWJsZSBmaW5p c2hUaW1lKQogewotICAgIGlmIChtX3Jlc291cmNlc0RhdGEtPnJlc291cmNlVHlwZShpZGVudGlm aWVyKSA9PSBJbnNwZWN0b3JQYWdlQWdlbnQ6OkRvY3VtZW50UmVzb3VyY2UpCi0gICAgICAgIG1f cmVzb3VyY2VzRGF0YS0+YWRkUmVzb3VyY2VTaGFyZWRCdWZmZXIoaWRlbnRpZmllciwgbG9hZGVy LT5mcmFtZUxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5tYWluUmVzb3VyY2VEYXRhKCksIGxv YWRlci0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+aW5wdXRFbmNvZGluZygpKTsKKyAgICBTdHJpbmcg cmVzb3VyY2VJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVzb3VyY2VJZChpZGVudGlmaWVyKTsK KyAgICBpZiAobV9yZXNvdXJjZXNEYXRhLT5yZXNvdXJjZVR5cGUocmVzb3VyY2VJZCkgPT0gSW5z cGVjdG9yUGFnZUFnZW50OjpEb2N1bWVudFJlc291cmNlKQorICAgICAgICBtX3Jlc291cmNlc0Rh dGEtPmFkZFJlc291cmNlU2hhcmVkQnVmZmVyKHJlc291cmNlSWQsIGxvYWRlci0+ZnJhbWVMb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+bWFpblJlc291cmNlRGF0YSgpLCBsb2FkZXItPmZyYW1l KCktPmRvY3VtZW50KCktPmlucHV0RW5jb2RpbmcoKSk7CiAKLSAgICBtX3Jlc291cmNlc0RhdGEt Pm1heWJlRGVjb2RlRGF0YVRvQ29udGVudChpZGVudGlmaWVyKTsKKyAgICBtX3Jlc291cmNlc0Rh dGEtPm1heWJlRGVjb2RlRGF0YVRvQ29udGVudChyZXNvdXJjZUlkKTsKIAogICAgIGlmICghZmlu aXNoVGltZSkKICAgICAgICAgZmluaXNoVGltZSA9IGN1cnJlbnRUaW1lKCk7CiAKLSAgICBtX2Zy b250ZW5kLT5sb2FkaW5nRmluaXNoZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgZmlu aXNoVGltZSk7CisgICAgbV9mcm9udGVuZC0+bG9hZGluZ0ZpbmlzaGVkKHJlc291cmNlSWQsIGZp bmlzaFRpbWUpOwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZEZhaWxMb2Fk aW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29u c3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7Ci0gICAgaWYgKG1fcmVzb3VyY2VzRGF0YS0+cmVz b3VyY2VUeXBlKGlkZW50aWZpZXIpID09IEluc3BlY3RvclBhZ2VBZ2VudDo6RG9jdW1lbnRSZXNv dXJjZSkKLSAgICAgICAgbV9yZXNvdXJjZXNEYXRhLT5hZGRSZXNvdXJjZVNoYXJlZEJ1ZmZlcihp ZGVudGlmaWVyLCBsb2FkZXItPmZyYW1lTG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPm1haW5S ZXNvdXJjZURhdGEoKSwgbG9hZGVyLT5mcmFtZSgpLT5kb2N1bWVudCgpLT5pbnB1dEVuY29kaW5n KCkpOworICAgIFN0cmluZyByZXNvdXJjZUlkID0gSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJj ZUlkKGlkZW50aWZpZXIpOworICAgIGlmIChtX3Jlc291cmNlc0RhdGEtPnJlc291cmNlVHlwZShy ZXNvdXJjZUlkKSA9PSBJbnNwZWN0b3JQYWdlQWdlbnQ6OkRvY3VtZW50UmVzb3VyY2UpCisgICAg ICAgIG1fcmVzb3VyY2VzRGF0YS0+YWRkUmVzb3VyY2VTaGFyZWRCdWZmZXIocmVzb3VyY2VJZCwg bG9hZGVyLT5mcmFtZUxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5tYWluUmVzb3VyY2VEYXRh KCksIGxvYWRlci0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+aW5wdXRFbmNvZGluZygpKTsKIAotICAg IG1fZnJvbnRlbmQtPmxvYWRpbmdGYWlsZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwg Y3VycmVudFRpbWUoKSwgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSwgZXJyb3IuaXNDYW5j ZWxsYXRpb24oKSk7CisgICAgbV9mcm9udGVuZC0+bG9hZGluZ0ZhaWxlZChyZXNvdXJjZUlkLCBj dXJyZW50VGltZSgpLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLCBlcnJvci5pc0NhbmNl bGxhdGlvbigpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRMb2FkUmVz b3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgQ2FjaGVkUmVzb3Vy Y2UqIHJlc291cmNlKQpAQCAtMjk3LDI1ICszMDMsMjYgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJj ZUFnZW50OjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxv YWQKICAgICBTdHJpbmcgbG9hZGVySWQgPSBtX3BhZ2VBZ2VudC0+bG9hZGVySWQobG9hZGVyKTsK ICAgICBTdHJpbmcgZnJhbWVJZCA9IG1fcGFnZUFnZW50LT5mcmFtZUlkKGxvYWRlci0+ZnJhbWUo KSk7CiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gbG9hZGVyLT5mcmFtZSgpLT5wYWdl KCktPnByb2dyZXNzKCktPmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKTsKLSAgICBtX3Jlc291cmNl c0RhdGEtPnJlc291cmNlQ3JlYXRlZChpZGVudGlmaWVyLCBsb2FkZXJJZCk7Ci0gICAgbV9yZXNv dXJjZXNEYXRhLT5hZGRDYWNoZWRSZXNvdXJjZShpZGVudGlmaWVyLCByZXNvdXJjZSk7CisgICAg U3RyaW5nIHJlc291cmNlSWQgPSBJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlc291cmNlSWQoaWRlbnRp Zmllcik7CisgICAgbV9yZXNvdXJjZXNEYXRhLT5yZXNvdXJjZUNyZWF0ZWQocmVzb3VyY2VJZCwg bG9hZGVySWQpOworICAgIG1fcmVzb3VyY2VzRGF0YS0+YWRkQ2FjaGVkUmVzb3VyY2UocmVzb3Vy Y2VJZCwgcmVzb3VyY2UpOwogCi0gICAgbV9mcm9udGVuZC0+cmVzb3VyY2VMb2FkZWRGcm9tTWVt b3J5Q2FjaGUoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgZnJhbWVJZCwgbG9hZGVySWQs IGxvYWRlci0+dXJsKCkuc3RyaW5nKCksIGN1cnJlbnRUaW1lKCksIGJ1aWxkT2JqZWN0Rm9yQ2Fj aGVkUmVzb3VyY2UoKnJlc291cmNlKSk7CisgICAgbV9mcm9udGVuZC0+cmVzb3VyY2VMb2FkZWRG cm9tTWVtb3J5Q2FjaGUocmVzb3VyY2VJZCwgZnJhbWVJZCwgbG9hZGVySWQsIGxvYWRlci0+dXJs KCkuc3RyaW5nKCksIGN1cnJlbnRUaW1lKCksIGJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2Uo KnJlc291cmNlKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6c2V0SW5pdGlh bFNjcmlwdENvbnRlbnQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNv dXJjZVN0cmluZykKIHsKLSAgICBtX2Zyb250ZW5kLT5pbml0aWFsQ29udGVudFNldChzdGF0aWNf Y2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBzb3VyY2VTdHJpbmcsIEluc3BlY3RvclBhZ2VBZ2VudDo6 cmVzb3VyY2VUeXBlU3RyaW5nKEluc3BlY3RvclBhZ2VBZ2VudDo6U2NyaXB0UmVzb3VyY2UpKTsK KyAgICBtX2Zyb250ZW5kLT5pbml0aWFsQ29udGVudFNldChJZGVudGlmaWVyc0ZhY3Rvcnk6OnJl c291cmNlSWQoaWRlbnRpZmllciksIHNvdXJjZVN0cmluZywgSW5zcGVjdG9yUGFnZUFnZW50Ojpy ZXNvdXJjZVR5cGVTdHJpbmcoSW5zcGVjdG9yUGFnZUFnZW50OjpTY3JpcHRSZXNvdXJjZSkpOwog fQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnNldEluaXRpYWxYSFJDb250ZW50KHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpCiB7Ci0g ICAgbV9yZXNvdXJjZXNEYXRhLT5zZXRSZXNvdXJjZUNvbnRlbnQoaWRlbnRpZmllciwgc291cmNl U3RyaW5nKTsKKyAgICBtX3Jlc291cmNlc0RhdGEtPnNldFJlc291cmNlQ29udGVudChJZGVudGlm aWVyc0ZhY3Rvcnk6OnJlc291cmNlSWQoaWRlbnRpZmllciksIHNvdXJjZVN0cmluZyk7CiB9CiAK IHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVhIUlJlc3BvbnNlKHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllcikKIHsKLSAgICBtX3Jlc291cmNlc0RhdGEtPnNldFJlc291cmNl VHlwZShpZGVudGlmaWVyLCBJbnNwZWN0b3JQYWdlQWdlbnQ6OlhIUlJlc291cmNlKTsKKyAgICBt X3Jlc291cmNlc0RhdGEtPnNldFJlc291cmNlVHlwZShJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlc291 cmNlSWQoaWRlbnRpZmllciksIEluc3BlY3RvclBhZ2VBZ2VudDo6WEhSUmVzb3VyY2UpOwogfQog CiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OndpbGxMb2FkWEhSU3luY2hyb25vdXNseSgp CkBAIC0zNTMsNyArMzYwLDcgQEAgc3RhdGljIFN0cmluZyBjcmVhdGVSZWFkYWJsZVN0cmluZ0Zy b21CaW5hcnkoY29uc3QgdW5zaWduZWQgY2hhciogdmFsdWUsIHNpemVfdAogCiB2b2lkIEluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OmRpZENyZWF0ZVdlYlNvY2tldCh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwpCiB7Ci0gICAgbV9mcm9udGVuZC0+d2ViU29j a2V0Q3JlYXRlZChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCByZXF1ZXN0VVJMLnN0cmlu ZygpKTsKKyAgICBtX2Zyb250ZW5kLT53ZWJTb2NrZXRDcmVhdGVkKElkZW50aWZpZXJzRmFjdG9y eTo6cmVzb3VyY2VJZChpZGVudGlmaWVyKSwgcmVxdWVzdFVSTC5zdHJpbmcoKSk7CiB9CiAKIHZv aWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1 ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29ja2V0SGFuZHNoYWtlUmVx dWVzdCYgcmVxdWVzdCkKQEAgLTM2MSw3ICszNjgsNyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNl QWdlbnQ6OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlk ZQogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlcXVlc3RPYmplY3QgPSBJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpOwogICAgIHJlcXVlc3RPYmplY3QtPnNldE9iamVjdCgiaGVhZGVycyIs IGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhyZXF1ZXN0LmhlYWRlckZpZWxkcygpKSk7CiAgICAgcmVx dWVzdE9iamVjdC0+c2V0U3RyaW5nKCJyZXF1ZXN0S2V5MyIsIGNyZWF0ZVJlYWRhYmxlU3RyaW5n RnJvbUJpbmFyeShyZXF1ZXN0LmtleTMoKS52YWx1ZSwgc2l6ZW9mKHJlcXVlc3Qua2V5MygpLnZh bHVlKSkpOwotICAgIG1fZnJvbnRlbmQtPndlYlNvY2tldFdpbGxTZW5kSGFuZHNoYWtlUmVxdWVz dChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBjdXJyZW50VGltZSgpLCByZXF1ZXN0T2Jq ZWN0KTsKKyAgICBtX2Zyb250ZW5kLT53ZWJTb2NrZXRXaWxsU2VuZEhhbmRzaGFrZVJlcXVlc3Qo SWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpLCBjdXJyZW50VGltZSgp LCByZXF1ZXN0T2JqZWN0KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRS ZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZSYgcmVzcG9uc2UpCkBAIC0zNzEsMTIg KzM3OCwxMiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVXZWJTb2Nr ZXRIYW5kc2hha2VSZXNwb25zZSh1bnNpZ25lZCBsb25nCiAgICAgcmVzcG9uc2VPYmplY3QtPnNl dFN0cmluZygic3RhdHVzVGV4dCIsIHJlc3BvbnNlLnN0YXR1c1RleHQoKSk7CiAgICAgcmVzcG9u c2VPYmplY3QtPnNldE9iamVjdCgiaGVhZGVycyIsIGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhyZXNw b25zZS5oZWFkZXJGaWVsZHMoKSkpOwogICAgIHJlc3BvbnNlT2JqZWN0LT5zZXRTdHJpbmcoImNo YWxsZW5nZVJlc3BvbnNlIiwgY3JlYXRlUmVhZGFibGVTdHJpbmdGcm9tQmluYXJ5KHJlc3BvbnNl LmNoYWxsZW5nZVJlc3BvbnNlKCkudmFsdWUsIHNpemVvZihyZXNwb25zZS5jaGFsbGVuZ2VSZXNw b25zZSgpLnZhbHVlKSkpOwotICAgIG1fZnJvbnRlbmQtPndlYlNvY2tldEhhbmRzaGFrZVJlc3Bv bnNlUmVjZWl2ZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSwg cmVzcG9uc2VPYmplY3QpOworICAgIG1fZnJvbnRlbmQtPndlYlNvY2tldEhhbmRzaGFrZVJlc3Bv bnNlUmVjZWl2ZWQoSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpLCBj dXJyZW50VGltZSgpLCByZXNwb25zZU9iamVjdCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6ZGlkQ2xvc2VXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQogewot ICAgIG1fZnJvbnRlbmQtPndlYlNvY2tldENsb3NlZChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZp ZXIpLCBjdXJyZW50VGltZSgpKTsKKyAgICBtX2Zyb250ZW5kLT53ZWJTb2NrZXRDbG9zZWQoSWRl bnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpLCBjdXJyZW50VGltZSgpKTsK IH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX1NPQ0tFVFMpCiAKQEAgLTQ1NCw5ICs0NjEsOSBAQCB2 b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmluaXRpYWxpemVCYWNrZ3JvdW5kQ29sbGVjdGlv bigpCiAgICAgbV9tb2NrRnJvbnRlbmQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmQ6 Ok5ldHdvcmsobV9pbnNwZWN0b3JGcm9udGVuZFByb3h5LmdldCgpKSk7CiB9CiAKLXZvaWQgSW5z cGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJv clN0cmluZywgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBTdHJpbmcqIGNvbnRlbnQsIGJvb2wq IGJhc2U2NEVuY29kZWQpCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmdldFJlc291cmNl Q29udGVudChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJ ZCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKQogewotICAgIE5ldHdvcmtS ZXNvdXJjZXNEYXRhOjpSZXNvdXJjZURhdGEgY29uc3QqIHJlc291cmNlRGF0YSA9IG1fcmVzb3Vy Y2VzRGF0YS0+ZGF0YShpZGVudGlmaWVyKTsKKyAgICBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVz b3VyY2VEYXRhIGNvbnN0KiByZXNvdXJjZURhdGEgPSBtX3Jlc291cmNlc0RhdGEtPmRhdGEocmVz b3VyY2VJZCk7CiAgICAgaWYgKCFyZXNvdXJjZURhdGEpIHsKICAgICAgICAgKmVycm9yU3RyaW5n ID0gIk5vIHJlc291cmNlIHdpdGggZ2l2ZW4gaWRlbnRpZmllciBmb3VuZCI7CiAgICAgICAgIHJl dHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNv dXJjZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VB Z2VudC5oCmluZGV4IGQ2NzM5OTM2NTRiMTRmZTQ3YTExYThmMWJhNzEwOWNhYzY2NWJlYmYuLjUx OTIzMzU2MmVmMTM0N2U5NGMxNzc5NzVlMGExMWVkNDM1NWY4Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaApAQCAtMTIyLDcgKzEy Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc2FibGUoRXJyb3JTdHJpbmcqKTsKICAgICB2b2lk IHNldFVzZXJBZ2VudE92ZXJyaWRlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1c2VyQWdl bnQpOwogICAgIHZvaWQgc2V0RXh0cmFIZWFkZXJzKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+KTsKLSAgICB2b2lkIGdldFJlc291cmNlQ29udGVudChFcnJvclN0cmlu ZyosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNl NjRFbmNvZGVkKTsKKyAgICB2b2lkIGdldFJlc291cmNlQ29udGVudChFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNv ZGVkKTsKICAgICB2b2lkIGNsZWFyQ2FjaGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcqIGNv bnN0IG9wdGlvbmFsUHJlc2VydmVkTG9hZGVySWQpOwogCiAgICAgdm9pZCBjbGVhckJyb3dzZXJD YWNoZShFcnJvclN0cmluZyopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IGE4MWQ0NTRhZjJkMDJjOTkzZGZjY2M4MTll YzI2MzA1OGViODdhYmMuLmRiNGQ0OTg2MGZhMWM3NTllNTE5NDY3Y2VlMGM0YTYyOWEwNWRmMjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogCiAjaW5j bHVkZSAiRXZlbnQuaCIKKyNpbmNsdWRlICJJZGVudGlmaWVyc0ZhY3RvcnkuaCIKICNpbmNsdWRl ICJJbnNwZWN0b3JGcm9udGVuZC5oIgogI2luY2x1ZGUgIkluc3BlY3RvclN0YXRlLmgiCiAjaW5j bHVkZSAiSW5zdHJ1bWVudGluZ0FnZW50cy5oIgpAQCAtMjkwLDcgKzI5MSw4IEBAIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbFNlbmRSZXNvdXJjZVJlcXVlc3QodW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCBjCiB7CiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVH ZW5lcmljUmVjb3JkKFdURjo6Y3VycmVudFRpbWVNUygpKTsKLSAgICByZWNvcmQtPnNldE9iamVj dCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVz dERhdGEoaWRlbnRpZmllciwgcmVxdWVzdCkpOworICAgIFN0cmluZyByZXNvdXJjZUlkID0gSWRl bnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZpZXIpOworICAgIHJlY29yZC0+c2V0 T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVNlbmRS ZXF1ZXN0RGF0YShyZXNvdXJjZUlkLCByZXF1ZXN0KSk7CiAgICAgcmVjb3JkLT5zZXRTdHJpbmco InR5cGUiLCBUaW1lbGluZVJlY29yZFR5cGU6OlJlc291cmNlU2VuZFJlcXVlc3QpOwogICAgIHNl dEhlYXBTaXplU3RhdGlzdGljKHJlY29yZC5nZXQoKSk7CiAgICAgbV9mcm9udGVuZC0+ZXZlbnRS ZWNvcmRlZChyZWNvcmQucmVsZWFzZSgpKTsKQEAgLTI5OCw3ICszMDAsOCBAQCB2b2lkIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OndpbGxTZW5kUmVzb3VyY2VSZXF1ZXN0KHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgYwogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNlaXZl UmVzb3VyY2VEYXRhKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIHsKLSAgICBwdXNoQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlY2VpdmVSZXNvdXJjZURhdGEo aWRlbnRpZmllciksIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVzb3VyY2VSZWNlaXZlZERhdGEpOwor ICAgIFN0cmluZyByZXNvdXJjZUlkID0gSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlk ZW50aWZpZXIpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlUmVjZWl2ZVJlc291cmNlRGF0YShyZXNvdXJjZUlkKSwgVGltZWxpbmVSZWNvcmRUeXBl OjpSZXNvdXJjZVJlY2VpdmVkRGF0YSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6ZGlkUmVjZWl2ZVJlc291cmNlRGF0YSgpCkBAIC0zMDgsNyArMzExLDggQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VEYXRhKCkKICAgICAKIHZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7 Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNv dXJjZVJlY2VpdmVSZXNwb25zZURhdGEoaWRlbnRpZmllciwgcmVzcG9uc2UpLCBUaW1lbGluZVJl Y29yZFR5cGU6OlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VJ ZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVzb3VyY2VJZChpZGVudGlmaWVyKTsKKyAgICBwdXNo Q3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2 ZVJlc3BvbnNlRGF0YShyZXNvdXJjZUlkLCByZXNwb25zZSksIFRpbWVsaW5lUmVjb3JkVHlwZTo6 UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKCkKQEAgLTMyMSw3ICszMjUsOCBAQCB2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsCiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgLy8gU29t ZXRpbWVzIG5ldHdvcmsgc3RhY2sgY2FuIHByb3ZpZGUgZm9yIHVzIGV4YWN0IGZpbmlzaCBsb2Fk aW5nIHRpbWUuIEluIHRoZSBvdGhlciBjYXNlIHdlIHdpbGwgdXNlIGN1cnJlbnRUaW1lLgogICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlR2VuZXJpY1JlY29yZChXVEY6OmN1cnJlbnRUaW1lTVMoKSk7Ci0gICAgcmVjb3JkLT5z ZXRPYmplY3QoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmlu aXNoRGF0YShpZGVudGlmaWVyLCBkaWRGYWlsLCBmaW5pc2hUaW1lICogMTAwMCkpOworICAgIFN0 cmluZyByZXNvdXJjZUlkID0gSWRlbnRpZmllcnNGYWN0b3J5OjpyZXNvdXJjZUlkKGlkZW50aWZp ZXIpOworICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVSZXNvdXJjZUZpbmlzaERhdGEocmVzb3VyY2VJZCwgZGlkRmFpbCwgZmluaXNoVGlt ZSAqIDEwMDApKTsKICAgICByZWNvcmQtPnNldFN0cmluZygidHlwZSIsIFRpbWVsaW5lUmVjb3Jk VHlwZTo6UmVzb3VyY2VGaW5pc2gpOwogICAgIHNldEhlYXBTaXplU3RhdGlzdGljKHJlY29yZC5n ZXQoKSk7CiAgICAgbV9mcm9udGVuZC0+ZXZlbnRSZWNvcmRlZChyZWNvcmQucmVsZWFzZSgpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0 YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTmV0d29ya1Jlc291cmNlc0RhdGEuY3Bw CmluZGV4IDM0NmIyOTlmYzE2OWRjZDFkMGU1NDk2ZmQ1N2FjMTU5YmEyN2I2ODYuLjAzOTNiZGVj NTdlZTQzYzU3NTI2Y2U2ZTIzNWY2Y2I3MTJhNDBiODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmNwcApAQCAtNDcsOCArNDcsOCBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIAogLy8gUmVzb3VyY2VEYXRhCi1OZXR3b3JrUmVzb3VyY2Vz RGF0YTo6UmVzb3VyY2VEYXRhOjpSZXNvdXJjZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIGxvYWRlcklkKQotICAgIDogbV9pZGVudGlmaWVyKGlkZW50aWZpZXIp CitOZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVzb3VyY2VEYXRhOjpSZXNvdXJjZURhdGEoY29uc3Qg U3RyaW5nJiByZXNvdXJjZUlkLCBjb25zdCBTdHJpbmcmIGxvYWRlcklkKQorICAgIDogbV9yZXNv dXJjZUlkKHJlc291cmNlSWQpCiAgICAgLCBtX2xvYWRlcklkKGxvYWRlcklkKQogICAgICwgbV9p c0NvbnRlbnRQdXJnZWQoZmFsc2UpCiAgICAgLCBtX3R5cGUoSW5zcGVjdG9yUGFnZUFnZW50OjpP dGhlclJlc291cmNlKQpAQCAtMTMwLDE1ICsxMzAsMTUgQEAgTmV0d29ya1Jlc291cmNlc0RhdGE6 On5OZXR3b3JrUmVzb3VyY2VzRGF0YSgpCiAgICAgY2xlYXIoKTsKIH0KIAotdm9pZCBOZXR3b3Jr UmVzb3VyY2VzRGF0YTo6cmVzb3VyY2VDcmVhdGVkKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgU3RyaW5nJiBsb2FkZXJJZCkKK3ZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6OnJlc291 cmNlQ3JlYXRlZChjb25zdCBTdHJpbmcmIHJlc291cmNlSWQsIGNvbnN0IFN0cmluZyYgbG9hZGVy SWQpCiB7Ci0gICAgZW5zdXJlTm9EYXRhRm9ySWRlbnRpZmllcihpZGVudGlmaWVyKTsKLSAgICBt X2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcC5zZXQoaWRlbnRpZmllciwgbmV3IFJlc291cmNl RGF0YShpZGVudGlmaWVyLCBsb2FkZXJJZCkpOworICAgIGVuc3VyZU5vRGF0YUZvclJlc291cmNl SWQocmVzb3VyY2VJZCk7CisgICAgbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuc2V0KHJl c291cmNlSWQsIG5ldyBSZXNvdXJjZURhdGEocmVzb3VyY2VJZCwgbG9hZGVySWQpKTsKIH0KIAot dm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6cmVzcG9uc2VSZWNlaXZlZCh1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZnJhbWVJZCwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVzcG9uc2UpCit2b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpyZXNwb25zZVJlY2VpdmVk KGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICBSZXNvdXJjZURhdGEqIHJlc291cmNl RGF0YSA9IG1faWRlbnRpZmllclRvUmVzb3VyY2VEYXRhTWFwLmdldChpZGVudGlmaWVyKTsKKyAg ICBSZXNvdXJjZURhdGEqIHJlc291cmNlRGF0YSA9IG1fcmVzb3VyY2VJZFRvUmVzb3VyY2VEYXRh TWFwLmdldChyZXNvdXJjZUlkKTsKICAgICBpZiAoIXJlc291cmNlRGF0YSkKICAgICAgICAgcmV0 dXJuOwogICAgIHJlc291cmNlRGF0YS0+c2V0RnJhbWVJZChmcmFtZUlkKTsKQEAgLTE0NiwyNSAr MTQ2LDI1IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6OnJlc3BvbnNlUmVjZWl2ZWQodW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpCiAgICAgcmVzb3VyY2VEYXRhLT5jcmVh dGVEZWNvZGVyKHJlc3BvbnNlLm1pbWVUeXBlKCksIHJlc3BvbnNlLnRleHRFbmNvZGluZ05hbWUo KSk7CiB9CiAKLXZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6OnNldFJlc291cmNlVHlwZSh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIEluc3BlY3RvclBhZ2VBZ2VudDo6UmVzb3VyY2VUeXBlIHR5 cGUpCit2b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpzZXRSZXNvdXJjZVR5cGUoY29uc3QgU3Ry aW5nJiByZXNvdXJjZUlkLCBJbnNwZWN0b3JQYWdlQWdlbnQ6OlJlc291cmNlVHlwZSB0eXBlKQog ewotICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9pZGVudGlmaWVyVG9SZXNvdXJj ZURhdGFNYXAuZ2V0KGlkZW50aWZpZXIpOworICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRh ID0gbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuZ2V0KHJlc291cmNlSWQpOwogICAgIGlm ICghcmVzb3VyY2VEYXRhKQogICAgICAgICByZXR1cm47CiAgICAgcmVzb3VyY2VEYXRhLT5zZXRU eXBlKHR5cGUpOwogfQogCi1JbnNwZWN0b3JQYWdlQWdlbnQ6OlJlc291cmNlVHlwZSBOZXR3b3Jr UmVzb3VyY2VzRGF0YTo6cmVzb3VyY2VUeXBlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKK0lu c3BlY3RvclBhZ2VBZ2VudDo6UmVzb3VyY2VUeXBlIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpyZXNv dXJjZVR5cGUoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkKQogewotICAgIFJlc291cmNlRGF0YSog cmVzb3VyY2VEYXRhID0gbV9pZGVudGlmaWVyVG9SZXNvdXJjZURhdGFNYXAuZ2V0KGlkZW50aWZp ZXIpOworICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9yZXNvdXJjZUlkVG9SZXNv dXJjZURhdGFNYXAuZ2V0KHJlc291cmNlSWQpOwogICAgIGlmICghcmVzb3VyY2VEYXRhKQogICAg ICAgICByZXR1cm4gSW5zcGVjdG9yUGFnZUFnZW50OjpPdGhlclJlc291cmNlOwogICAgIHJldHVy biByZXNvdXJjZURhdGEtPnR5cGUoKTsKIH0KIAotdm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6 c2V0UmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5n JiBjb250ZW50KQordm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6c2V0UmVzb3VyY2VDb250ZW50 KGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiBjb250ZW50KQogewotICAg IFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9pZGVudGlmaWVyVG9SZXNvdXJjZURhdGFN YXAuZ2V0KGlkZW50aWZpZXIpOworICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9y ZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuZ2V0KHJlc291cmNlSWQpOwogICAgIGlmICghcmVz b3VyY2VEYXRhKQogICAgICAgICByZXR1cm47CiAgICAgaW50IGRhdGFMZW5ndGggPSAyICogY29u dGVudC5sZW5ndGgoKTsKQEAgLTE3MywxNSArMTczLDE1IEBAIHZvaWQgTmV0d29ya1Jlc291cmNl c0RhdGE6OnNldFJlc291cmNlQ29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0 IFN0CiAgICAgaWYgKHJlc291cmNlRGF0YS0+aXNDb250ZW50UHVyZ2VkKCkpCiAgICAgICAgIHJl dHVybjsKICAgICBpZiAoZW5zdXJlRnJlZVNwYWNlKGRhdGFMZW5ndGgpICYmICFyZXNvdXJjZURh dGEtPmlzQ29udGVudFB1cmdlZCgpKSB7Ci0gICAgICAgIG1faWRlbnRpZmllcnNEZXF1ZS5hcHBl bmQoaWRlbnRpZmllcik7CisgICAgICAgIG1fcmVzb3VyY2VJZHNEZXF1ZS5hcHBlbmQocmVzb3Vy Y2VJZCk7CiAgICAgICAgIHJlc291cmNlRGF0YS0+c2V0Q29udGVudChjb250ZW50KTsKICAgICAg ICAgbV9jb250ZW50U2l6ZSArPSBkYXRhTGVuZ3RoOwogICAgIH0KIH0KIAotdm9pZCBOZXR3b3Jr UmVzb3VyY2VzRGF0YTo6bWF5YmVBZGRSZXNvdXJjZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCkKK3ZvaWQgTmV0d29ya1Jlc291 cmNlc0RhdGE6Om1heWJlQWRkUmVzb3VyY2VEYXRhKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwg Y29uc3QgY2hhciogZGF0YSwgaW50IGRhdGFMZW5ndGgpCiB7Ci0gICAgUmVzb3VyY2VEYXRhKiBy ZXNvdXJjZURhdGEgPSBtX2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcC5nZXQoaWRlbnRpZmll cik7CisgICAgUmVzb3VyY2VEYXRhKiByZXNvdXJjZURhdGEgPSBtX3Jlc291cmNlSWRUb1Jlc291 cmNlRGF0YU1hcC5nZXQocmVzb3VyY2VJZCk7CiAgICAgaWYgKCFyZXNvdXJjZURhdGEpCiAgICAg ICAgIHJldHVybjsKICAgICBpZiAoIXJlc291cmNlRGF0YS0+ZGVjb2RlcigpKQpAQCAtMTkxLDE1 ICsxOTEsMTUgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6bWF5YmVBZGRSZXNvdXJjZURh dGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdAogICAgIGlmIChyZXNvdXJjZURhdGEt PmlzQ29udGVudFB1cmdlZCgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKGVuc3VyZUZyZWVT cGFjZShkYXRhTGVuZ3RoKSAmJiAhcmVzb3VyY2VEYXRhLT5pc0NvbnRlbnRQdXJnZWQoKSkgewot ICAgICAgICBtX2lkZW50aWZpZXJzRGVxdWUuYXBwZW5kKGlkZW50aWZpZXIpOworICAgICAgICBt X3Jlc291cmNlSWRzRGVxdWUuYXBwZW5kKHJlc291cmNlSWQpOwogICAgICAgICByZXNvdXJjZURh dGEtPmFwcGVuZERhdGEoZGF0YSwgZGF0YUxlbmd0aCk7CiAgICAgICAgIG1fY29udGVudFNpemUg Kz0gZGF0YUxlbmd0aDsKICAgICB9CiB9CiAKLXZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6Om1h eWJlRGVjb2RlRGF0YVRvQ29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCit2b2lkIE5l dHdvcmtSZXNvdXJjZXNEYXRhOjptYXliZURlY29kZURhdGFUb0NvbnRlbnQoY29uc3QgU3RyaW5n JiByZXNvdXJjZUlkKQogewotICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9pZGVu dGlmaWVyVG9SZXNvdXJjZURhdGFNYXAuZ2V0KGlkZW50aWZpZXIpOworICAgIFJlc291cmNlRGF0 YSogcmVzb3VyY2VEYXRhID0gbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuZ2V0KHJlc291 cmNlSWQpOwogICAgIGlmICghcmVzb3VyY2VEYXRhKQogICAgICAgICByZXR1cm47CiAgICAgaWYg KCFyZXNvdXJjZURhdGEtPmhhc0RhdGEoKSkKQEAgLTIxMCw0NiArMjEwLDQ2IEBAIHZvaWQgTmV0 d29ya1Jlc291cmNlc0RhdGE6Om1heWJlRGVjb2RlRGF0YVRvQ29udGVudCh1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIpCiAgICAgICAgIG1fY29udGVudFNpemUgLT0gcmVzb3VyY2VEYXRhLT5wdXJn ZUNvbnRlbnQoKTsKIH0KIAotdm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6YWRkQ2FjaGVkUmVz b3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVz b3VyY2UpCit2b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjphZGRDYWNoZWRSZXNvdXJjZShjb25z dCBTdHJpbmcmIHJlc291cmNlSWQsIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSkKIHsK LSAgICBpZiAoIW1faWRlbnRpZmllclRvUmVzb3VyY2VEYXRhTWFwLmNvbnRhaW5zKGlkZW50aWZp ZXIpKQorICAgIGlmICghbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuY29udGFpbnMocmVz b3VyY2VJZCkpCiAgICAgICAgIHJldHVybjsKLSAgICBSZXNvdXJjZURhdGEqIHJlc291cmNlRGF0 YSA9IG1faWRlbnRpZmllclRvUmVzb3VyY2VEYXRhTWFwLmdldChpZGVudGlmaWVyKTsKKyAgICBS ZXNvdXJjZURhdGEqIHJlc291cmNlRGF0YSA9IG1fcmVzb3VyY2VJZFRvUmVzb3VyY2VEYXRhTWFw LmdldChyZXNvdXJjZUlkKTsKIAogICAgIHJlc291cmNlRGF0YS0+c2V0Q2FjaGVkUmVzb3VyY2Uo Y2FjaGVkUmVzb3VyY2UpOwogfQogCi12b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjphZGRSZXNv dXJjZVNoYXJlZEJ1ZmZlcih1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFBhc3NSZWZQdHI8U2hh cmVkQnVmZmVyPiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nTmFtZSkKK3ZvaWQg TmV0d29ya1Jlc291cmNlc0RhdGE6OmFkZFJlc291cmNlU2hhcmVkQnVmZmVyKGNvbnN0IFN0cmlu ZyYgcmVzb3VyY2VJZCwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlciwgY29uc3QgU3Ry aW5nJiB0ZXh0RW5jb2RpbmdOYW1lKQogewotICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRh ID0gbV9pZGVudGlmaWVyVG9SZXNvdXJjZURhdGFNYXAuZ2V0KGlkZW50aWZpZXIpOworICAgIFJl c291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAu Z2V0KHJlc291cmNlSWQpOwogICAgIGlmICghcmVzb3VyY2VEYXRhKQogICAgICAgICByZXR1cm47 CiAgICAgcmVzb3VyY2VEYXRhLT5zZXRCdWZmZXIoYnVmZmVyKTsKICAgICByZXNvdXJjZURhdGEt PnNldFRleHRFbmNvZGluZ05hbWUodGV4dEVuY29kaW5nTmFtZSk7CiB9CiAKLU5ldHdvcmtSZXNv dXJjZXNEYXRhOjpSZXNvdXJjZURhdGEgY29uc3QqIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpkYXRh KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKK05ldHdvcmtSZXNvdXJjZXNEYXRhOjpSZXNvdXJj ZURhdGEgY29uc3QqIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpkYXRhKGNvbnN0IFN0cmluZyYgcmVz b3VyY2VJZCkKIHsKLSAgICByZXR1cm4gbV9pZGVudGlmaWVyVG9SZXNvdXJjZURhdGFNYXAuZ2V0 KGlkZW50aWZpZXIpOworICAgIHJldHVybiBtX3Jlc291cmNlSWRUb1Jlc291cmNlRGF0YU1hcC5n ZXQocmVzb3VyY2VJZCk7CiB9CiAKIHZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6OmNsZWFyKGNv bnN0IFN0cmluZyYgcHJlc2VydmVkTG9hZGVySWQpCiB7Ci0gICAgbV9pZGVudGlmaWVyc0RlcXVl LmNsZWFyKCk7CisgICAgbV9yZXNvdXJjZUlkc0RlcXVlLmNsZWFyKCk7CiAgICAgbV9jb250ZW50 U2l6ZSA9IDA7CiAKICAgICBSZXNvdXJjZURhdGFNYXAgcHJlc2VydmVkTWFwOwogCiAgICAgUmVz b3VyY2VEYXRhTWFwOjppdGVyYXRvciBpdDsKLSAgICBSZXNvdXJjZURhdGFNYXA6Oml0ZXJhdG9y IGVuZCA9IG1faWRlbnRpZmllclRvUmVzb3VyY2VEYXRhTWFwLmVuZCgpOwotICAgIGZvciAoaXQg PSBtX2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQp IHsKKyAgICBSZXNvdXJjZURhdGFNYXA6Oml0ZXJhdG9yIGVuZCA9IG1fcmVzb3VyY2VJZFRvUmVz b3VyY2VEYXRhTWFwLmVuZCgpOworICAgIGZvciAoaXQgPSBtX3Jlc291cmNlSWRUb1Jlc291cmNl RGF0YU1hcC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgUmVzb3VyY2VEYXRh KiByZXNvdXJjZURhdGEgPSBpdC0+c2Vjb25kOwogICAgICAgICBpZiAoIXByZXNlcnZlZExvYWRl cklkLmlzTnVsbCgpICYmIHJlc291cmNlRGF0YS0+bG9hZGVySWQoKSA9PSBwcmVzZXJ2ZWRMb2Fk ZXJJZCkKICAgICAgICAgICAgIHByZXNlcnZlZE1hcC5zZXQoaXQtPmZpcnN0LCBpdC0+c2Vjb25k KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZGVsZXRlIHJlc291cmNlRGF0YTsKICAgICB9 Ci0gICAgbV9pZGVudGlmaWVyVG9SZXNvdXJjZURhdGFNYXAuc3dhcChwcmVzZXJ2ZWRNYXApOwor ICAgIG1fcmVzb3VyY2VJZFRvUmVzb3VyY2VEYXRhTWFwLnN3YXAocHJlc2VydmVkTWFwKTsKIH0K IAogdm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6c2V0UmVzb3VyY2VzRGF0YVNpemVMaW1pdHMo aW50IG1heGltdW1SZXNvdXJjZXNDb250ZW50U2l6ZSwgaW50IG1heGltdW1TaW5nbGVSZXNvdXJj ZUNvbnRlbnRTaXplKQpAQCAtMjYwLDE0ICsyNjAsMTQgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2Vz RGF0YTo6c2V0UmVzb3VyY2VzRGF0YVNpemVMaW1pdHMoaW50IG1heGltdW1SZXNvdXJjZXNDb250 ZW4KIH0KIAogCi12b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjplbnN1cmVOb0RhdGFGb3JJZGVu dGlmaWVyKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKK3ZvaWQgTmV0d29ya1Jlc291cmNlc0Rh dGE6OmVuc3VyZU5vRGF0YUZvclJlc291cmNlSWQoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkKQog ewotICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhID0gbV9pZGVudGlmaWVyVG9SZXNvdXJj ZURhdGFNYXAuZ2V0KGlkZW50aWZpZXIpOworICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRh ID0gbV9yZXNvdXJjZUlkVG9SZXNvdXJjZURhdGFNYXAuZ2V0KHJlc291cmNlSWQpOwogICAgIGlm IChyZXNvdXJjZURhdGEpIHsKICAgICAgICAgaWYgKHJlc291cmNlRGF0YS0+aGFzQ29udGVudCgp IHx8IHJlc291cmNlRGF0YS0+aGFzRGF0YSgpKQogICAgICAgICAgICAgbV9jb250ZW50U2l6ZSAt PSByZXNvdXJjZURhdGEtPnB1cmdlQ29udGVudCgpOwogICAgICAgICBkZWxldGUgcmVzb3VyY2VE YXRhOwotICAgICAgICBtX2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcC5yZW1vdmUoaWRlbnRp Zmllcik7CisgICAgICAgIG1fcmVzb3VyY2VJZFRvUmVzb3VyY2VEYXRhTWFwLnJlbW92ZShyZXNv dXJjZUlkKTsKICAgICB9CiB9CiAKQEAgLTI3Nyw4ICsyNzcsOCBAQCBib29sIE5ldHdvcmtSZXNv dXJjZXNEYXRhOjplbnN1cmVGcmVlU3BhY2UoaW50IHNpemUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIHdoaWxlIChzaXplID4gbV9tYXhpbXVtUmVzb3VyY2VzQ29udGVudFNpemUgLSBt X2NvbnRlbnRTaXplKSB7Ci0gICAgICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IG1faWRl bnRpZmllcnNEZXF1ZS50YWtlRmlyc3QoKTsKLSAgICAgICAgUmVzb3VyY2VEYXRhKiByZXNvdXJj ZURhdGEgPSBtX2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcC5nZXQoaWRlbnRpZmllcik7Cisg ICAgICAgIFN0cmluZyByZXNvdXJjZUlkID0gbV9yZXNvdXJjZUlkc0RlcXVlLnRha2VGaXJzdCgp OworICAgICAgICBSZXNvdXJjZURhdGEqIHJlc291cmNlRGF0YSA9IG1fcmVzb3VyY2VJZFRvUmVz b3VyY2VEYXRhTWFwLmdldChyZXNvdXJjZUlkKTsKICAgICAgICAgaWYgKHJlc291cmNlRGF0YSkK ICAgICAgICAgICAgIG1fY29udGVudFNpemUgLT0gcmVzb3VyY2VEYXRhLT5wdXJnZUNvbnRlbnQo KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTmV0d29ya1Jl c291cmNlc0RhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2Vz RGF0YS5oCmluZGV4IGQ1NDdhYTc5MTFlNjkwODNkZTM4OTQyNzViNDI3ZWQ4M2RkMTg2ZDcuLmRi NGJmYzQ3MDViZmJiYzJkZDIxYWUzMzAyNzA0MjE1MzkyZGNjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0YS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0YS5oCkBAIC01MSw5ICs1MSw5IEBA IHB1YmxpYzoKICAgICBjbGFzcyBSZXNvdXJjZURhdGEgewogICAgICAgICBmcmllbmQgY2xhc3Mg TmV0d29ya1Jlc291cmNlc0RhdGE7CiAgICAgcHVibGljOgotICAgICAgICBSZXNvdXJjZURhdGEo dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGxvYWRlcklkKTsKKyAgICAg ICAgUmVzb3VyY2VEYXRhKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiBs b2FkZXJJZCk7CiAKLSAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKCkgY29uc3QgeyBy ZXR1cm4gbV9pZGVudGlmaWVyOyB9CisgICAgICAgIFN0cmluZyByZXNvdXJjZUlkKCkgY29uc3Qg eyByZXR1cm4gbV9yZXNvdXJjZUlkOyB9CiAgICAgICAgIFN0cmluZyBsb2FkZXJJZCgpIGNvbnN0 IHsgcmV0dXJuIG1fbG9hZGVySWQ7IH0KIAogICAgICAgICBTdHJpbmcgZnJhbWVJZCgpIGNvbnN0 IHsgcmV0dXJuIG1fZnJhbWVJZDsgfQpAQCAtOTAsNyArOTAsNyBAQCBwdWJsaWM6CiAgICAgICAg IHZvaWQgYXBwZW5kRGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCk7CiAgICAg ICAgIGludCBkZWNvZGVEYXRhVG9Db250ZW50KCk7CiAKLSAgICAgICAgdW5zaWduZWQgbG9uZyBt X2lkZW50aWZpZXI7CisgICAgICAgIFN0cmluZyBtX3Jlc291cmNlSWQ7CiAgICAgICAgIFN0cmlu ZyBtX2xvYWRlcklkOwogICAgICAgICBTdHJpbmcgbV9mcmFtZUlkOwogICAgICAgICBTdHJpbmcg bV91cmw7CkBAIC0xMTAsMjggKzExMCwyOCBAQCBwdWJsaWM6CiAKICAgICB+TmV0d29ya1Jlc291 cmNlc0RhdGEoKTsKIAotICAgIHZvaWQgcmVzb3VyY2VDcmVhdGVkKHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgY29uc3QgU3RyaW5nJiBsb2FkZXJJZCk7Ci0gICAgdm9pZCByZXNwb25zZVJlY2Vp dmVkKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25z dCBSZXNvdXJjZVJlc3BvbnNlJik7Ci0gICAgdm9pZCBzZXRSZXNvdXJjZVR5cGUodW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBJbnNwZWN0b3JQYWdlQWdlbnQ6OlJlc291cmNlVHlwZSk7Ci0gICAg SW5zcGVjdG9yUGFnZUFnZW50OjpSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllcik7Ci0gICAgdm9pZCBzZXRSZXNvdXJjZUNvbnRlbnQodW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQpOwotICAgIHZvaWQgbWF5YmVBZGRS ZXNvdXJjZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBjaGFyKiBkYXRhLCBp bnQgZGF0YUxlbmd0aCk7Ci0gICAgdm9pZCBtYXliZURlY29kZURhdGFUb0NvbnRlbnQodW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyKTsKLSAgICB2b2lkIGFkZENhY2hlZFJlc291cmNlKHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgQ2FjaGVkUmVzb3VyY2UqKTsKLSAgICB2b2lkIGFkZFJlc291cmNl U2hhcmVkQnVmZmVyKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+LCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUpOwotICAgIFJlc291cmNlRGF0 YSBjb25zdCogZGF0YSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpOworICAgIHZvaWQgcmVzb3Vy Y2VDcmVhdGVkKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiBsb2FkZXJJ ZCk7CisgICAgdm9pZCByZXNwb25zZVJlY2VpdmVkKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwg Y29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgdm9p ZCBzZXRSZXNvdXJjZVR5cGUoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkLCBJbnNwZWN0b3JQYWdl QWdlbnQ6OlJlc291cmNlVHlwZSk7CisgICAgSW5zcGVjdG9yUGFnZUFnZW50OjpSZXNvdXJjZVR5 cGUgcmVzb3VyY2VUeXBlKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCk7CisgICAgdm9pZCBzZXRS ZXNvdXJjZUNvbnRlbnQoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkLCBjb25zdCBTdHJpbmcmIGNv bnRlbnQpOworICAgIHZvaWQgbWF5YmVBZGRSZXNvdXJjZURhdGEoY29uc3QgU3RyaW5nJiByZXNv dXJjZUlkLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCk7CisgICAgdm9pZCBtYXli ZURlY29kZURhdGFUb0NvbnRlbnQoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkKTsKKyAgICB2b2lk IGFkZENhY2hlZFJlc291cmNlKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VJZCwgQ2FjaGVkUmVzb3Vy Y2UqKTsKKyAgICB2b2lkIGFkZFJlc291cmNlU2hhcmVkQnVmZmVyKGNvbnN0IFN0cmluZyYgcmVz b3VyY2VJZCwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBTdHJpbmcmIHRleHRFbmNv ZGluZ05hbWUpOworICAgIFJlc291cmNlRGF0YSBjb25zdCogZGF0YShjb25zdCBTdHJpbmcmIHJl c291cmNlSWQpOwogICAgIHZvaWQgY2xlYXIoY29uc3QgU3RyaW5nJiBwcmVzZXJ2ZWRMb2FkZXJJ ZCA9IFN0cmluZygpKTsKIAogICAgIHZvaWQgc2V0UmVzb3VyY2VzRGF0YVNpemVMaW1pdHMoaW50 IG1heGltdW1SZXNvdXJjZXNDb250ZW50U2l6ZSwgaW50IG1heGltdW1TaW5nbGVSZXNvdXJjZUNv bnRlbnRTaXplKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGVuc3VyZU5vRGF0YUZvcklkZW50aWZp ZXIodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKKyAgICB2b2lkIGVuc3VyZU5vRGF0YUZvclJl c291cmNlSWQoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkKTsKICAgICBib29sIGVuc3VyZUZyZWVT cGFjZShpbnQgc2l6ZSk7CiAKLSAgICBEZXF1ZTx1bnNpZ25lZCBsb25nPiBtX2lkZW50aWZpZXJz RGVxdWU7CisgICAgRGVxdWU8U3RyaW5nPiBtX3Jlc291cmNlSWRzRGVxdWU7CiAKLSAgICB0eXBl ZGVmIEhhc2hNYXA8dW5zaWduZWQgbG9uZywgUmVzb3VyY2VEYXRhKj4gUmVzb3VyY2VEYXRhTWFw OwotICAgIFJlc291cmNlRGF0YU1hcCBtX2lkZW50aWZpZXJUb1Jlc291cmNlRGF0YU1hcDsKKyAg ICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBSZXNvdXJjZURhdGEqPiBSZXNvdXJjZURhdGFNYXA7 CisgICAgUmVzb3VyY2VEYXRhTWFwIG1fcmVzb3VyY2VJZFRvUmVzb3VyY2VEYXRhTWFwOwogICAg IGludCBtX2NvbnRlbnRTaXplOwogICAgIGludCBtX21heGltdW1SZXNvdXJjZXNDb250ZW50U2l6 ZTsKICAgICBpbnQgbV9tYXhpbXVtU2luZ2xlUmVzb3VyY2VDb250ZW50U2l6ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKaW5kZXgg ZjVlOWRjMTQ5NjkyMDE4MGY5YzNmYmU0OGFhYzY5Y2YwNzc0NzNkNy4uNDI4MDhhNzY0Y2Y2NDM4 MWIzMGU5MmU1YjI0MGQzMTdhMTg1NmIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKQEAgLTEyOSwzOCArMTI5LDM4IEBAIFBh c3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVNj aGVkdWxlUmVzb3VyY2VSZXF1ZXN0CiAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOwogfQogCi1Q YXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVS ZXNvdXJjZVNlbmRSZXF1ZXN0RGF0YSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3REYXRhKGNvbnN0IFN0 cmluZyYgcmVzb3VyY2VJZCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp OwotICAgIGRhdGEtPnNldE51bWJlcigiaWRlbnRpZmllciIsIGlkZW50aWZpZXIpOworICAgIGRh dGEtPnNldFN0cmluZygiaWRlbnRpZmllciIsIHJlc291cmNlSWQpOwogICAgIGRhdGEtPnNldFN0 cmluZygidXJsIiwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSk7CiAgICAgZGF0YS0+c2V0U3RyaW5n KCJyZXF1ZXN0TWV0aG9kIiwgcmVxdWVzdC5odHRwTWV0aG9kKCkpOwogICAgIHJldHVybiBkYXRh LnJlbGVhc2UoKTsKIH0KIAotUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VEYXRhKHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCitQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJj ZVJlY2VpdmVSZXNwb25zZURhdGEoY29uc3QgU3RyaW5nJiByZXNvdXJjZUlkLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBk YXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkYXRhLT5zZXROdW1iZXIoImlk ZW50aWZpZXIiLCBpZGVudGlmaWVyKTsKKyAgICBkYXRhLT5zZXRTdHJpbmcoImlkZW50aWZpZXIi LCByZXNvdXJjZUlkKTsKICAgICBkYXRhLT5zZXROdW1iZXIoInN0YXR1c0NvZGUiLCByZXNwb25z ZS5odHRwU3RhdHVzQ29kZSgpKTsKICAgICBkYXRhLT5zZXRTdHJpbmcoIm1pbWVUeXBlIiwgcmVz cG9uc2UubWltZVR5cGUoKSk7CiAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOwogfQogCi1QYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNv dXJjZUZpbmlzaERhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRpZEZhaWwsIGRv dWJsZSBmaW5pc2hUaW1lKQorUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hEYXRhKGNvbnN0IFN0cmluZyYgcmVzb3Vy Y2VJZCwgYm9vbCBkaWRGYWlsLCBkb3VibGUgZmluaXNoVGltZSkKIHsKICAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBkYXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkYXRh LT5zZXROdW1iZXIoImlkZW50aWZpZXIiLCBpZGVudGlmaWVyKTsKKyAgICBkYXRhLT5zZXRTdHJp bmcoImlkZW50aWZpZXIiLCByZXNvdXJjZUlkKTsKICAgICBkYXRhLT5zZXRCb29sZWFuKCJkaWRG YWlsIiwgZGlkRmFpbCk7CiAgICAgaWYgKGZpbmlzaFRpbWUpCiAgICAgICAgIGRhdGEtPnNldE51 bWJlcigibmV0d29ya1RpbWUiLCBmaW5pc2hUaW1lKTsKICAgICByZXR1cm4gZGF0YS5yZWxlYXNl KCk7CiB9CiAKLVBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZVJlY2VpdmVSZXNvdXJjZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQor UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl UmVjZWl2ZVJlc291cmNlRGF0YShjb25zdCBTdHJpbmcmIHJlc291cmNlSWQpCiB7CiAgICAgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0g ICAgZGF0YS0+c2V0TnVtYmVyKCJpZGVudGlmaWVyIiwgaWRlbnRpZmllcik7CisgICAgZGF0YS0+ c2V0U3RyaW5nKCJpZGVudGlmaWVyIiwgcmVzb3VyY2VJZCk7CiAgICAgcmV0dXJuIGRhdGEucmVs ZWFzZSgpOwogfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5l UmVjb3JkRmFjdG9yeS5oCmluZGV4IDI1OGVmNjQzZTU2N2NjZjAyNzEwNDc3MDdkZTRmNjQwZTAy ZmFkYTYuLmI5OGQ5ZmUyNmMzNTZmNjgyNTgyNTA5ZTU5YjU0OTM1MjQxNDYyNzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKQEAgLTY0 LDE1ICs2NCwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgc3RhdGljIFBhc3NS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVUaW1lU3RhbXBEYXRhKGNvbnN0IFN0cmluZyYp OwogCi0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gY3JlYXRlUmVz b3VyY2VTZW5kUmVxdWVzdERhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiBjcmVhdGVSZXNvdXJjZVNlbmRSZXF1ZXN0RGF0YShjb25zdCBTdHJpbmcmIHJlc291cmNlSWQs IGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwogCiAgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gY3JlYXRlU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3REYXRhKGNvbnN0IFN0 cmluZyYpOwogCi0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gY3Jl YXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VEYXRhKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOworICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlRGF0YShjb25zdCBTdHJp bmcmIHJlc291cmNlSWQsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKIAotICAgICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZVJlY2VpdmVSZXNvdXJjZURhdGEo dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBjcmVhdGVSZWNlaXZlUmVzb3VyY2VEYXRhKGNvbnN0IFN0cmluZyYgcmVz b3VyY2VJZCk7CiAKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBj cmVhdGVSZXNvdXJjZUZpbmlzaERhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRp ZEZhaWwsIGRvdWJsZSBmaW5pc2hUaW1lKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBjcmVhdGVSZXNvdXJjZUZpbmlzaERhdGEoY29uc3QgU3RyaW5nJiByZXNv dXJjZUlkLCBib29sIGRpZEZhaWwsIGRvdWJsZSBmaW5pc2hUaW1lKTsKIAogICAgICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZVBhaW50RGF0YShjb25zdCBJbnRS ZWN0Jik7CiAK