231728 2021-10-14 02:24:14 -0700 Remove std::iterator usage 2021-10-14 10:09:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki achristensen benjamin cdumez cmarcelo darin esprehn+autocc ews-watchlist kangil.han keith_miller saam sam webkit-bug-importer oldest_to_newest 1804195 0 ysuzuki 2021-10-14 02:24:14 -0700 [WTF] Remove std::iterator usage 1804196 1 441195 ysuzuki 2021-10-14 02:27:47 -0700 Created attachment 441195 Patch 1804198 2 441196 ysuzuki 2021-10-14 02:38:06 -0700 Created attachment 441196 Patch 1804247 3 441196 keith_miller 2021-10-14 06:26:40 -0700 Comment on attachment 441196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441196&action=review > Source/WebCore/platform/Timer.cpp:336 > + std::push_heap(TimerHeapIterator(heapData), TimerHeapIterator(heapData + m_heapItem->heapIndex() + 1), TimerHeapLessThanFunction()); What's the deal here? I don't see where we're `using std::push_heap` anywhere. Is that in a different file? 1804297 4 441196 darin 2021-10-14 09:04:46 -0700 Comment on attachment 441196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441196&action=review >> Source/WebCore/platform/Timer.cpp:336 >> + std::push_heap(TimerHeapIterator(heapData), TimerHeapIterator(heapData + m_heapItem->heapIndex() + 1), TimerHeapLessThanFunction()); > > What's the deal here? I don't see where we're `using std::push_heap` anywhere. Is that in a different file? Presumably, because there was a type from namespace std involved, we didn’t have to write std::push_heap because of argument-dependent lookup <https://en.cppreference.com/w/cpp/language/adl>. Now the types have changed, and so we have to explicitly specify std. 1804312 5 ews-feeder 2021-10-14 09:39:45 -0700 Committed r284167 (242987@main): <https://commits.webkit.org/242987@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441196. 1804313 6 webkit-bug-importer 2021-10-14 09:40:19 -0700 <rdar://problem/84259492> 1804326 7 ysuzuki 2021-10-14 10:09:35 -0700 Yup. That change was necessary because of ADL. 441195 2021-10-14 02:27:47 -0700 2021-10-14 02:50:26 -0700 Patch bug-231728-20211014022746.patch text/plain 15671 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM0MjRmY2Y2MWI3ODNhZjM3YjI3NzJi ZWI4NTAxY2FiNjMzMjdmYTAuLmMwNTdiMjZlMmZlMGM1MWQ5ZDQ5NWFjYzAzZWNmY2E3Y2M5ODU2 MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTAtMTQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc3RkOjppdGVyYXRvciB1c2FnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNzI4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc3RkOjppdGVyYXRv cjw+IGlzIGRlcHJlY2F0ZWQgYW5kIGRlZmluaW5nIDUgdHlwZSBhbGlhc2VzIGlzIGVuY291cmFn ZWRbMV0uCisgICAgICAgIFdpdGggbmV3IGNsYW5nLCB1c2luZyBzdGQ6Oml0ZXJhdG9yPD4gY2F1 c2VzIGNvbXBpbGUgZXJyb3IgYmVjYXVzZSBvZiBkZXByZWNhdGlvbiB3YXJuaW5ncy4KKyAgICAg ICAgVGhpcyBwYXRjaCByZW1vdmVzIHN0ZDo6aXRlcmF0b3IgdXNhZ2UuCisKKyAgICAgICAgWzFd OiBodHRwczovL3d3dy5mbHVlbnRjcHAuY29tLzIwMTgvMDUvMDgvc3RkLWl0ZXJhdG9yLWRlcHJl Y2F0ZWQvCisKKyAgICAgICAgKiB3dGYvSGFzaEl0ZXJhdG9ycy5oOgorICAgICAgICAoV1RGOjog Y29uc3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHd0Zi9IYXNoVGFibGUuaDoKKyAgICAg ICAgKiB3dGYvV2Vha0hhc2hNYXAuaDoKKyAgICAgICAgKiB3dGYvV2Vha0hhc2hTZXQuaDoKKwog MjAyMS0xMC0xMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFNjcm9sbCBUbyBUZXh0IEZyYWdtZW50IGRpcmVjdGl2ZSBwYXJzaW5nCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggYTg4OWQ1OGY1ODkyZTJiNmFiOTAwYzFhMzljNDliYzRmYTkzM2JiNC4uMjc5Zjg1ZTU2 Zjk3OWFhNGQ4MjRiYzQxYTFiYTBhMzA3YjZiZTY3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTEwLTE0ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmVtb3ZlIHN0ZDo6aXRlcmF0b3IgdXNhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnRJdGVyYXRvci5oOgorICAgICAg ICAqIGRvbS9TaW1wbGVSYW5nZS5oOgorICAgICAgICAqIHBsYXRmb3JtL1RpbWVyLmNwcDoKKwog MjAyMS0xMC0xNCAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSB1c2VsZXNzIGlzQ29ubmVjdGVkKCkgY2hlY2sgZnJvbSBIVE1MRGlhbG9nRWxlbWVudDo6Y2xv c2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvSGFzaEl0ZXJhdG9ycy5oIGIvU291cmNl L1dURi93dGYvSGFzaEl0ZXJhdG9ycy5oCmluZGV4IGE3YmFjYjJlZGNiYjRjNzNmODA2YWVjNjBj MjBkNzk2Yjg1MjQ5MDQuLjZhYTAyMWE1NDkxYzU5YTY3OTY3MTk3ZWYyOThjYWRiOGJjYTk2ZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hhc2hJdGVyYXRvcnMuaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9IYXNoSXRlcmF0b3JzLmgKQEAgLTQwLDcgKzQwLDE0IEBAIG5hbWVzcGFjZSBXVEYg ewogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIFZhbHVlVHlw ZT4gc3RydWN0IEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyOwogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIFZhbHVlVHlwZT4gc3RydWN0IEhhc2hUYWJs ZUl0ZXJhdG9yQWRhcHRlcjsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUs IHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVD b25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwg TWFwcGVkVHlwZT4+IDogcHVibGljIHN0ZDo6aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9y X3RhZywgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+LCBzdGQ6OnB0cmRpZmZfdCwg Y29uc3QgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+KiwgY29uc3QgS2V5VmFsdWVQ YWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+Jj4geworICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hU YWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBI YXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8 S2V5VHlwZSwgTWFwcGVkVHlwZT4+IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHVzaW5nIGl0ZXJh dG9yX2NhdGVnb3J5ID0gc3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZzsKKyAgICAgICAgdXNpbmcg dmFsdWVfdHlwZSA9IEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPjsKKyAgICAgICAg dXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90OworICAgICAgICB1c2luZyBwb2ludGVy ID0gY29uc3QgdmFsdWVfdHlwZSo7CisgICAgICAgIHVzaW5nIHJlZmVyZW5jZSA9IGNvbnN0IHZh bHVlX3R5cGUmOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgdHlwZWRlZiBLZXlWYWx1ZVBhaXI8 S2V5VHlwZSwgTWFwcGVkVHlwZT4gVmFsdWVUeXBlOwogICAgIHB1YmxpYzoKQEAgLTYzLDcgKzcw LDE0IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0eXBlbmFtZSBIYXNoVGFibGVUeXBlOjpj b25zdF9pdGVyYXRvciBtX2ltcGw7CiAgICAgfTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhh c2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVj dCBIYXNoVGFibGVJdGVyYXRvckFkYXB0ZXI8SGFzaFRhYmxlVHlwZSwgS2V5VmFsdWVQYWlyPEtl eVR5cGUsIE1hcHBlZFR5cGU+PiA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9p dGVyYXRvcl90YWcsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPiwgc3RkOjpwdHJk aWZmX3QsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPiosIEtleVZhbHVlUGFpcjxL ZXlUeXBlLCBNYXBwZWRUeXBlPiY+IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVU eXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRh YmxlSXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBN YXBwZWRUeXBlPj4geworICAgIHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdv cnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2YWx1ZV90eXBl ID0gS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+OworICAgICAgICB1c2luZyBkaWZm ZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50ZXIgPSB2YWx1ZV90 eXBlKjsKKyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7CisKICAgICBwcml2 YXRlOgogICAgICAgICB0eXBlZGVmIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPiBW YWx1ZVR5cGU7CiAgICAgcHVibGljOgpAQCAtOTEsNyArMTA1LDE0IEBAIG5hbWVzcGFjZSBXVEYg ewogICAgICAgICB0eXBlbmFtZSBIYXNoVGFibGVUeXBlOjppdGVyYXRvciBtX2ltcGw7CiAgICAg fTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5 cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEtleXNJdGVyYXRv ciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIEtleVR5 cGUsIHN0ZDo6cHRyZGlmZl90LCBjb25zdCBLZXlUeXBlKiwgY29uc3QgS2V5VHlwZSY+IHsKKyAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBl bmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRhYmxlQ29uc3RLZXlzSXRlcmF0b3IgeworICAg IHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRf aXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2YWx1ZV90eXBlID0gS2V5VHlwZTsKKyAgICAg ICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90OworICAgICAgICB1c2luZyBwb2lu dGVyID0gY29uc3QgdmFsdWVfdHlwZSo7CisgICAgICAgIHVzaW5nIHJlZmVyZW5jZSA9IGNvbnN0 IHZhbHVlX3R5cGUmOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgdHlwZWRlZiBIYXNoVGFibGVD b25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwg TWFwcGVkVHlwZT4+IENvbnN0SXRlcmF0b3I7CiAKQEAgLTEwOCw3ICsxMjksMTQgQEAgbmFtZXNw YWNlIFdURiB7CiAgICAgICAgIENvbnN0SXRlcmF0b3IgbV9pbXBsOwogICAgIH07CiAKLSAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFt ZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRhYmxlQ29uc3RWYWx1ZXNJdGVyYXRvciA6IHB1Ymxp YyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIE1hcHBlZFR5cGUsIHN0 ZDo6cHRyZGlmZl90LCBjb25zdCBNYXBwZWRUeXBlKiwgY29uc3QgTWFwcGVkVHlwZSY+IHsKKyAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBl bmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRhYmxlQ29uc3RWYWx1ZXNJdGVyYXRvciB7Cisg ICAgcHVibGljOgorICAgICAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2Fy ZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBNYXBwZWRUeXBlOwor ICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5n IHBvaW50ZXIgPSBjb25zdCB2YWx1ZV90eXBlKjsKKyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0g Y29uc3QgdmFsdWVfdHlwZSY7CisKICAgICBwcml2YXRlOgogICAgICAgICB0eXBlZGVmIEhhc2hU YWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlU eXBlLCBNYXBwZWRUeXBlPj4gQ29uc3RJdGVyYXRvcjsKIApAQCAtMTI1LDcgKzE1MywxNCBAQCBu YW1lc3BhY2UgV1RGIHsKICAgICAgICAgQ29uc3RJdGVyYXRvciBtX2ltcGw7CiAgICAgfTsKIAot ICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5 cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVLZXlzSXRlcmF0b3IgOiBwdWJsaWMg c3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnLCBLZXlUeXBlLCBzdGQ6OnB0 cmRpZmZfdCwgS2V5VHlwZSosIEtleVR5cGUmPiB7CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFz aFRhYmxlVHlwZSwgdHlwZW5hbWUgS2V5VHlwZSwgdHlwZW5hbWUgTWFwcGVkVHlwZT4gc3RydWN0 IEhhc2hUYWJsZUtleXNJdGVyYXRvciB7CisgICAgcHVibGljOgorICAgICAgICB1c2luZyBpdGVy YXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5n IHZhbHVlX3R5cGUgPSBLZXlUeXBlOworICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBw dHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICAgICAg dXNpbmcgcmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7CisKICAgICBwcml2YXRlOgogICAgICAgICB0 eXBlZGVmIEhhc2hUYWJsZUl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBh aXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IEl0ZXJhdG9yOwogICAgICAgICB0eXBlZGVmIEhhc2hU YWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlU eXBlLCBNYXBwZWRUeXBlPj4gQ29uc3RJdGVyYXRvcjsKQEAgLTE0OCw3ICsxODMsMTQgQEAgbmFt ZXNwYWNlIFdURiB7CiAgICAgICAgIEl0ZXJhdG9yIG1faW1wbDsKICAgICB9OwogCi0gICAgdGVt cGxhdGU8dHlwZW5hbWUgSGFzaFRhYmxlVHlwZSwgdHlwZW5hbWUgS2V5VHlwZSwgdHlwZW5hbWUg TWFwcGVkVHlwZT4gc3RydWN0IEhhc2hUYWJsZVZhbHVlc0l0ZXJhdG9yIDogcHVibGljIHN0ZDo6 aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZywgTWFwcGVkVHlwZSwgc3RkOjpwdHJk aWZmX3QsIE1hcHBlZFR5cGUqLCBNYXBwZWRUeXBlJj4geworICAgIHRlbXBsYXRlPHR5cGVuYW1l IEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0 cnVjdCBIYXNoVGFibGVWYWx1ZXNJdGVyYXRvciB7CisgICAgcHVibGljOgorICAgICAgICB1c2lu ZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAg IHVzaW5nIHZhbHVlX3R5cGUgPSBNYXBwZWRUeXBlOworICAgICAgICB1c2luZyBkaWZmZXJlbmNl X3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsK KyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7CisKICAgICBwcml2YXRlOgog ICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBL ZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IEl0ZXJhdG9yOwogICAgICAgICB0eXBl ZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5cGUsIEtleVZhbHVl UGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPj4gQ29uc3RJdGVyYXRvcjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oIGIvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKaW5k ZXggNTE1MGVkNmEyNjc2M2ZhOTI5YTlkNDg1ZDFjZGI0Yzk1YjdkZjJkMi4uMmU2NDQxNGY3YWMw NjNiMWM5YzJmYjU0MDdmZjFhYjVjZjlkMzU0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv SGFzaFRhYmxlLmgKKysrIGIvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKQEAgLTEwOSw4ICsx MDksMTUgQEAgREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lERU5USUZJRVIoSGFzaFRhYmxl KTsKICAgICB0eXBlZGVmIGVudW0geyBIYXNoSXRlbUtub3duR29vZCB9IEhhc2hJdGVtS25vd25H b29kVGFnOwogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaFRhYmxlLCB0eXBlbmFtZSBLZXks IHR5cGVuYW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRyYWN0b3IsIHR5cGVuYW1lIEhhc2hGdW5jdGlv bnMsIHR5cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUgS2V5VHJhaXRzPgotICAgIGNsYXNzIEhhc2hU YWJsZUNvbnN0SXRlcmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRl cmF0b3JfdGFnLCBWYWx1ZSwgc3RkOjpwdHJkaWZmX3QsIGNvbnN0IFZhbHVlKiwgY29uc3QgVmFs dWUmPiB7CisgICAgY2xhc3MgSGFzaFRhYmxlQ29uc3RJdGVyYXRvciB7CiAgICAgICAgIFdURl9N QUtFX0ZBU1RfQUxMT0NBVEVEOworICAgIHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0b3Jf Y2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2YWx1 ZV90eXBlID0gVmFsdWU7CisgICAgICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZf dDsKKyAgICAgICAgdXNpbmcgcG9pbnRlciA9IGNvbnN0IHZhbHVlX3R5cGUqOworICAgICAgICB1 c2luZyByZWZlcmVuY2UgPSBjb25zdCB2YWx1ZV90eXBlJjsKKwogICAgIHByaXZhdGU6CiAgICAg ICAgIHVzaW5nIEhhc2hUYWJsZVR5cGUgPSBIYXNoVGFibGU7CiAgICAgICAgIHR5cGVkZWYgSGFz aFRhYmxlSXRlcmF0b3I8SGFzaFRhYmxlVHlwZSwgS2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNo RnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz4gaXRlcmF0b3I7CkBAIC0yNDYsOCArMjUzLDE1 IEBAIERFQ0xBUkVfQUxMT0NBVE9SX1dJVEhfSEVBUF9JREVOVElGSUVSKEhhc2hUYWJsZSk7CiAg ICAgfTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZSwgdHlwZW5hbWUgS2V5LCB0 eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25z LCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtleVRyYWl0cz4KLSAgICBjbGFzcyBIYXNoVGFi bGVJdGVyYXRvciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90 YWcsIFZhbHVlLCBzdGQ6OnB0cmRpZmZfdCwgVmFsdWUqLCBWYWx1ZSY+IHsKKyAgICBjbGFzcyBI YXNoVGFibGVJdGVyYXRvciB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworICAg IHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRf aXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2YWx1ZV90eXBlID0gVmFsdWU7CisgICAgICAg IHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRl ciA9IHZhbHVlX3R5cGUqOworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBlJjsK KwogICAgIHByaXZhdGU6CiAgICAgICAgIHVzaW5nIEhhc2hUYWJsZVR5cGUgPSBIYXNoVGFibGU7 CiAgICAgICAgIHR5cGVkZWYgSGFzaFRhYmxlSXRlcmF0b3I8SGFzaFRhYmxlVHlwZSwgS2V5LCBW YWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz4gaXRlcmF0 b3I7CkBAIC0xNTY2LDcgKzE1ODAsMTMgQEAgREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lE RU5USUZJRVIoSGFzaFRhYmxlKTsKIAogICAgIC8vIGl0ZXJhdG9yIGFkYXB0ZXJzCiAKLSAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBWYWx1ZVR5cGU+IHN0cnVj dCBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0 ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIFZhbHVlVHlwZSwgc3RkOjpwdHJkaWZmX3QsIGNvbnN0 IFZhbHVlVHlwZSosIGNvbnN0IFZhbHVlVHlwZSY+IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBI YXNoVGFibGVUeXBlLCB0eXBlbmFtZSBWYWx1ZVR5cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEl0 ZXJhdG9yQWRhcHRlciB7CisgICAgICAgIHVzaW5nIGl0ZXJhdG9yX2NhdGVnb3J5ID0gc3RkOjpm b3J3YXJkX2l0ZXJhdG9yX3RhZzsKKyAgICAgICAgdXNpbmcgdmFsdWVfdHlwZSA9IFZhbHVlVHlw ZTsKKyAgICAgICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90OworICAgICAgICB1 c2luZyBwb2ludGVyID0gY29uc3QgdmFsdWVfdHlwZSo7CisgICAgICAgIHVzaW5nIHJlZmVyZW5j ZSA9IGNvbnN0IHZhbHVlX3R5cGUmOworCiAgICAgICAgIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JB ZGFwdGVyKCkge30KICAgICAgICAgSGFzaFRhYmxlQ29uc3RJdGVyYXRvckFkYXB0ZXIoY29uc3Qg dHlwZW5hbWUgSGFzaFRhYmxlVHlwZTo6Y29uc3RfaXRlcmF0b3ImIGltcGwpIDogbV9pbXBsKGlt cGwpIHt9CiAKQEAgLTE1ODAsNyArMTYwMCwxMyBAQCBERUNMQVJFX0FMTE9DQVRPUl9XSVRIX0hF QVBfSURFTlRJRklFUihIYXNoVGFibGUpOwogICAgICAgICB0eXBlbmFtZSBIYXNoVGFibGVUeXBl Ojpjb25zdF9pdGVyYXRvciBtX2ltcGw7CiAgICAgfTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1l IEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIFZhbHVlVHlwZT4gc3RydWN0IEhhc2hUYWJsZUl0ZXJh dG9yQWRhcHRlciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90 YWcsIFZhbHVlVHlwZSwgc3RkOjpwdHJkaWZmX3QsIFZhbHVlVHlwZSosIFZhbHVlVHlwZSY+IHsK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBWYWx1ZVR5cGU+ IHN0cnVjdCBIYXNoVGFibGVJdGVyYXRvckFkYXB0ZXIgeworICAgICAgICB1c2luZyBpdGVyYXRv cl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZh bHVlX3R5cGUgPSBWYWx1ZVR5cGU7CisgICAgICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0 cmRpZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRlciA9IHZhbHVlX3R5cGUqOworICAgICAgICB1 c2luZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBlJjsKKwogICAgICAgICBIYXNoVGFibGVJdGVyYXRv ckFkYXB0ZXIoKSB7fQogICAgICAgICBIYXNoVGFibGVJdGVyYXRvckFkYXB0ZXIoY29uc3QgdHlw ZW5hbWUgSGFzaFRhYmxlVHlwZTo6aXRlcmF0b3ImIGltcGwpIDogbV9pbXBsKGltcGwpIHt9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1dlYWtIYXNoTWFwLmggYi9Tb3VyY2UvV1RGL3d0 Zi9XZWFrSGFzaE1hcC5oCmluZGV4IGMzNmYzNWQ3MTJhMTEyZGI3MWE4NTViNGNiMWFhNDdiNWYx Yjg5YTAuLjEzMTg4NTdlMTE1NzA2NWFiNmMwYjkyNmYwMDEyZjVhZjljMWM4NTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XVEYvd3RmL1dlYWtIYXNoTWFwLmgKKysrIGIvU291cmNlL1dURi93dGYvV2Vh a0hhc2hNYXAuaApAQCAtNzIsNyArNzIsMTQgQEAgY2xhc3MgV2Vha0hhc2hNYXAgZmluYWwgewog ICAgIH07CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgTWFwVHlwZSwgdHlwZW5hbWUgSXRlcmF0 b3JUeXBlLCB0eXBlbmFtZSBJdGVyYXRvclBlZWtQdHJUeXBlLCB0eXBlbmFtZSBJdGVyYXRvclBl ZWtUeXBlPgotICAgIGNsYXNzIFdlYWtIYXNoTWFwSXRlcmF0b3JCYXNlIDogcHVibGljIHN0ZDo6 aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZywgSXRlcmF0b3JQZWVrVHlwZSwgc3Rk OjpwdHJkaWZmX3QsIEl0ZXJhdG9yUGVla1B0clR5cGUsIEl0ZXJhdG9yUGVla1R5cGU+IHsKKyAg ICBjbGFzcyBXZWFrSGFzaE1hcEl0ZXJhdG9yQmFzZSB7CisgICAgcHVibGljOgorICAgICAgICB1 c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAg ICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBJdGVyYXRvclBlZWtUeXBlOworICAgICAgICB1c2luZyBk aWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50ZXIgPSBJdGVy YXRvclBlZWtQdHJUeXBlOworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSBJdGVyYXRvclBlZWtU eXBlOworCiAgICAgcHJvdGVjdGVkOgogICAgICAgICBXZWFrSGFzaE1hcEl0ZXJhdG9yQmFzZShN YXBUeXBlJiB3ZWFrSGFzaE1hcCwgSXRlcmF0b3JUeXBlIHBvc2l0aW9uKQogICAgICAgICAgICAg OiBtX3dlYWtIYXNoTWFwIHsgd2Vha0hhc2hNYXAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvV2Vha0hhc2hTZXQuaCBiL1NvdXJjZS9XVEYvd3RmL1dlYWtIYXNoU2V0LmgKaW5kZXggOTlj MjM4ZGNiNThiYjFjMDQ0OTIyYzlmNDA5MmZiY2E2M2UxZjdlZi4uMjA2ZDE0MWNhNGY2NDRkYjBl YTJlNjA0YWEyNDQ0OGJkN2VjOTgyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvV2Vha0hh c2hTZXQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9XZWFrSGFzaFNldC5oCkBAIC0zOCw3ICszOCwx NCBAQCBjbGFzcyBXZWFrSGFzaFNldCBmaW5hbCB7CiAgICAgdHlwZWRlZiBIYXNoU2V0PFJlZjxX ZWFrUHRySW1wbDxDb3VudGVyPj4+IFdlYWtQdHJJbXBsU2V0OwogICAgIHR5cGVkZWYgdHlwZW5h bWUgV2Vha1B0ckltcGxTZXQ6OkFkZFJlc3VsdCBBZGRSZXN1bHQ7CiAKLSAgICBjbGFzcyBXZWFr SGFzaFNldENvbnN0SXRlcmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRf aXRlcmF0b3JfdGFnLCBULCBzdGQ6OnB0cmRpZmZfdCwgY29uc3QgVCosIGNvbnN0IFQmPiB7Cisg ICAgY2xhc3MgV2Vha0hhc2hTZXRDb25zdEl0ZXJhdG9yIHsKKyAgICBwdWJsaWM6CisgICAgICAg IHVzaW5nIGl0ZXJhdG9yX2NhdGVnb3J5ID0gc3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZzsKKyAg ICAgICAgdXNpbmcgdmFsdWVfdHlwZSA9IFQ7CisgICAgICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlw ZSA9IHB0cmRpZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRlciA9IGNvbnN0IHZhbHVlX3R5cGUq OworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSBjb25zdCB2YWx1ZV90eXBlJjsKKwogICAgIHBy aXZhdGU6CiAgICAgICAgIFdlYWtIYXNoU2V0Q29uc3RJdGVyYXRvcihjb25zdCBXZWFrUHRySW1w bFNldCYgc2V0LCB0eXBlbmFtZSBXZWFrUHRySW1wbFNldDo6Y29uc3RfaXRlcmF0b3IgcG9zaXRp b24pCiAgICAgICAgICAgICA6IG1fcG9zaXRpb24ocG9zaXRpb24pLCBtX2VuZFBvc2l0aW9uKHNl dC5lbmQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50SXRlcmF0b3Iu aCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50SXRlcmF0b3IuaAppbmRleCBhZmQwOGIzZjhj MTViM2Q2ZTA0OGZlMGNkMjg2ODJmM2MzYThkOGY3Li40YTVhZWIwYzM4NzkxZDFiMDU0M2FhMzFm NTUxMTg4OTlmZTVkYTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudEl0 ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRJdGVyYXRvci5oCkBAIC0z NSw4ICszNSwxNCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUg RWxlbWVudFR5cGU+Ci1jbGFzcyBFbGVtZW50SXRlcmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRv cjxzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnLCBFbGVtZW50VHlwZT4geworY2xhc3MgRWxlbWVu dEl0ZXJhdG9yIHsKIHB1YmxpYzoKKyAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6 Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgdXNpbmcgdmFsdWVfdHlwZSA9IEVsZW1lbnRUeXBl OworICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZfdDsKKyAgICB1c2luZyBwb2lu dGVyID0gdmFsdWVfdHlwZSo7CisgICAgdXNpbmcgcmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7CisK ICAgICBFbGVtZW50SXRlcmF0b3IoKSA9IGRlZmF1bHQ7CiAKICAgICBFbGVtZW50VHlwZSYgb3Bl cmF0b3IqKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFu Z2UuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVSYW5nZS5oCmluZGV4IGEzNjg5ZDBmMGIx MjczZDZlMzNiNDA3ODIyNzAzMWUzYWViNDlkNTguLjAyNWFjODc1NDdhYWJjOTFiY2MxNjExZDdi NjUzNTg3NTkzNmJkOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVSYW5n ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVSYW5nZS5oCkBAIC0xMDUsOCArMTA1 LDE0IEBAIFdFQkNPUkVfRVhQT1JUIGJvb2wgY29udGFpbnNDcm9zc2luZ0RvY3VtZW50Qm91bmRh cmllcyhjb25zdCBTaW1wbGVSYW5nZSYsIE5vZGUmCiAKIC8vIEZJWE1FOiBFbmQgb2YgZnVuY3Rp b25zIHRoYXQgYXJlIGRlcHJlY2F0ZWQgc2luY2UgdGhleSBzaWxlbnRseSBkZWZhdWx0IHRvIENv bXBvc2VkVHJlZS4KIAotY2xhc3MgSW50ZXJzZWN0aW5nTm9kZUl0ZXJhdG9yIDogcHVibGljIHN0 ZDo6aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZywgTm9kZT4geworY2xhc3MgSW50 ZXJzZWN0aW5nTm9kZUl0ZXJhdG9yIHsKIHB1YmxpYzoKKyAgICB1c2luZyBpdGVyYXRvcl9jYXRl Z29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgdXNpbmcgdmFsdWVfdHlwZSA9 IE5vZGU7CisgICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90OworICAgIHVzaW5n IHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICB1c2luZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBl JjsKKwogICAgIEludGVyc2VjdGluZ05vZGVJdGVyYXRvcihjb25zdCBTaW1wbGVSYW5nZSYpOwog CiAgICAgZW51bSBRdWlya0ZsYWcgeyBEZXByZWNhdGVkWmVyb09mZnNldFN0YXJ0UXVpcmsgfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RpbWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1RpbWVyLmNwcAppbmRleCBmMDczNDhmODA4ZDdmMDMzNWRhODk2ZjVl NjQwMGViMTNmZWY4OTdiLi41NjA0M2VkZWE3N2UxYzRkYWMwYTNlY2U1ZDNhNmI4YTBiMjI4NzJh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9UaW1lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuY3BwCkBAIC0xNTEsOCArMTUxLDE0IEBAIGlubGlu ZSB2b2lkIHN3YXAoVGltZXJIZWFwUmVmZXJlbmNlIGEsIFRpbWVySGVhcFJlZmVyZW5jZSBiKQog CiAvLyBDbGFzcyB0byByZXByZXNlbnQgaXRlcmF0b3JzIGluIHRoZSBoZWFwIHdoZW4gY2FsbGlu ZyB0aGUgc3RhbmRhcmQgbGlicmFyeSBoZWFwIGFsZ29yaXRobXMuCiAvLyBVc2VzIGEgY3VzdG9t IHBvaW50ZXIgYW5kIHJlZmVyZW5jZSB0eXBlIHRoYXQgdXBkYXRlIGluZGljZXMgZm9yIHBvaW50 ZXJzIGluIHRoZSBoZWFwLgotY2xhc3MgVGltZXJIZWFwSXRlcmF0b3IgOiBwdWJsaWMgc3RkOjpp dGVyYXRvcjxzdGQ6OnJhbmRvbV9hY2Nlc3NfaXRlcmF0b3JfdGFnLCBSZWZQdHI8VGhyZWFkVGlt ZXJIZWFwSXRlbT4sIHB0cmRpZmZfdCwgVGltZXJIZWFwUG9pbnRlciwgVGltZXJIZWFwUmVmZXJl bmNlPiB7CitjbGFzcyBUaW1lckhlYXBJdGVyYXRvciB7CiBwdWJsaWM6CisgICAgdXNpbmcgaXRl cmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OnJhbmRvbV9hY2Nlc3NfaXRlcmF0b3JfdGFnOworICAgIHVz aW5nIHZhbHVlX3R5cGUgPSBSZWZQdHI8VGhyZWFkVGltZXJIZWFwSXRlbT47CisgICAgdXNpbmcg ZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90OworICAgIHVzaW5nIHBvaW50ZXIgPSBUaW1lckhl YXBQb2ludGVyOworICAgIHVzaW5nIHJlZmVyZW5jZSA9IFRpbWVySGVhcFJlZmVyZW5jZTsKKwog ICAgIGV4cGxpY2l0IFRpbWVySGVhcEl0ZXJhdG9yKFJlZlB0cjxUaHJlYWRUaW1lckhlYXBJdGVt PiogcG9pbnRlcikgOiBtX3BvaW50ZXIocG9pbnRlcikgeyBjaGVja0NvbnNpc3RlbmN5KCk7IH0K IAogICAgIFRpbWVySGVhcEl0ZXJhdG9yJiBvcGVyYXRvcisrKCkgeyBjaGVja0NvbnNpc3RlbmN5 KCk7ICsrbV9wb2ludGVyOyBjaGVja0NvbnNpc3RlbmN5KCk7IHJldHVybiAqdGhpczsgfQo= 441196 2021-10-14 02:38:06 -0700 2021-10-14 09:39:47 -0700 Patch bug-231728-20211014023805.patch text/plain 17219 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM0MjRmY2Y2MWI3ODNhZjM3YjI3NzJi ZWI4NTAxY2FiNjMzMjdmYTAuLmMwNTdiMjZlMmZlMGM1MWQ5ZDQ5NWFjYzAzZWNmY2E3Y2M5ODU2 MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTAtMTQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc3RkOjppdGVyYXRvciB1c2FnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNzI4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc3RkOjppdGVyYXRv cjw+IGlzIGRlcHJlY2F0ZWQgYW5kIGRlZmluaW5nIDUgdHlwZSBhbGlhc2VzIGlzIGVuY291cmFn ZWRbMV0uCisgICAgICAgIFdpdGggbmV3IGNsYW5nLCB1c2luZyBzdGQ6Oml0ZXJhdG9yPD4gY2F1 c2VzIGNvbXBpbGUgZXJyb3IgYmVjYXVzZSBvZiBkZXByZWNhdGlvbiB3YXJuaW5ncy4KKyAgICAg ICAgVGhpcyBwYXRjaCByZW1vdmVzIHN0ZDo6aXRlcmF0b3IgdXNhZ2UuCisKKyAgICAgICAgWzFd OiBodHRwczovL3d3dy5mbHVlbnRjcHAuY29tLzIwMTgvMDUvMDgvc3RkLWl0ZXJhdG9yLWRlcHJl Y2F0ZWQvCisKKyAgICAgICAgKiB3dGYvSGFzaEl0ZXJhdG9ycy5oOgorICAgICAgICAoV1RGOjog Y29uc3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHd0Zi9IYXNoVGFibGUuaDoKKyAgICAg ICAgKiB3dGYvV2Vha0hhc2hNYXAuaDoKKyAgICAgICAgKiB3dGYvV2Vha0hhc2hTZXQuaDoKKwog MjAyMS0xMC0xMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFNjcm9sbCBUbyBUZXh0IEZyYWdtZW50IGRpcmVjdGl2ZSBwYXJzaW5nCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggYTg4OWQ1OGY1ODkyZTJiNmFiOTAwYzFhMzljNDliYzRmYTkzM2JiNC4uOGY3ZjAxYWUz ZGE2MmVmMzA2MmUyMTBkNTc0YTJjMmE1Y2E3MjM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTEwLTE0ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmVtb3ZlIHN0ZDo6aXRlcmF0b3IgdXNhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnRJdGVyYXRvci5oOgorICAgICAg ICAqIGRvbS9TaW1wbGVSYW5nZS5oOgorICAgICAgICAqIHBsYXRmb3JtL1RpbWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlRpbWVyQmFzZTo6aGVhcERlY3JlYXNlS2V5KToKKyAgICAgICAgKFdl YkNvcmU6OlRpbWVyQmFzZTo6aGVhcFBvcE1pbik6CisgICAgICAgIChXZWJDb3JlOjpUaW1lckJh c2U6OmhlYXBEZWxldGVOdWxsTWluKToKKwogMjAyMS0xMC0xNCAgVGltIE5ndXllbiAgPG50aW1A YXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1c2VsZXNzIGlzQ29ubmVjdGVkKCkgY2hlY2sg ZnJvbSBIVE1MRGlhbG9nRWxlbWVudDo6Y2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvSGFzaEl0ZXJhdG9ycy5oIGIvU291cmNlL1dURi93dGYvSGFzaEl0ZXJhdG9ycy5oCmluZGV4 IGE3YmFjYjJlZGNiYjRjNzNmODA2YWVjNjBjMjBkNzk2Yjg1MjQ5MDQuLjZhYTAyMWE1NDkxYzU5 YTY3OTY3MTk3ZWYyOThjYWRiOGJjYTk2ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hh c2hJdGVyYXRvcnMuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9IYXNoSXRlcmF0b3JzLmgKQEAgLTQw LDcgKzQwLDE0IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hU YWJsZVR5cGUsIHR5cGVuYW1lIFZhbHVlVHlwZT4gc3RydWN0IEhhc2hUYWJsZUNvbnN0SXRlcmF0 b3JBZGFwdGVyOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1l IFZhbHVlVHlwZT4gc3RydWN0IEhhc2hUYWJsZUl0ZXJhdG9yQWRhcHRlcjsKIAotICAgIHRlbXBs YXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1h cHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVU eXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IDogcHVibGljIHN0ZDo6aXRl cmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZywgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1h cHBlZFR5cGU+LCBzdGQ6OnB0cmRpZmZfdCwgY29uc3QgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1h cHBlZFR5cGU+KiwgY29uc3QgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+Jj4gewor ICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5 cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlcjxI YXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IHsKKyAgICBw dWJsaWM6CisgICAgICAgIHVzaW5nIGl0ZXJhdG9yX2NhdGVnb3J5ID0gc3RkOjpmb3J3YXJkX2l0 ZXJhdG9yX3RhZzsKKyAgICAgICAgdXNpbmcgdmFsdWVfdHlwZSA9IEtleVZhbHVlUGFpcjxLZXlU eXBlLCBNYXBwZWRUeXBlPjsKKyAgICAgICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlm Zl90OworICAgICAgICB1c2luZyBwb2ludGVyID0gY29uc3QgdmFsdWVfdHlwZSo7CisgICAgICAg IHVzaW5nIHJlZmVyZW5jZSA9IGNvbnN0IHZhbHVlX3R5cGUmOworCiAgICAgcHJpdmF0ZToKICAg ICAgICAgdHlwZWRlZiBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4gVmFsdWVUeXBl OwogICAgIHB1YmxpYzoKQEAgLTYzLDcgKzcwLDE0IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAg ICB0eXBlbmFtZSBIYXNoVGFibGVUeXBlOjpjb25zdF9pdGVyYXRvciBtX2ltcGw7CiAgICAgfTsK IAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUs IHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVJdGVyYXRvckFkYXB0ZXI8SGFz aFRhYmxlVHlwZSwgS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBlZFR5cGU+PiA6IHB1YmxpYyBz dGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIEtleVZhbHVlUGFpcjxLZXlU eXBlLCBNYXBwZWRUeXBlPiwgc3RkOjpwdHJkaWZmX3QsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBN YXBwZWRUeXBlPiosIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPiY+IHsKKyAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFt ZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRhYmxlSXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5 cGUsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPj4geworICAgIHB1YmxpYzoKKyAg ICAgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFn OworICAgICAgICB1c2luZyB2YWx1ZV90eXBlID0gS2V5VmFsdWVQYWlyPEtleVR5cGUsIE1hcHBl ZFR5cGU+OworICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAg ICAgIHVzaW5nIHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICAgICAgdXNpbmcgcmVmZXJlbmNl ID0gdmFsdWVfdHlwZSY7CisKICAgICBwcml2YXRlOgogICAgICAgICB0eXBlZGVmIEtleVZhbHVl UGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPiBWYWx1ZVR5cGU7CiAgICAgcHVibGljOgpAQCAtOTEs NyArMTA1LDE0IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0eXBlbmFtZSBIYXNoVGFibGVU eXBlOjppdGVyYXRvciBtX2ltcGw7CiAgICAgfTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhh c2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVj dCBIYXNoVGFibGVDb25zdEtleXNJdGVyYXRvciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6 Zm9yd2FyZF9pdGVyYXRvcl90YWcsIEtleVR5cGUsIHN0ZDo6cHRyZGlmZl90LCBjb25zdCBLZXlU eXBlKiwgY29uc3QgS2V5VHlwZSY+IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVU eXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRh YmxlQ29uc3RLZXlzSXRlcmF0b3IgeworICAgIHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0 b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2 YWx1ZV90eXBlID0gS2V5VHlwZTsKKyAgICAgICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRy ZGlmZl90OworICAgICAgICB1c2luZyBwb2ludGVyID0gY29uc3QgdmFsdWVfdHlwZSo7CisgICAg ICAgIHVzaW5nIHJlZmVyZW5jZSA9IGNvbnN0IHZhbHVlX3R5cGUmOworCiAgICAgcHJpdmF0ZToK ICAgICAgICAgdHlwZWRlZiBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVU eXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IENvbnN0SXRlcmF0b3I7CiAK QEAgLTEwOCw3ICsxMjksMTQgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIENvbnN0SXRlcmF0 b3IgbV9pbXBsOwogICAgIH07CiAKLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBl LCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRhYmxl Q29uc3RWYWx1ZXNJdGVyYXRvciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9p dGVyYXRvcl90YWcsIE1hcHBlZFR5cGUsIHN0ZDo6cHRyZGlmZl90LCBjb25zdCBNYXBwZWRUeXBl KiwgY29uc3QgTWFwcGVkVHlwZSY+IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVU eXBlLCB0eXBlbmFtZSBLZXlUeXBlLCB0eXBlbmFtZSBNYXBwZWRUeXBlPiBzdHJ1Y3QgSGFzaFRh YmxlQ29uc3RWYWx1ZXNJdGVyYXRvciB7CisgICAgcHVibGljOgorICAgICAgICB1c2luZyBpdGVy YXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5n IHZhbHVlX3R5cGUgPSBNYXBwZWRUeXBlOworICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUg PSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50ZXIgPSBjb25zdCB2YWx1ZV90eXBlKjsK KyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0gY29uc3QgdmFsdWVfdHlwZSY7CisKICAgICBwcml2 YXRlOgogICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hU YWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPj4gQ29uc3RJdGVyYXRv cjsKIApAQCAtMTI1LDcgKzE1MywxNCBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgQ29uc3RJ dGVyYXRvciBtX2ltcGw7CiAgICAgfTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJs ZVR5cGUsIHR5cGVuYW1lIEtleVR5cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNo VGFibGVLZXlzSXRlcmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRl cmF0b3JfdGFnLCBLZXlUeXBlLCBzdGQ6OnB0cmRpZmZfdCwgS2V5VHlwZSosIEtleVR5cGUmPiB7 CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaFRhYmxlVHlwZSwgdHlwZW5hbWUgS2V5VHlwZSwg dHlwZW5hbWUgTWFwcGVkVHlwZT4gc3RydWN0IEhhc2hUYWJsZUtleXNJdGVyYXRvciB7CisgICAg cHVibGljOgorICAgICAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9p dGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBLZXlUeXBlOworICAgICAg ICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVzaW5nIHBvaW50 ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7 CisKICAgICBwcml2YXRlOgogICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUl0ZXJhdG9yQWRhcHRl cjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlwZT4+IEl0ZXJh dG9yOwogICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hU YWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPj4gQ29uc3RJdGVyYXRv cjsKQEAgLTE0OCw3ICsxODMsMTQgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIEl0ZXJhdG9y IG1faW1wbDsKICAgICB9OwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaFRhYmxlVHlwZSwg dHlwZW5hbWUgS2V5VHlwZSwgdHlwZW5hbWUgTWFwcGVkVHlwZT4gc3RydWN0IEhhc2hUYWJsZVZh bHVlc0l0ZXJhdG9yIDogcHVibGljIHN0ZDo6aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9y X3RhZywgTWFwcGVkVHlwZSwgc3RkOjpwdHJkaWZmX3QsIE1hcHBlZFR5cGUqLCBNYXBwZWRUeXBl Jj4geworICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIEtleVR5 cGUsIHR5cGVuYW1lIE1hcHBlZFR5cGU+IHN0cnVjdCBIYXNoVGFibGVWYWx1ZXNJdGVyYXRvciB7 CisgICAgcHVibGljOgorICAgICAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9y d2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBNYXBwZWRUeXBl OworICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7CisgICAgICAgIHVz aW5nIHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICAgICAgdXNpbmcgcmVmZXJlbmNlID0gdmFs dWVfdHlwZSY7CisKICAgICBwcml2YXRlOgogICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUl0ZXJh dG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBLZXlWYWx1ZVBhaXI8S2V5VHlwZSwgTWFwcGVkVHlw ZT4+IEl0ZXJhdG9yOwogICAgICAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFw dGVyPEhhc2hUYWJsZVR5cGUsIEtleVZhbHVlUGFpcjxLZXlUeXBlLCBNYXBwZWRUeXBlPj4gQ29u c3RJdGVyYXRvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oIGIvU291 cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKaW5kZXggNTE1MGVkNmEyNjc2M2ZhOTI5YTlkNDg1ZDFj ZGI0Yzk1YjdkZjJkMi4uMmU2NDQxNGY3YWMwNjNiMWM5YzJmYjU0MDdmZjFhYjVjZjlkMzU0MSAx MDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKKysrIGIvU291cmNlL1dURi93 dGYvSGFzaFRhYmxlLmgKQEAgLTEwOSw4ICsxMDksMTUgQEAgREVDTEFSRV9BTExPQ0FUT1JfV0lU SF9IRUFQX0lERU5USUZJRVIoSGFzaFRhYmxlKTsKICAgICB0eXBlZGVmIGVudW0geyBIYXNoSXRl bUtub3duR29vZCB9IEhhc2hJdGVtS25vd25Hb29kVGFnOwogCiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgSGFzaFRhYmxlLCB0eXBlbmFtZSBLZXksIHR5cGVuYW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRy YWN0b3IsIHR5cGVuYW1lIEhhc2hGdW5jdGlvbnMsIHR5cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUg S2V5VHJhaXRzPgotICAgIGNsYXNzIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3IgOiBwdWJsaWMgc3Rk OjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnLCBWYWx1ZSwgc3RkOjpwdHJkaWZm X3QsIGNvbnN0IFZhbHVlKiwgY29uc3QgVmFsdWUmPiB7CisgICAgY2xhc3MgSGFzaFRhYmxlQ29u c3RJdGVyYXRvciB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworICAgIHB1Ymxp YzoKKyAgICAgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0 b3JfdGFnOworICAgICAgICB1c2luZyB2YWx1ZV90eXBlID0gVmFsdWU7CisgICAgICAgIHVzaW5n IGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRlciA9IGNv bnN0IHZhbHVlX3R5cGUqOworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSBjb25zdCB2YWx1ZV90 eXBlJjsKKwogICAgIHByaXZhdGU6CiAgICAgICAgIHVzaW5nIEhhc2hUYWJsZVR5cGUgPSBIYXNo VGFibGU7CiAgICAgICAgIHR5cGVkZWYgSGFzaFRhYmxlSXRlcmF0b3I8SGFzaFRhYmxlVHlwZSwg S2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz4g aXRlcmF0b3I7CkBAIC0yNDYsOCArMjUzLDE1IEBAIERFQ0xBUkVfQUxMT0NBVE9SX1dJVEhfSEVB UF9JREVOVElGSUVSKEhhc2hUYWJsZSk7CiAgICAgfTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IEhhc2hUYWJsZSwgdHlwZW5hbWUgS2V5LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFj dG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtl eVRyYWl0cz4KLSAgICBjbGFzcyBIYXNoVGFibGVJdGVyYXRvciA6IHB1YmxpYyBzdGQ6Oml0ZXJh dG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIFZhbHVlLCBzdGQ6OnB0cmRpZmZfdCwgVmFs dWUqLCBWYWx1ZSY+IHsKKyAgICBjbGFzcyBIYXNoVGFibGVJdGVyYXRvciB7CiAgICAgICAgIFdU Rl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworICAgIHB1YmxpYzoKKyAgICAgICAgdXNpbmcgaXRlcmF0 b3JfY2F0ZWdvcnkgPSBzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnOworICAgICAgICB1c2luZyB2 YWx1ZV90eXBlID0gVmFsdWU7CisgICAgICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRp ZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRlciA9IHZhbHVlX3R5cGUqOworICAgICAgICB1c2lu ZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBlJjsKKwogICAgIHByaXZhdGU6CiAgICAgICAgIHVzaW5n IEhhc2hUYWJsZVR5cGUgPSBIYXNoVGFibGU7CiAgICAgICAgIHR5cGVkZWYgSGFzaFRhYmxlSXRl cmF0b3I8SGFzaFRhYmxlVHlwZSwgS2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25z LCBUcmFpdHMsIEtleVRyYWl0cz4gaXRlcmF0b3I7CkBAIC0xNTY2LDcgKzE1ODAsMTMgQEAgREVD TEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lERU5USUZJRVIoSGFzaFRhYmxlKTsKIAogICAgIC8v IGl0ZXJhdG9yIGFkYXB0ZXJzCiAKLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBl LCB0eXBlbmFtZSBWYWx1ZVR5cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRl ciA6IHB1YmxpYyBzdGQ6Oml0ZXJhdG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIFZhbHVl VHlwZSwgc3RkOjpwdHJkaWZmX3QsIGNvbnN0IFZhbHVlVHlwZSosIGNvbnN0IFZhbHVlVHlwZSY+ IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFibGVUeXBlLCB0eXBlbmFtZSBWYWx1ZVR5 cGU+IHN0cnVjdCBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlciB7CisgICAgICAgIHVzaW5n IGl0ZXJhdG9yX2NhdGVnb3J5ID0gc3RkOjpmb3J3YXJkX2l0ZXJhdG9yX3RhZzsKKyAgICAgICAg dXNpbmcgdmFsdWVfdHlwZSA9IFZhbHVlVHlwZTsKKyAgICAgICAgdXNpbmcgZGlmZmVyZW5jZV90 eXBlID0gcHRyZGlmZl90OworICAgICAgICB1c2luZyBwb2ludGVyID0gY29uc3QgdmFsdWVfdHlw ZSo7CisgICAgICAgIHVzaW5nIHJlZmVyZW5jZSA9IGNvbnN0IHZhbHVlX3R5cGUmOworCiAgICAg ICAgIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyKCkge30KICAgICAgICAgSGFzaFRhYmxl Q29uc3RJdGVyYXRvckFkYXB0ZXIoY29uc3QgdHlwZW5hbWUgSGFzaFRhYmxlVHlwZTo6Y29uc3Rf aXRlcmF0b3ImIGltcGwpIDogbV9pbXBsKGltcGwpIHt9CiAKQEAgLTE1ODAsNyArMTYwMCwxMyBA QCBERUNMQVJFX0FMTE9DQVRPUl9XSVRIX0hFQVBfSURFTlRJRklFUihIYXNoVGFibGUpOwogICAg ICAgICB0eXBlbmFtZSBIYXNoVGFibGVUeXBlOjpjb25zdF9pdGVyYXRvciBtX2ltcGw7CiAgICAg fTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUYWJsZVR5cGUsIHR5cGVuYW1lIFZhbHVl VHlwZT4gc3RydWN0IEhhc2hUYWJsZUl0ZXJhdG9yQWRhcHRlciA6IHB1YmxpYyBzdGQ6Oml0ZXJh dG9yPHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWcsIFZhbHVlVHlwZSwgc3RkOjpwdHJkaWZmX3Qs IFZhbHVlVHlwZSosIFZhbHVlVHlwZSY+IHsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVGFi bGVUeXBlLCB0eXBlbmFtZSBWYWx1ZVR5cGU+IHN0cnVjdCBIYXNoVGFibGVJdGVyYXRvckFkYXB0 ZXIgeworICAgICAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVy YXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBWYWx1ZVR5cGU7CisgICAgICAg IHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZfdDsKKyAgICAgICAgdXNpbmcgcG9pbnRl ciA9IHZhbHVlX3R5cGUqOworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBlJjsK KwogICAgICAgICBIYXNoVGFibGVJdGVyYXRvckFkYXB0ZXIoKSB7fQogICAgICAgICBIYXNoVGFi bGVJdGVyYXRvckFkYXB0ZXIoY29uc3QgdHlwZW5hbWUgSGFzaFRhYmxlVHlwZTo6aXRlcmF0b3Im IGltcGwpIDogbV9pbXBsKGltcGwpIHt9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1dl YWtIYXNoTWFwLmggYi9Tb3VyY2UvV1RGL3d0Zi9XZWFrSGFzaE1hcC5oCmluZGV4IGMzNmYzNWQ3 MTJhMTEyZGI3MWE4NTViNGNiMWFhNDdiNWYxYjg5YTAuLjEzMTg4NTdlMTE1NzA2NWFiNmMwYjky NmYwMDEyZjVhZjljMWM4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1dlYWtIYXNoTWFw LmgKKysrIGIvU291cmNlL1dURi93dGYvV2Vha0hhc2hNYXAuaApAQCAtNzIsNyArNzIsMTQgQEAg Y2xhc3MgV2Vha0hhc2hNYXAgZmluYWwgewogICAgIH07CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5h bWUgTWFwVHlwZSwgdHlwZW5hbWUgSXRlcmF0b3JUeXBlLCB0eXBlbmFtZSBJdGVyYXRvclBlZWtQ dHJUeXBlLCB0eXBlbmFtZSBJdGVyYXRvclBlZWtUeXBlPgotICAgIGNsYXNzIFdlYWtIYXNoTWFw SXRlcmF0b3JCYXNlIDogcHVibGljIHN0ZDo6aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJhdG9y X3RhZywgSXRlcmF0b3JQZWVrVHlwZSwgc3RkOjpwdHJkaWZmX3QsIEl0ZXJhdG9yUGVla1B0clR5 cGUsIEl0ZXJhdG9yUGVla1R5cGU+IHsKKyAgICBjbGFzcyBXZWFrSGFzaE1hcEl0ZXJhdG9yQmFz ZSB7CisgICAgcHVibGljOgorICAgICAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6 Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBJdGVyYXRv clBlZWtUeXBlOworICAgICAgICB1c2luZyBkaWZmZXJlbmNlX3R5cGUgPSBwdHJkaWZmX3Q7Cisg ICAgICAgIHVzaW5nIHBvaW50ZXIgPSBJdGVyYXRvclBlZWtQdHJUeXBlOworICAgICAgICB1c2lu ZyByZWZlcmVuY2UgPSBJdGVyYXRvclBlZWtUeXBlOworCiAgICAgcHJvdGVjdGVkOgogICAgICAg ICBXZWFrSGFzaE1hcEl0ZXJhdG9yQmFzZShNYXBUeXBlJiB3ZWFrSGFzaE1hcCwgSXRlcmF0b3JU eXBlIHBvc2l0aW9uKQogICAgICAgICAgICAgOiBtX3dlYWtIYXNoTWFwIHsgd2Vha0hhc2hNYXAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvV2Vha0hhc2hTZXQuaCBiL1NvdXJjZS9XVEYv d3RmL1dlYWtIYXNoU2V0LmgKaW5kZXggOTljMjM4ZGNiNThiYjFjMDQ0OTIyYzlmNDA5MmZiY2E2 M2UxZjdlZi4uMjA2ZDE0MWNhNGY2NDRkYjBlYTJlNjA0YWEyNDQ0OGJkN2VjOTgyMyAxMDA2NDQK LS0tIGEvU291cmNlL1dURi93dGYvV2Vha0hhc2hTZXQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9X ZWFrSGFzaFNldC5oCkBAIC0zOCw3ICszOCwxNCBAQCBjbGFzcyBXZWFrSGFzaFNldCBmaW5hbCB7 CiAgICAgdHlwZWRlZiBIYXNoU2V0PFJlZjxXZWFrUHRySW1wbDxDb3VudGVyPj4+IFdlYWtQdHJJ bXBsU2V0OwogICAgIHR5cGVkZWYgdHlwZW5hbWUgV2Vha1B0ckltcGxTZXQ6OkFkZFJlc3VsdCBB ZGRSZXN1bHQ7CiAKLSAgICBjbGFzcyBXZWFrSGFzaFNldENvbnN0SXRlcmF0b3IgOiBwdWJsaWMg c3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnLCBULCBzdGQ6OnB0cmRpZmZf dCwgY29uc3QgVCosIGNvbnN0IFQmPiB7CisgICAgY2xhc3MgV2Vha0hhc2hTZXRDb25zdEl0ZXJh dG9yIHsKKyAgICBwdWJsaWM6CisgICAgICAgIHVzaW5nIGl0ZXJhdG9yX2NhdGVnb3J5ID0gc3Rk Ojpmb3J3YXJkX2l0ZXJhdG9yX3RhZzsKKyAgICAgICAgdXNpbmcgdmFsdWVfdHlwZSA9IFQ7Cisg ICAgICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9IHB0cmRpZmZfdDsKKyAgICAgICAgdXNpbmcg cG9pbnRlciA9IGNvbnN0IHZhbHVlX3R5cGUqOworICAgICAgICB1c2luZyByZWZlcmVuY2UgPSBj b25zdCB2YWx1ZV90eXBlJjsKKwogICAgIHByaXZhdGU6CiAgICAgICAgIFdlYWtIYXNoU2V0Q29u c3RJdGVyYXRvcihjb25zdCBXZWFrUHRySW1wbFNldCYgc2V0LCB0eXBlbmFtZSBXZWFrUHRySW1w bFNldDo6Y29uc3RfaXRlcmF0b3IgcG9zaXRpb24pCiAgICAgICAgICAgICA6IG1fcG9zaXRpb24o cG9zaXRpb24pLCBtX2VuZFBvc2l0aW9uKHNldC5lbmQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50SXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 SXRlcmF0b3IuaAppbmRleCBhZmQwOGIzZjhjMTViM2Q2ZTA0OGZlMGNkMjg2ODJmM2MzYThkOGY3 Li40YTVhZWIwYzM4NzkxZDFiMDU0M2FhMzFmNTUxMTg4OTlmZTVkYTM0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudEl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnRJdGVyYXRvci5oCkBAIC0zNSw4ICszNSwxNCBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgRWxlbWVudFR5cGU+Ci1jbGFzcyBFbGVtZW50SXRl cmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRvcjxzdGQ6OmZvcndhcmRfaXRlcmF0b3JfdGFnLCBF bGVtZW50VHlwZT4geworY2xhc3MgRWxlbWVudEl0ZXJhdG9yIHsKIHB1YmxpYzoKKyAgICB1c2lu ZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90YWc7CisgICAgdXNp bmcgdmFsdWVfdHlwZSA9IEVsZW1lbnRUeXBlOworICAgIHVzaW5nIGRpZmZlcmVuY2VfdHlwZSA9 IHB0cmRpZmZfdDsKKyAgICB1c2luZyBwb2ludGVyID0gdmFsdWVfdHlwZSo7CisgICAgdXNpbmcg cmVmZXJlbmNlID0gdmFsdWVfdHlwZSY7CisKICAgICBFbGVtZW50SXRlcmF0b3IoKSA9IGRlZmF1 bHQ7CiAKICAgICBFbGVtZW50VHlwZSYgb3BlcmF0b3IqKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFuZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1w bGVSYW5nZS5oCmluZGV4IGEzNjg5ZDBmMGIxMjczZDZlMzNiNDA3ODIyNzAzMWUzYWViNDlkNTgu LjAyNWFjODc1NDdhYWJjOTFiY2MxNjExZDdiNjUzNTg3NTkzNmJkOTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVSYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9T aW1wbGVSYW5nZS5oCkBAIC0xMDUsOCArMTA1LDE0IEBAIFdFQkNPUkVfRVhQT1JUIGJvb2wgY29u dGFpbnNDcm9zc2luZ0RvY3VtZW50Qm91bmRhcmllcyhjb25zdCBTaW1wbGVSYW5nZSYsIE5vZGUm CiAKIC8vIEZJWE1FOiBFbmQgb2YgZnVuY3Rpb25zIHRoYXQgYXJlIGRlcHJlY2F0ZWQgc2luY2Ug dGhleSBzaWxlbnRseSBkZWZhdWx0IHRvIENvbXBvc2VkVHJlZS4KIAotY2xhc3MgSW50ZXJzZWN0 aW5nTm9kZUl0ZXJhdG9yIDogcHVibGljIHN0ZDo6aXRlcmF0b3I8c3RkOjpmb3J3YXJkX2l0ZXJh dG9yX3RhZywgTm9kZT4geworY2xhc3MgSW50ZXJzZWN0aW5nTm9kZUl0ZXJhdG9yIHsKIHB1Ymxp YzoKKyAgICB1c2luZyBpdGVyYXRvcl9jYXRlZ29yeSA9IHN0ZDo6Zm9yd2FyZF9pdGVyYXRvcl90 YWc7CisgICAgdXNpbmcgdmFsdWVfdHlwZSA9IE5vZGU7CisgICAgdXNpbmcgZGlmZmVyZW5jZV90 eXBlID0gcHRyZGlmZl90OworICAgIHVzaW5nIHBvaW50ZXIgPSB2YWx1ZV90eXBlKjsKKyAgICB1 c2luZyByZWZlcmVuY2UgPSB2YWx1ZV90eXBlJjsKKwogICAgIEludGVyc2VjdGluZ05vZGVJdGVy YXRvcihjb25zdCBTaW1wbGVSYW5nZSYpOwogCiAgICAgZW51bSBRdWlya0ZsYWcgeyBEZXByZWNh dGVkWmVyb09mZnNldFN0YXJ0UXVpcmsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1RpbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RpbWVyLmNwcAppbmRl eCBmMDczNDhmODA4ZDdmMDMzNWRhODk2ZjVlNjQwMGViMTNmZWY4OTdiLi44OWNhYTgyZGY3ZTIx NzY4Nzc3NzA0MjBhZTI5ZDFiZjViMjZlYThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9UaW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuY3Bw CkBAIC0xNTEsOCArMTUxLDE0IEBAIGlubGluZSB2b2lkIHN3YXAoVGltZXJIZWFwUmVmZXJlbmNl IGEsIFRpbWVySGVhcFJlZmVyZW5jZSBiKQogCiAvLyBDbGFzcyB0byByZXByZXNlbnQgaXRlcmF0 b3JzIGluIHRoZSBoZWFwIHdoZW4gY2FsbGluZyB0aGUgc3RhbmRhcmQgbGlicmFyeSBoZWFwIGFs Z29yaXRobXMuCiAvLyBVc2VzIGEgY3VzdG9tIHBvaW50ZXIgYW5kIHJlZmVyZW5jZSB0eXBlIHRo YXQgdXBkYXRlIGluZGljZXMgZm9yIHBvaW50ZXJzIGluIHRoZSBoZWFwLgotY2xhc3MgVGltZXJI ZWFwSXRlcmF0b3IgOiBwdWJsaWMgc3RkOjppdGVyYXRvcjxzdGQ6OnJhbmRvbV9hY2Nlc3NfaXRl cmF0b3JfdGFnLCBSZWZQdHI8VGhyZWFkVGltZXJIZWFwSXRlbT4sIHB0cmRpZmZfdCwgVGltZXJI ZWFwUG9pbnRlciwgVGltZXJIZWFwUmVmZXJlbmNlPiB7CitjbGFzcyBUaW1lckhlYXBJdGVyYXRv ciB7CiBwdWJsaWM6CisgICAgdXNpbmcgaXRlcmF0b3JfY2F0ZWdvcnkgPSBzdGQ6OnJhbmRvbV9h Y2Nlc3NfaXRlcmF0b3JfdGFnOworICAgIHVzaW5nIHZhbHVlX3R5cGUgPSBSZWZQdHI8VGhyZWFk VGltZXJIZWFwSXRlbT47CisgICAgdXNpbmcgZGlmZmVyZW5jZV90eXBlID0gcHRyZGlmZl90Owor ICAgIHVzaW5nIHBvaW50ZXIgPSBUaW1lckhlYXBQb2ludGVyOworICAgIHVzaW5nIHJlZmVyZW5j ZSA9IFRpbWVySGVhcFJlZmVyZW5jZTsKKwogICAgIGV4cGxpY2l0IFRpbWVySGVhcEl0ZXJhdG9y KFJlZlB0cjxUaHJlYWRUaW1lckhlYXBJdGVtPiogcG9pbnRlcikgOiBtX3BvaW50ZXIocG9pbnRl cikgeyBjaGVja0NvbnNpc3RlbmN5KCk7IH0KIAogICAgIFRpbWVySGVhcEl0ZXJhdG9yJiBvcGVy YXRvcisrKCkgeyBjaGVja0NvbnNpc3RlbmN5KCk7ICsrbV9wb2ludGVyOyBjaGVja0NvbnNpc3Rl bmN5KCk7IHJldHVybiAqdGhpczsgfQpAQCAtMzI3LDcgKzMzMyw3IEBAIHZvaWQgVGltZXJCYXNl OjpoZWFwRGVjcmVhc2VLZXkoKQogICAgIEFTU0VSVChtX2hlYXBJdGVtKTsKICAgICBjaGVja0hl YXBJbmRleCgpOwogICAgIGF1dG8qIGhlYXBEYXRhID0gbV9oZWFwSXRlbS0+dGltZXJIZWFwKCku ZGF0YSgpOwotICAgIHB1c2hfaGVhcChUaW1lckhlYXBJdGVyYXRvcihoZWFwRGF0YSksIFRpbWVy SGVhcEl0ZXJhdG9yKGhlYXBEYXRhICsgbV9oZWFwSXRlbS0+aGVhcEluZGV4KCkgKyAxKSwgVGlt ZXJIZWFwTGVzc1RoYW5GdW5jdGlvbigpKTsKKyAgICBzdGQ6OnB1c2hfaGVhcChUaW1lckhlYXBJ dGVyYXRvcihoZWFwRGF0YSksIFRpbWVySGVhcEl0ZXJhdG9yKGhlYXBEYXRhICsgbV9oZWFwSXRl bS0+aGVhcEluZGV4KCkgKyAxKSwgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbigpKTsKICAgICBj aGVja0hlYXBJbmRleCgpOwogfQogCkBAIC0zODEsNyArMzg3LDcgQEAgdm9pZCBUaW1lckJhc2U6 OmhlYXBQb3BNaW4oKQogICAgIGNoZWNrSGVhcEluZGV4KCk7CiAgICAgYXV0byYgaGVhcCA9IG1f aGVhcEl0ZW0tPnRpbWVySGVhcCgpOwogICAgIGF1dG8qIGhlYXBEYXRhID0gaGVhcC5kYXRhKCk7 Ci0gICAgcG9wX2hlYXAoVGltZXJIZWFwSXRlcmF0b3IoaGVhcERhdGEpLCBUaW1lckhlYXBJdGVy YXRvcihoZWFwRGF0YSArIGhlYXAuc2l6ZSgpKSwgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbigp KTsKKyAgICBzdGQ6OnBvcF9oZWFwKFRpbWVySGVhcEl0ZXJhdG9yKGhlYXBEYXRhKSwgVGltZXJI ZWFwSXRlcmF0b3IoaGVhcERhdGEgKyBoZWFwLnNpemUoKSksIFRpbWVySGVhcExlc3NUaGFuRnVu Y3Rpb24oKSk7CiAgICAgY2hlY2tIZWFwSW5kZXgoKTsKICAgICBBU1NFUlQobV9oZWFwSXRlbSA9 PSBtX2hlYXBJdGVtLT50aW1lckhlYXAoKS5sYXN0KCkpOwogfQpAQCAtMzkxLDcgKzM5Nyw3IEBA IHZvaWQgVGltZXJCYXNlOjpoZWFwRGVsZXRlTnVsbE1pbihUaHJlYWRUaW1lckhlYXAmIGhlYXAp CiAgICAgUkVMRUFTRV9BU1NFUlQoIWhlYXAuZmlyc3QoKS0+aGFzVGltZXIoKSk7CiAgICAgaGVh cC5maXJzdCgpLT50aW1lID0gLU1vbm90b25pY1RpbWU6OmluZmluaXR5KCk7CiAgICAgYXV0byog aGVhcERhdGEgPSBoZWFwLmRhdGEoKTsKLSAgICBwb3BfaGVhcChUaW1lckhlYXBJdGVyYXRvciho ZWFwRGF0YSksIFRpbWVySGVhcEl0ZXJhdG9yKGhlYXBEYXRhICsgaGVhcC5zaXplKCkpLCBUaW1l ckhlYXBMZXNzVGhhbkZ1bmN0aW9uKCkpOworICAgIHN0ZDo6cG9wX2hlYXAoVGltZXJIZWFwSXRl cmF0b3IoaGVhcERhdGEpLCBUaW1lckhlYXBJdGVyYXRvcihoZWFwRGF0YSArIGhlYXAuc2l6ZSgp KSwgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbigpKTsKICAgICBoZWFwLnJlbW92ZUxhc3QoKTsK IH0KIAo=