83332 2012-04-05 17:03:45 -0700 Web Inspector: CodeGeneratorInspector.py: completely switch all domains to 'strict' mode 2012-04-06 08:30:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 72861 0 prybin webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 597042 0 prybin 2012-04-05 17:03:45 -0700 Make all domains generated strict and remove a hard-coded list from generator. Timeline domain may temporarily work in raw objects and use runtimeCast method. 597055 1 135943 prybin 2012-04-05 17:22:43 -0700 Created attachment 135943 Patch 597376 2 pfeldman 2012-04-06 08:30:39 -0700 Committed r113440: <http://trac.webkit.org/changeset/113440> 135943 2012-04-05 17:22:43 -0700 2012-04-06 08:15:30 -0700 Patch bug-83332-20120406042241.patch text/plain 17781 prybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGEyOGRjNTJmMWY3ZmNm NTMzYzlkMWZmY2MzYTIzY2JiM2VlNzMwMy4uMWVjN2VlMjMzNWQ3OTM3NGQzNWJkN2VmOGE4Y2Q4 ZWIyNGM3M2Y3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA0LTA1ICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDb2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5OiBjb21wbGV0ZWx5IHN3aXRjaCBhbGwgZG9tYWlu cyB0byAnc3RyaWN0JyBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MzMzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEhhcmRjb2RlZCBsaXN0IG9mIGRvbWFpbnMgaXMgcmVtb3ZlZCBmcm9tIGdlbmVy YXRvci4gUGFydGlhbCBkb21haW4gc29ydGluZyBpcyBkcm9wcGVkIGFzIHVubmVlZGVkLgorICAg ICAgICBUeXBlcyB3aXRoIG9wZW4gcHJvcGVyeSBsaXN0IGFyZSBpbnRyb2R1Y2VkOiB2YWxpZGF0 b3IgYWxsb3dzIHVuZG9jdW1lbnRlZCBwcm9wZXJ0aWVzIGZvciB0aGVtLgorCisgICAgICAgIFRp bWVsaW5lIGRvbWFpbiBjb2RlIGlzIHBhdGNoZWQgdG8gZG8gcnVudGltZUNhc3QgaW4gdGhlIGxh c3QgbW9tZW50IGJlY2F1c2UgdHJ1ZSBzd2l0Y2hpbmcgdG8KKyAgICAgICAgdHlwZS1zYWZlIGlu dGVyZmFjZXMgc2hvdWxkIHRha2Ugc2lnbmlmaWNhbnQgdGltZSBhbmQgc2hvdWxkIGJlIGRvbmUg c2VwYXJhdGVseS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5OgorICAgICAgICAoR2VuZXJhdG9yLmdvKToKKyAgICAgICAgKEdlbmVyYXRvci5wcm9jZXNz X2V2ZW50KToKKyAgICAgICAgKEdlbmVyYXRvci5wcm9jZXNzX2NvbW1hbmQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxTZW5kUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmlubmVyQWRkUmVjb3JkVG9UaW1l bGluZSk6CisKIDIwMTItMDQtMDUgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgog CiAgICAgICAgIFtCbGFja0JlcnJ5XSBEaXNhYmxlIHBhaW50aW5nR29lc1RvV2luZG93KCkgZm9y IHRoZSByb290IGxheWVyIHdoZW4gZm9yY2VkIGNvbXBvc2l0aW5nIG1vZGUgaXMgYWN0aXZlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rv ci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5 CmluZGV4IDlmYWY1ZjRlOWE4NGYyYmNlOGJlNGEzN2ZmYjI4NzA3MmIxMDEyMGIuLmZhZDY2YjQ4 NmI2MTU2OGY2ZWM2ZjRlMzkwN2I0MmJjMGViYjVlYTAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC01NywxNCArNTcsMTEg QEAgVFlQRV9OQU1FX0ZJWF9NQVAgPSB7CiAKIAogVFlQRVNfV0lUSF9SVU5USU1FX0NBU1RfU0VU ID0gZnJvemVuc2V0KFsiUnVudGltZS5SZW1vdGVPYmplY3QiLCAiUnVudGltZS5Qcm9wZXJ0eURl c2NyaXB0b3IiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRGVi dWdnZXIuRnVuY3Rpb25EZXRhaWxzIiwgIkRlYnVnZ2VyLkNhbGxGcmFtZSJdKQotCi1TVFJJQ1Rf RU5BQkxFRF9ET01BSU5TID0gWyJDb25zb2xlIiwgIkRPTURlYnVnZ2VyIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgIkNTUyIsICJEZWJ1Z2dlciIsICJET00iLCAiTmV0d29yayIsICJQYWdl IiwgIlJ1bnRpbWUiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAiSW5zcGVjdG9yIiwgIk1l bW9yeSIsICJEYXRhYmFzZSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICJJbmRleGVkREIi LCAiRE9NU3RvcmFnZSIsICJBcHBsaWNhdGlvbkNhY2hlIiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgIkZpbGVTeXN0ZW0iLCAiUHJvZmlsZXIiLCAiV29ya2VyIl0KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIkRlYnVnZ2VyLkZ1bmN0aW9uRGV0YWlscyIsICJE ZWJ1Z2dlci5DYWxsRnJhbWUiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAjIFRoaXMgc2hvdWxkIGJlIGEgdGVtcG9yYXJ5IGhhY2suIFRpbWVsaW5lRXZlbnQgc2hv dWxkIGJlIGNyZWF0ZWQgdmlhIGdlbmVyYXRlZCBDKysgQVBJLgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiVGltZWxpbmUuVGltZWxpbmVFdmVudCJdKQogCitUWVBF U19XSVRIX09QRU5fRklFTERfTElTVF9TRVQgPSBmcm96ZW5zZXQoWyJUaW1lbGluZS5UaW1lbGlu ZUV2ZW50Il0pCiAKIGNtZGxpbmVfcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKIGNt ZGxpbmVfcGFyc2VyLmFkZF9vcHRpb24oIi0tb3V0cHV0X2hfZGlyIikKQEAgLTEyOTAsNiArMTI4 Nyw4IEBAIGNsYXNzIFR5cGVCaW5kaW5nczoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHdyaXRlci5uZXdsaW5lKCIgICAgc3RhdGljIHZvaWQgYXNzZXJ0Q29ycmVjdFZhbHVl KEluc3BlY3RvclZhbHVlKiB2YWx1ZSk7XG4iKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgd3JpdGVyLmFwcGVuZCgiI2VuZGlmICAvLyAlc1xuIiAlIFZBTElEQVRPUl9JRkRF Rl9OQU1FKQogCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbG9zZWRfZmll bGRfc2V0ID0gKGNvbnRleHRfZG9tYWluX25hbWUgKyAiLiIgKyBjbGFzc19uYW1lKSBub3QgaW4g VFlQRVNfV0lUSF9PUEVOX0ZJRUxEX0xJU1RfU0VUCisKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHZhbGlkYXRvcl93cml0ZXIgPSBnZW5lcmF0ZV9jb250ZXh0LnZhbGlkYXRv cl93cml0ZXIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbGlkYXRvcl93 cml0ZXIubmV3bGluZSgidm9pZCAlcyVzOjphc3NlcnRDb3JyZWN0VmFsdWUoSW5zcGVjdG9yVmFs dWUqIHZhbHVlKVxuIiAlIChoZWxwZXIuZnVsbF9uYW1lX3ByZWZpeF9mb3JfaW1wbCwgY2xhc3Nf bmFtZSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3Jp dGVyLm5ld2xpbmUoIntcbiIpCkBAIC0xMzA1LDcgKzEzMDQsOCBAQCBjbGFzcyBUeXBlQmluZGlu Z3M6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsaWRhdG9yX3dy aXRlci5uZXdsaW5lKCIgICAgICAgICVzKCVzLT5zZWNvbmQuZ2V0KCkpO1xuIiAlIChwcm9wX2Rh dGEucGFyYW1fdHlwZV9iaW5kaW5nLmdldF92YWxpZGF0b3JfY2FsbF90ZXh0KCksIGl0X25hbWUp KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbGlkYXRvcl93cml0 ZXIubmV3bGluZSgiICAgIH1cbiIpCiAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHZhbGlkYXRvcl93cml0ZXIubmV3bGluZSgiICAgIGludCBmb3VuZFByb3BlcnRpZXNDb3Vu dCA9ICVzO1xuIiAlIGxlbihyZXNvbHZlX2RhdGEubWFpbl9wcm9wZXJ0aWVzKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIGNsb3NlZF9maWVsZF9zZXQ6CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsaWRhdG9yX3dyaXRlci5uZXdsaW5l KCIgICAgaW50IGZvdW5kUHJvcGVydGllc0NvdW50ID0gJXM7XG4iICUgbGVuKHJlc29sdmVfZGF0 YS5tYWluX3Byb3BlcnRpZXMpKQogCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmb3IgcHJvcF9kYXRhIGluIHJlc29sdmVfZGF0YS5vcHRpb25hbF9wcm9wZXJ0aWVzOgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbGlkYXRvcl93cml0ZXIubmV3 bGluZSgiICAgIHtcbiIpCkBAIC0xMzE0LDExICsxMzE0LDEzIEBAIGNsYXNzIFR5cGVCaW5kaW5n czoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3Jp dGVyLm5ld2xpbmUoIiAgICAgICAgJXMgPSBvYmplY3QtPmZpbmQoXCIlc1wiKTtcbiIgJSAoaXRf bmFtZSwgcHJvcF9kYXRhLnBbIm5hbWUiXSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdmFsaWRhdG9yX3dyaXRlci5uZXdsaW5lKCIgICAgICAgIGlmICglcyAhPSBv YmplY3QtPmVuZCgpKSB7XG4iICUgaXRfbmFtZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVyLm5ld2xpbmUoIiAgICAgICAgICAgICVzKCVz LT5zZWNvbmQuZ2V0KCkpO1xuIiAlIChwcm9wX2RhdGEucGFyYW1fdHlwZV9iaW5kaW5nLmdldF92 YWxpZGF0b3JfY2FsbF90ZXh0KCksIGl0X25hbWUpKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHZhbGlkYXRvcl93cml0ZXIubmV3bGluZSgiICAgICAgICAgICAgKytm b3VuZFByb3BlcnRpZXNDb3VudDtcbiIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaWYgY2xvc2VkX2ZpZWxkX3NldDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdmFsaWRhdG9yX3dyaXRlci5uZXdsaW5lKCIgICAgICAgICAgICAr K2ZvdW5kUHJvcGVydGllc0NvdW50O1xuIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVyLm5ld2xpbmUoIiAgICAgICAgfVxuIikKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVyLm5ld2xp bmUoIiAgICB9XG4iKQogCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxp ZGF0b3Jfd3JpdGVyLm5ld2xpbmUoIiAgICBBU1NFUlQoZm91bmRQcm9wZXJ0aWVzQ291bnQgPT0g b2JqZWN0LT5zaXplKCkpO1xuIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlmIGNsb3NlZF9maWVsZF9zZXQ6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdmFsaWRhdG9yX3dyaXRlci5uZXdsaW5lKCIgICAgQVNTRVJUKGZvdW5kUHJvcGVydGll c0NvdW50ID09IG9iamVjdC0+c2l6ZSgpKTtcbiIpCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVyLm5ld2xpbmUoIn1cblxuXG4iKQogCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJ9O1xuXG4iKQpAQCAtMjQz MCw3ICsyNDMyLDYgQEAgZGVmIHJlc29sdmVfYWxsX3R5cGVzKCk6CiBnbG9iYWxfZm9yd2FyZF9s aXN0ZW5lciA9IHJlc29sdmVfYWxsX3R5cGVzKCkKIAogCi0KIGRlZiBnZXRfYW5ub3RhdGVkX3R5 cGVfdGV4dChyYXdfdHlwZSwgYW5ub3RhdGVkX3R5cGUpOgogICAgIGlmIGFubm90YXRlZF90eXBl ICE9IHJhd190eXBlOgogICAgICAgICByZXR1cm4gIi8qJXMqLyAlcyIgJSAoYW5ub3RhdGVkX3R5 cGUsIHJhd190eXBlKQpAQCAtMjUzMCw5ICsyNTMxLDExIEBAIGNsYXNzIEdlbmVyYXRvcjoKICAg ICAgICAgICAgIEdlbmVyYXRvci5mcm9udGVuZF9kb21haW5fY2xhc3NfbGluZXMsCiAgICAgICAg ICAgICBHZW5lcmF0b3IuZnJvbnRlbmRfbWV0aG9kX2xpc3QsCiAgICAgICAgICAgICBHZW5lcmF0 b3IubWV0aG9kX2hhbmRsZXJfbGlzdCwKLSAgICAgICAgICAgIEdlbmVyYXRvci5tZXRob2RfbmFt ZV9lbnVtX2xpc3RdCi0KLSAgICAgICAgc3RyaWN0X2VuYWJsZWRfZG9tYWluc191bnVzZWQgPSBz ZXQoU1RSSUNUX0VOQUJMRURfRE9NQUlOUykKKyAgICAgICAgICAgIEdlbmVyYXRvci5tZXRob2Rf bmFtZV9lbnVtX2xpc3QsCisgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9jb25zdHJ1Y3Rv cl9pbml0X2xpc3QsCisgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF92aXJ0dWFsX3NldHRl cnNfbGlzdCwKKyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX3NldHRlcnNfbGlzdCwKKyAg ICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2ZpZWxkX2xpc3RdCiAKICAgICAgICAgZm9yIGpz b25fZG9tYWluIGluIGpzb25fYXBpWyJkb21haW5zIl06CiAgICAgICAgICAgICBkb21haW5fbmFt ZSA9IGpzb25fZG9tYWluWyJkb21haW4iXQpAQCAtMjU3Niw0NiArMjU3OSwxNSBAQCBjbGFzcyBH ZW5lcmF0b3I6CiAgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9hZ2VudF9pbnRlcmZhY2Vf bGlzdC5hcHBlbmQoIiAgICAgICAgdmlydHVhbCB+JXMoKSB7IH1cbiIgJSBhZ2VudF9pbnRlcmZh Y2VfbmFtZSkKICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2FnZW50X2ludGVyZmFjZV9s aXN0LmFwcGVuZCgiICAgIH07XG5cbiIpCiAKLSAgICAgICAgICAgIGlmIGRvbWFpbl9ndWFyZDoK LSAgICAgICAgICAgICAgICBmb3IgbCBpbiByZXZlcnNlZChmaXJzdF9jeWNsZV9ndWFyZGFibGVf bGlzdF9saXN0KToKLSAgICAgICAgICAgICAgICAgICAgZG9tYWluX2d1YXJkLmdlbmVyYXRlX2Ns b3NlKGwpCi0gICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5faW5pdGlhbGl6 ZXJfbGlzdC5hcHBlbmQoIlxuIikKLQotICAgICAgICAgICAgc3RyaWN0X2VuYWJsZWRfZG9tYWlu c191bnVzZWQuZGlzY2FyZChkb21haW5fbmFtZSkKLQotICAgICAgICBpZiBzdHJpY3RfZW5hYmxl ZF9kb21haW5zX3VudXNlZDoKLSAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiVW5rbm93biBk b21haW5zIGxpc3RlZDogJXMiICUgc3RyaWN0X2VuYWJsZWRfZG9tYWluc191bnVzZWQpCi0KLSAg ICAgICAgc29ydGVkX2pzb25fZG9tYWlucyA9IGxpc3QoanNvbl9hcGlbImRvbWFpbnMiXSkKLSAg ICAgICAgc29ydGVkX2pzb25fZG9tYWlucy5zb3J0KGtleT1sYW1iZGEgbzogb1siZG9tYWluIl0p Ci0KLSAgICAgICAgc29ydGVkX2N5Y2xlX2d1YXJkYWJsZV9saXN0X2xpc3QgPSBbCi0gICAgICAg ICAgICBHZW5lcmF0b3IuYmFja2VuZF9jb25zdHJ1Y3Rvcl9pbml0X2xpc3QsCi0gICAgICAgICAg ICBHZW5lcmF0b3IuYmFja2VuZF92aXJ0dWFsX3NldHRlcnNfbGlzdCwKLSAgICAgICAgICAgIEdl bmVyYXRvci5iYWNrZW5kX3NldHRlcnNfbGlzdCwKLSAgICAgICAgICAgIEdlbmVyYXRvci5iYWNr ZW5kX2ZpZWxkX2xpc3RdCi0KLSAgICAgICAgZm9yIGpzb25fZG9tYWluIGluIHNvcnRlZF9qc29u X2RvbWFpbnM6Ci0gICAgICAgICAgICBkb21haW5fbmFtZSA9IGpzb25fZG9tYWluWyJkb21haW4i XQotCi0gICAgICAgICAgICBkb21haW5fZml4ZXMgPSBEb21haW5OYW1lRml4ZXMuZ2V0X2ZpeGVk X2RhdGEoZG9tYWluX25hbWUpCi0gICAgICAgICAgICBkb21haW5fZ3VhcmQgPSBkb21haW5fZml4 ZXMuZ2V0X2d1YXJkKCkKLQotICAgICAgICAgICAgaWYgZG9tYWluX2d1YXJkOgotICAgICAgICAg ICAgICAgIGZvciBsIGluIHNvcnRlZF9jeWNsZV9ndWFyZGFibGVfbGlzdF9saXN0OgotICAgICAg ICAgICAgICAgICAgICBkb21haW5fZ3VhcmQuZ2VuZXJhdGVfb3BlbihsKQotCi0gICAgICAgICAg ICBhZ2VudF9pbnRlcmZhY2VfbmFtZSA9IENhcGl0YWxpemVyLmxvd2VyX2NhbWVsX2Nhc2VfdG9f dXBwZXIoZG9tYWluX25hbWUpICsgIkNvbW1hbmRIYW5kbGVyIgotCi0gICAgICAgICAgICBhZ2Vu dF9maWVsZF9uYW1lID0gZG9tYWluX2ZpeGVzLmFnZW50X2ZpZWxkX25hbWUKICAgICAgICAgICAg IEdlbmVyYXRvci5iYWNrZW5kX2NvbnN0cnVjdG9yX2luaXRfbGlzdC5hcHBlbmQoIiAgICAgICAg LCBtXyVzKDApIiAlIGFnZW50X2ZpZWxkX25hbWUpCiAgICAgICAgICAgICBHZW5lcmF0b3IuYmFj a2VuZF92aXJ0dWFsX3NldHRlcnNfbGlzdC5hcHBlbmQoIiAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0 ZXJBZ2VudCglcyogJXMpID0gMDsiICUgKGFnZW50X2ludGVyZmFjZV9uYW1lLCBhZ2VudF9maWVs ZF9uYW1lKSkKICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX3NldHRlcnNfbGlzdC5hcHBl bmQoIiAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJBZ2VudCglcyogJXMpIHsgQVNTRVJUKCFtXyVz KTsgbV8lcyA9ICVzOyB9IiAlIChhZ2VudF9pbnRlcmZhY2VfbmFtZSwgYWdlbnRfZmllbGRfbmFt ZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdlbnRfZmllbGRfbmFtZSkp CiAgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9maWVsZF9saXN0LmFwcGVuZCgiICAgICVz KiBtXyVzOyIgJSAoYWdlbnRfaW50ZXJmYWNlX25hbWUsIGFnZW50X2ZpZWxkX25hbWUpKQogCiAg ICAgICAgICAgICBpZiBkb21haW5fZ3VhcmQ6Ci0gICAgICAgICAgICAgICAgZm9yIGwgaW4gcmV2 ZXJzZWQoc29ydGVkX2N5Y2xlX2d1YXJkYWJsZV9saXN0X2xpc3QpOgorICAgICAgICAgICAgICAg IGZvciBsIGluIHJldmVyc2VkKGZpcnN0X2N5Y2xlX2d1YXJkYWJsZV9saXN0X2xpc3QpOgogICAg ICAgICAgICAgICAgICAgICBkb21haW5fZ3VhcmQuZ2VuZXJhdGVfY2xvc2UobCkKKyAgICAgICAg ICAgIEdlbmVyYXRvci5iYWNrZW5kX2pzX2RvbWFpbl9pbml0aWFsaXplcl9saXN0LmFwcGVuZCgi XG4iKQogCiAgICAgICAgIFJhd1R5cGVzLmdlbmVyYXRlX3ZhbGlkYXRlX21ldGhvZHMoV3JpdGVy KEdlbmVyYXRvci52YWxpZGF0b3JfaW1wbF9yYXdfdHlwZXNfbGlzdCwgIiIpKQogCkBAIC0yNjIz LDggKzI1OTUsNiBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgZGVmIHByb2Nlc3NfZXZlbnQoanNv bl9ldmVudCwgZG9tYWluX25hbWUsIGZyb250ZW5kX21ldGhvZF9kZWNsYXJhdGlvbl9saW5lcyk6 CiAgICAgICAgIGV2ZW50X25hbWUgPSBqc29uX2V2ZW50WyJuYW1lIl0KIAotICAgICAgICBzdHJp Y3RfbW9kZSA9IGRvbWFpbl9uYW1lIGluIFNUUklDVF9FTkFCTEVEX0RPTUFJTlMKLQogICAgICAg ICBwYXJhbWV0ZXJfbGlzdCA9IFtdCiAgICAgICAgIG1ldGhvZF9saW5lX2xpc3QgPSBbXQogICAg ICAgICBiYWNrZW5kX2pzX2V2ZW50X3BhcmFtX2xpc3QgPSBbXQpAQCAtMjY1MSwxNCArMjYyMSw4 IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAgICAgICAgICAgdHlwZV9tb2RlbCA9IHR5 cGVfbW9kZWwuZ2V0X29wdGlvbmFsKCkKICAgICAgICAgICAgICAgICAgICAgcmF3X3R5cGVfbW9k ZWwgPSByYXdfdHlwZV9tb2RlbC5nZXRfb3B0aW9uYWwoKQogCi0gICAgICAgICAgICAgICAgaWYg c3RyaWN0X21vZGU6Ci0gICAgICAgICAgICAgICAgICAgICMgQWxsIHR5cGVzIGFyZSBzdHJpY3Qu Ci0gICAgICAgICAgICAgICAgICAgIGFubm90YXRlZF90eXBlID0gdHlwZV9tb2RlbC5nZXRfaW5w dXRfcGFyYW1fdHlwZV90ZXh0KCkKLSAgICAgICAgICAgICAgICAgICAgbW9kZV90eXBlX2JpbmRp bmcgPSBwYXJhbV90eXBlX2JpbmRpbmcKLSAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAg ICAgICAgICAgICAjIEFsbCB0eXBlcyBhcmUgcmF3LgotICAgICAgICAgICAgICAgICAgICBhbm5v dGF0ZWRfdHlwZSA9IGdldF9hbm5vdGF0ZWRfdHlwZV90ZXh0KHJhd190eXBlX21vZGVsLmdldF9p bnB1dF9wYXJhbV90eXBlX3RleHQoKSwgdHlwZV9tb2RlbC5nZXRfaW5wdXRfcGFyYW1fdHlwZV90 ZXh0KCkpCi0gICAgICAgICAgICAgICAgICAgIG1vZGVfdHlwZV9iaW5kaW5nID0gcmF3X3R5cGVf YmluZGluZworICAgICAgICAgICAgICAgIGFubm90YXRlZF90eXBlID0gdHlwZV9tb2RlbC5nZXRf aW5wdXRfcGFyYW1fdHlwZV90ZXh0KCkKKyAgICAgICAgICAgICAgICBtb2RlX3R5cGVfYmluZGlu ZyA9IHBhcmFtX3R5cGVfYmluZGluZwogCiAgICAgICAgICAgICAgICAgcGFyYW1ldGVyX2xpc3Qu YXBwZW5kKCIlcyAlcyIgJSAoYW5ub3RhdGVkX3R5cGUsIHBhcmFtZXRlcl9uYW1lKSkKIApAQCAt MjY4OCw4ICsyNjUyLDYgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgIGRlZiBwcm9jZXNzX2NvbW1h bmQoanNvbl9jb21tYW5kLCBkb21haW5fbmFtZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdlbnRfaW50 ZXJmYWNlX25hbWUpOgogICAgICAgICBqc29uX2NvbW1hbmRfbmFtZSA9IGpzb25fY29tbWFuZFsi bmFtZSJdCiAKLSAgICAgICAgc3RyaWN0X21vZGUgPSBkb21haW5fbmFtZSBpbiBTVFJJQ1RfRU5B QkxFRF9ET01BSU5TCi0KICAgICAgICAgR2VuZXJhdG9yLm1ldGhvZF9uYW1lX2VudW1fbGlzdC5h cHBlbmQoIiAgICAgICAgayVzXyVzQ21kLCIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZFsi bmFtZSJdKSkKICAgICAgICAgR2VuZXJhdG9yLm1ldGhvZF9oYW5kbGVyX2xpc3QuYXBwZW5kKCIg ICAgICAgICAgICAmSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJJbXBsOjolc18lcywiICUgKGRv bWFpbl9uYW1lLCBqc29uX2NvbW1hbmRfbmFtZSkpCiAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5k X21ldGhvZF9kZWNsYXJhdGlvbl9saXN0LmFwcGVuZCgiICAgIHZvaWQgJXNfJXMobG9uZyBjYWxs SWQsIEluc3BlY3Rvck9iamVjdCogcmVxdWVzdE1lc3NhZ2VPYmplY3QpOyIgJSAoZG9tYWluX25h bWUsIGpzb25fY29tbWFuZF9uYW1lKSkKQEAgLTI3NzgsNDIgKzI3NDAsMjAgQEAgY2xhc3MgR2Vu ZXJhdG9yOgogICAgICAgICAgICAgICAgIGlmIG9wdGlvbmFsOgogICAgICAgICAgICAgICAgICAg ICB0eXBlX21vZGVsID0gdHlwZV9tb2RlbC5nZXRfb3B0aW9uYWwoKQogCi0gICAgICAgICAgICAg ICAgaWYgc3RyaWN0X21vZGU6Ci0gICAgICAgICAgICAgICAgICAgICMgQWxsIHR5cGVzIGFyZSBz dHJpY3QuIFZhbHVlcyBkbyBub3QgaGF2ZSBkZWZhdWx0IHZhbHVlcy4KLSAgICAgICAgICAgICAg ICAgICAgY29kZSA9ICIgICAgJXMgb3V0XyVzO1xuIiAlICh0eXBlX21vZGVsLmdldF9jb21tYW5k X3JldHVybl9wYXNzX21vZGVsKCkuZ2V0X3JldHVybl92YXJfdHlwZSgpLCBqc29uX3JldHVybl9u YW1lKQotICAgICAgICAgICAgICAgICAgICBwYXJhbSA9ICIsICVzb3V0XyVzIiAlICh0eXBlX21v ZGVsLmdldF9jb21tYW5kX3JldHVybl9wYXNzX21vZGVsKCkuZ2V0X291dHB1dF9hcmd1bWVudF9w cmVmaXgoKSwganNvbl9yZXR1cm5fbmFtZSkKLSAgICAgICAgICAgICAgICAgICAgdmFyX25hbWUg PSAib3V0XyVzIiAlIGpzb25fcmV0dXJuX25hbWUKLSAgICAgICAgICAgICAgICAgICAgc2V0dGVy X2FyZ3VtZW50ID0gdHlwZV9tb2RlbC5nZXRfY29tbWFuZF9yZXR1cm5fcGFzc19tb2RlbCgpLmdl dF9vdXRwdXRfdG9fcmF3X2V4cHJlc3Npb24oKSAlIHZhcl9uYW1lCi0gICAgICAgICAgICAgICAg ICAgIGlmIHJldHVybl90eXBlX2JpbmRpbmcuZ2V0X3NldHRlcl92YWx1ZV9leHByZXNzaW9uX3Bh dHRlcm4oKToKLSAgICAgICAgICAgICAgICAgICAgICAgIHNldHRlcl9hcmd1bWVudCA9IHJldHVy bl90eXBlX2JpbmRpbmcuZ2V0X3NldHRlcl92YWx1ZV9leHByZXNzaW9uX3BhdHRlcm4oKSAlIHNl dHRlcl9hcmd1bWVudAotCi0gICAgICAgICAgICAgICAgICAgIGNvb2sgPSAiICAgICAgICAgICAg cmVzdWx0LT5zZXQlcyhcIiVzXCIsICVzKTtcbiIgJSAoc2V0dGVyX3R5cGUsIGpzb25fcmV0dXJu X25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZXR0ZXJfYXJndW1lbnQpCi0KLSAgICAgICAgICAgICAgICAg ICAgc2V0X2NvbmRpdGlvbl9wYXR0ZXJuID0gdHlwZV9tb2RlbC5nZXRfY29tbWFuZF9yZXR1cm5f cGFzc19tb2RlbCgpLmdldF9zZXRfcmV0dXJuX2NvbmRpdGlvbigpCi0gICAgICAgICAgICAgICAg ICAgIGlmIHNldF9jb25kaXRpb25fcGF0dGVybjoKLSAgICAgICAgICAgICAgICAgICAgICAgIGNv b2sgPSAoIiAgICAgICAgICAgIGlmICglcylcbiAgICAiICUgKHNldF9jb25kaXRpb25fcGF0dGVy biAlIHZhcl9uYW1lKSkgKyBjb29rCi0gICAgICAgICAgICAgICAgICAgIGFubm90YXRlZF90eXBl ID0gdHlwZV9tb2RlbC5nZXRfY29tbWFuZF9yZXR1cm5fcGFzc19tb2RlbCgpLmdldF9vdXRwdXRf cGFyYW1ldGVyX3R5cGUoKQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAg ICAgICMgQWxsIHR5cGVzIGFyZSByYXcuIFZhbHVlcyBhbHdheXMgaGF2ZSBkZWZhdWx0IHZhbHVl cy4KLSAgICAgICAgICAgICAgICAgICAgcmF3X3R5cGVfbW9kZWwgPSByZXR1cm5fdHlwZV9iaW5k aW5nLmdldF90eXBlX21vZGVsKCkKLSAgICAgICAgICAgICAgICAgICAgaWYgb3B0aW9uYWw6Ci0g ICAgICAgICAgICAgICAgICAgICAgICByYXdfdHlwZV9tb2RlbCA9IHJhd190eXBlX21vZGVsLmdl dF9vcHRpb25hbCgpCi0KLSAgICAgICAgICAgICAgICAgICAgY29kZSA9ICIgICAgJXMgb3V0XyVz ID0gJXM7XG4iICUgKHJhd190eXBlLmdldF9yYXdfdHlwZV9tb2RlbCgpLmdldF9jb21tYW5kX3Jl dHVybl9wYXNzX21vZGVsKCkuZ2V0X3JldHVybl92YXJfdHlwZSgpLCBqc29uX3JldHVybl9uYW1l LCBpbml0aWFsaXplcikKLSAgICAgICAgICAgICAgICAgICAgcGFyYW0gPSAiLCAlc291dF8lcyIg JSAocmF3X3R5cGUuZ2V0X291dHB1dF9wYXNzX21vZGVsKCkuZ2V0X2FyZ3VtZW50X3ByZWZpeCgp LCBqc29uX3JldHVybl9uYW1lKQotICAgICAgICAgICAgICAgICAgICBjb29rID0gIiAgICAgICAg ICAgIHJlc3VsdC0+c2V0JXMoXCIlc1wiLCBvdXRfJXMpO1xuIiAlIChzZXR0ZXJfdHlwZSwganNv bl9yZXR1cm5fbmFtZSwganNvbl9yZXR1cm5fbmFtZSkKLSAgICAgICAgICAgICAgICAgICAgaWYg b3B0aW9uYWw6Ci0gICAgICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBzdXBwb3J0IG9wdGlv bmFsIHByb3Blcmx5LiBQcm9iYWJseSBhbiBhZGRpdGlvbmFsIG91dHB1dCBwYXJhbWV0ZXIgc2hv dWxkIGJlIGluIGVhY2ggY2FzZS4KLSAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IHJl ZmFjdG9yIHRoaXMgY29uZGl0aW9uOyBpdCdzIGEgaGFjayBub3cuCi0gICAgICAgICAgICAgICAg ICAgICAgICB2YXJfdHlwZV90ZXh0ID0gcmF3X3R5cGUuZ2V0X3Jhd190eXBlX21vZGVsKCkuZ2V0 X2NvbW1hbmRfcmV0dXJuX3Bhc3NfbW9kZWwoKS5nZXRfcmV0dXJuX3Zhcl90eXBlKCkKLSAgICAg ICAgICAgICAgICAgICAgICAgIGlmIHZhcl90eXBlX3RleHQgPT0gImJvb2wiIG9yIHZhcl90eXBl X3RleHQuc3RhcnRzd2l0aCgiUmVmUHRyPCIpOgotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvb2sgPSAoIiAgICAgICAgICAgIGlmIChvdXRfJXMpXG4gICAgIiAlIGpzb25fcmV0dXJuX25h bWUpICsgY29vawotICAgICAgICAgICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb29rID0gIiAgICAgICAgICAgIC8vIEZJWE1FOiBzdXBwb3J0IG9wdGlv bmFsIGhlcmUuXG4iICsgY29vaworICAgICAgICAgICAgICAgIGNvZGUgPSAiICAgICVzIG91dF8l cztcbiIgJSAodHlwZV9tb2RlbC5nZXRfY29tbWFuZF9yZXR1cm5fcGFzc19tb2RlbCgpLmdldF9y ZXR1cm5fdmFyX3R5cGUoKSwganNvbl9yZXR1cm5fbmFtZSkKKyAgICAgICAgICAgICAgICBwYXJh bSA9ICIsICVzb3V0XyVzIiAlICh0eXBlX21vZGVsLmdldF9jb21tYW5kX3JldHVybl9wYXNzX21v ZGVsKCkuZ2V0X291dHB1dF9hcmd1bWVudF9wcmVmaXgoKSwganNvbl9yZXR1cm5fbmFtZSkKKyAg ICAgICAgICAgICAgICB2YXJfbmFtZSA9ICJvdXRfJXMiICUganNvbl9yZXR1cm5fbmFtZQorICAg ICAgICAgICAgICAgIHNldHRlcl9hcmd1bWVudCA9IHR5cGVfbW9kZWwuZ2V0X2NvbW1hbmRfcmV0 dXJuX3Bhc3NfbW9kZWwoKS5nZXRfb3V0cHV0X3RvX3Jhd19leHByZXNzaW9uKCkgJSB2YXJfbmFt ZQorICAgICAgICAgICAgICAgIGlmIHJldHVybl90eXBlX2JpbmRpbmcuZ2V0X3NldHRlcl92YWx1 ZV9leHByZXNzaW9uX3BhdHRlcm4oKToKKyAgICAgICAgICAgICAgICAgICAgc2V0dGVyX2FyZ3Vt ZW50ID0gcmV0dXJuX3R5cGVfYmluZGluZy5nZXRfc2V0dGVyX3ZhbHVlX2V4cHJlc3Npb25fcGF0 dGVybigpICUgc2V0dGVyX2FyZ3VtZW50CisKKyAgICAgICAgICAgICAgICBjb29rID0gIiAgICAg ICAgICAgIHJlc3VsdC0+c2V0JXMoXCIlc1wiLCAlcyk7XG4iICUgKHNldHRlcl90eXBlLCBqc29u X3JldHVybl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzZXR0ZXJfYXJndW1lbnQpCiAKLSAgICAgICAgICAgICAg ICAgICAgYW5ub3RhdGVkX3R5cGUgPSBnZXRfYW5ub3RhdGVkX3R5cGVfdGV4dChyYXdfdHlwZS5n ZXRfcmF3X3R5cGVfbW9kZWwoKS5nZXRfY29tbWFuZF9yZXR1cm5fcGFzc19tb2RlbCgpLmdldF9y ZXR1cm5fdmFyX3R5cGUoKSArIHJhd190eXBlLmdldF9vdXRwdXRfcGFzc19tb2RlbCgpLmdldF9w YXJhbWV0ZXJfdHlwZV9zdWZmaXgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlX21vZGVsLmdldF9jb21tYW5kX3JldHVy bl9wYXNzX21vZGVsKCkuZ2V0X291dHB1dF9wYXJhbWV0ZXJfdHlwZSgpKQorICAgICAgICAgICAg ICAgIHNldF9jb25kaXRpb25fcGF0dGVybiA9IHR5cGVfbW9kZWwuZ2V0X2NvbW1hbmRfcmV0dXJu X3Bhc3NfbW9kZWwoKS5nZXRfc2V0X3JldHVybl9jb25kaXRpb24oKQorICAgICAgICAgICAgICAg IGlmIHNldF9jb25kaXRpb25fcGF0dGVybjoKKyAgICAgICAgICAgICAgICAgICAgY29vayA9ICgi ICAgICAgICAgICAgaWYgKCVzKVxuICAgICIgJSAoc2V0X2NvbmRpdGlvbl9wYXR0ZXJuICUgdmFy X25hbWUpKSArIGNvb2sKKyAgICAgICAgICAgICAgICBhbm5vdGF0ZWRfdHlwZSA9IHR5cGVfbW9k ZWwuZ2V0X2NvbW1hbmRfcmV0dXJuX3Bhc3NfbW9kZWwoKS5nZXRfb3V0cHV0X3BhcmFtZXRlcl90 eXBlKCkKIAogICAgICAgICAgICAgICAgIHBhcmFtX25hbWUgPSAib3V0XyVzIiAlIGpzb25fcmV0 dXJuX25hbWUKICAgICAgICAgICAgICAgICBpZiBvcHRpb25hbDoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCAzYTEyZmM1 MWExOWU2MTUyODMxNjgwYmJhYjZiYzZkOTU5Y2E0NmY0Li4zNDhkZDJjZjkzNWI5MzZhNTFjMWJh OTIwM2E2MTVlYTQwNDY0MTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC0zMDUsMTEgKzMwNSwxMyBAQCB2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0 cmluZyYgdXJsKQogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNl UmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCkKIHsKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKLSAgICBSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNS ZWNvcmQodGltZXN0YW1wKCksIG1fbWF4Q2FsbFN0YWNrRGVwdGgpOworICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IHJlY29yZFJhdyA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2Vu ZXJpY1JlY29yZCh0aW1lc3RhbXAoKSwgbV9tYXhDYWxsU3RhY2tEZXB0aCk7CiAgICAgU3RyaW5n IHJlcXVlc3RJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwot ICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVSZXNvdXJjZVNlbmRSZXF1ZXN0RGF0YShyZXF1ZXN0SWQsIHJlcXVlc3QpKTsKLSAgICByZWNv cmQtPnNldFN0cmluZygidHlwZSIsIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVzb3VyY2VTZW5kUmVx dWVzdCk7Ci0gICAgc2V0SGVhcFNpemVTdGF0aXN0aWMocmVjb3JkLmdldCgpKTsKKyAgICByZWNv cmRSYXctPnNldE9iamVjdCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVz b3VyY2VTZW5kUmVxdWVzdERhdGEocmVxdWVzdElkLCByZXF1ZXN0KSk7CisgICAgcmVjb3JkUmF3 LT5zZXRTdHJpbmcoInR5cGUiLCBUaW1lbGluZVJlY29yZFR5cGU6OlJlc291cmNlU2VuZFJlcXVl c3QpOworICAgIHNldEhlYXBTaXplU3RhdGlzdGljKHJlY29yZFJhdy5nZXQoKSk7CisgICAgLy8g RklYTUU6IHJ1bnRpbWVDYXN0IGlzIGEgaGFjay4gV2UgZG8gaXQgYmVjYXVzZSB3ZSBjYW4ndCBi dWlsZCBUaW1lbGluZUV2ZW50IGRpcmVjdGx5IG5vdy4KKyAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6 OlRpbWVsaW5lOjpUaW1lbGluZUV2ZW50PiByZWNvcmQgPSBUeXBlQnVpbGRlcjo6VGltZWxpbmU6 OlRpbWVsaW5lRXZlbnQ6OnJ1bnRpbWVDYXN0KHJlY29yZFJhdy5yZWxlYXNlKCkpOwogICAgIG1f ZnJvbnRlbmQtPmV2ZW50UmVjb3JkZWQocmVjb3JkLnJlbGVhc2UoKSk7CiB9CiAKQEAgLTM5MSw5 ICszOTMsMTEgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojppbm5lckFkZFJlY29yZFRv VGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3QKICAgICBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiByZWNvcmQocHJwUmVjb3JkKTsKICAgICByZWNvcmQtPnNldFN0cmluZygidHlwZSIs IHR5cGUpOwogICAgIHNldEhlYXBTaXplU3RhdGlzdGljKHJlY29yZC5nZXQoKSk7Ci0gICAgaWYg KG1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKQotICAgICAgICBtX2Zyb250ZW5kLT5ldmVudFJlY29y ZGVkKHJlY29yZC5yZWxlYXNlKCkpOwotICAgIGVsc2UgeworICAgIGlmIChtX3JlY29yZFN0YWNr LmlzRW1wdHkoKSkgeworICAgICAgICAvLyBGSVhNRTogcnVudGltZUNhc3QgaXMgYSBoYWNrLiBX ZSBkbyBpdCBiZWNhdXNlIHdlIGNhbid0IGJ1aWxkIFRpbWVsaW5lRXZlbnQgZGlyZWN0bHkgbm93 LgorICAgICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpUaW1lbGluZUV2ZW50PiBy ZWNvcmRDaGVja2VkID0gVHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpUaW1lbGluZUV2ZW50OjpydW50 aW1lQ2FzdChyZWNvcmQucmVsZWFzZSgpKTsKKyAgICAgICAgbV9mcm9udGVuZC0+ZXZlbnRSZWNv cmRlZChyZWNvcmRDaGVja2VkLnJlbGVhc2UoKSk7CisgICAgfSBlbHNlIHsKICAgICAgICAgVGlt ZWxpbmVSZWNvcmRFbnRyeSBwYXJlbnQgPSBtX3JlY29yZFN0YWNrLmxhc3QoKTsKICAgICAgICAg cGFyZW50LmNoaWxkcmVuLT5wdXNoT2JqZWN0KHJlY29yZC5yZWxlYXNlKCkpOwogICAgIH0K