217511 2020-10-09 03:42:22 -0700 [LFC][Integration] Rename iterator path variant structs for consistency 2020-10-09 04:25:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1696170 0 koivisto 2020-10-09 03:42:22 -0700 ModernPath -> RunIteratorModernPath LegacyPath -> RunIteratorLegacyPath ModernLinePath -> LineIteratorModernPath LegacyLinePath -> LineIteratorLegacyPath 1696171 1 410928 koivisto 2020-10-09 03:46:46 -0700 Created attachment 410928 patch 1696176 2 ews-feeder 2020-10-09 04:24:45 -0700 Committed r268252: <https://trac.webkit.org/changeset/268252> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410928. 1696177 3 webkit-bug-importer 2020-10-09 04:25:18 -0700 <rdar://problem/70134513> 410928 2020-10-09 03:46:46 -0700 2020-10-09 04:24:45 -0700 patch path-variant-rename.patch text/plain 23190 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYzYzNDg2NjRmMzguLjhhMzA1NTUyZDMzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzMSBAQAorMjAyMC0xMC0wOSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIFJlbmFtZSBpdGVyYXRvciBwYXRoIHZh cmlhbnQgc3RydWN0cyBmb3IgY29uc2lzdGVuY3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzUxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1vZGVyblBhdGggLT4gUnVuSXRlcmF0b3JNb2Rlcm5QYXRo CisgICAgICAgIExlZ2FjeVBhdGggLT4gUnVuSXRlcmF0b3JMZWdhY3lQYXRoCisgICAgICAgIE1v ZGVybkxpbmVQYXRoIC0+IExpbmVJdGVyYXRvck1vZGVyblBhdGgKKyAgICAgICAgTGVnYWN5TGlu ZVBhdGggLT4gTGluZUl0ZXJhdG9yTGVnYWN5UGF0aAorCisgICAgICAgICogbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3IpOgorICAgICAg ICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvckxlZ2Fj eVBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRlcmF0 b3JMZWdhY3lQYXRoOjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoOjpvcGVyYXRvcj09IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lMaW5lUGF0 aDo6TGVnYWN5TGluZVBhdGgpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OkxlZ2FjeUxpbmVQYXRoOjp0b3AgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeUxpbmVQYXRoOjpib3R0b20gY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeUxp bmVQYXRoOjpzZWxlY3Rpb25Ub3AgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeUxpbmVQYXRoOjpzZWxlY3Rpb25Ub3BGb3JIaXRUZXN0 aW5nIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpMZWdhY3lMaW5lUGF0aDo6c2VsZWN0aW9uQm90dG9tIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lMaW5lUGF0aDo6dHJhdmVyc2VO ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdh Y3lMaW5lUGF0aDo6dHJhdmVyc2VQcmV2aW91cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGVnYWN5TGluZVBhdGg6Om9wZXJhdG9yPT0gY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeUxpbmVQ YXRoOjphdEVuZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6TGVnYWN5TGluZVBhdGg6OnNldEF0RW5kKTogRGVsZXRlZC4KKyAgICAgICAgKiBs YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRo Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUl0ZXJhdG9yTW9k ZXJuUGF0aDo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6b3BlcmF0b3I9PSBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuTGluZVBhdGg6Ok1v ZGVybkxpbmVQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpNb2Rlcm5MaW5lUGF0aDo6dG9wIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5MaW5lUGF0aDo6Ym90dG9tIGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5MaW5lUGF0 aDo6c2VsZWN0aW9uVG9wIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpNb2Rlcm5MaW5lUGF0aDo6c2VsZWN0aW9uVG9wRm9ySGl0VGVzdGluZyBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9k ZXJuTGluZVBhdGg6OnNlbGVjdGlvbkJvdHRvbSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuTGluZVBhdGg6OnRyYXZlcnNlTmV4dCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuTGlu ZVBhdGg6OnRyYXZlcnNlUHJldmlvdXMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246Ok1vZGVybkxpbmVQYXRoOjpvcGVyYXRvcj09IGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5MaW5lUGF0aDo6 YXRFbmQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246Ok1vZGVybkxpbmVQYXRoOjpzZXRBdEVuZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuTGluZVBhdGg6OmxpbmVzIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5MaW5lUGF0aDo6 bGluZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6TGluZUxheW91dDo6dGV4dFJ1bnNGb3IgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnJ1bkZvciBjb25zdCk6CisgICAgICAg ICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OlJ1bkl0ZXJhdG9yOjpsaW5lIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpmaXJzdFRleHRSdW5G b3IpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmZpcnN0VGV4dFJ1bklu VGV4dE9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpydW5G b3IpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OlBhdGhSdW46Om1vZGVy blBhdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OlBhdGhS dW46OmxlZ2FjeVBhdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OlBhdGhSdW46Om1vZGVyblBhdGgpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OlBhdGhSdW46OmxlZ2FjeVBhdGgpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmg6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6UnVuSXRlcmF0b3I6OlJ1bkl0ZXJhdG9y KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVy YXRvckxlZ2FjeVBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpS dW5JdGVyYXRvckxlZ2FjeVBhdGg6OlJ1bkl0ZXJhdG9yTGVnYWN5UGF0aCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6UnVuSXRlcmF0b3JMZWdhY3lQYXRoOjpvcGVyYXRv cj09IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVy YXRvckxlZ2FjeVBhdGg6Om5leHRJbmxpbmVUZXh0Qm94SW5UZXh0T3JkZXIgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6OkxlZ2FjeVBhdGgp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBh dGg6OmlzVGV4dCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6TGVnYWN5UGF0aDo6cmVjdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGVnYWN5UGF0aDo6aXNIb3Jpem9udGFsIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRo OjpkaXJPdmVycmlkZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6TGVnYWN5UGF0aDo6aXNMaW5lQnJlYWsgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6OmJhc2VsaW5lIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdh Y3lQYXRoOjptaW5pbXVtQ2FyZXRPZmZzZXQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6Om1heGltdW1DYXJldE9mZnNldCBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGVn YWN5UGF0aDo6YmlkaUxldmVsIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjp1c2VMaW5lQnJlYWtCb3hSZW5kZXJUcmVlRHVt cFF1aXJrIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpMZWdhY3lQYXRoOjpoYXNIeXBoZW4gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6OnRleHQgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6OmxvY2Fs U3RhcnRPZmZzZXQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OkxlZ2FjeVBhdGg6OmxvY2FsRW5kT2Zmc2V0IGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjpsZW5ndGggY29u c3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2Fj eVBhdGg6Om9mZnNldEZvclBvc2l0aW9uIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjppc0xhc3RUZXh0UnVuT25MaW5lIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdh Y3lQYXRoOjppc0xhc3RUZXh0UnVuIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjpyZW5kZXJlciBjb25zdCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGVnYWN5UGF0aDo6dHJhdmVy c2VOZXh0VGV4dFJ1bik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6TGVnYWN5UGF0aDo6dHJhdmVyc2VOZXh0VGV4dFJ1bkluVGV4dE9yZGVyKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjp0cmF2 ZXJzZU5leHRPbkxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OkxlZ2FjeVBhdGg6OnRyYXZlcnNlUHJldmlvdXNPbkxpbmUpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxlZ2FjeVBhdGg6Om9wZXJhdG9yPT0g Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Okxl Z2FjeVBhdGg6OmF0RW5kIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjpzZXRBdEVuZCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGVnYWN5UGF0aDo6bGVnYWN5SW5saW5lQm94IGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdh Y3lQYXRoOjpyb290SW5saW5lQm94IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjppbmxpbmVUZXh0Qm94IGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMZWdhY3lQYXRoOjpu ZXh0SW5saW5lVGV4dEJveEluVGV4dE9yZGVyIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBs YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGgu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVyYXRvck1vZGVy blBhdGg6OlJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6UnVuSXRlcmF0b3JNb2Rlcm5QYXRoOjpvcGVyYXRvcj09IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpNb2Rlcm5QYXRo KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5Q YXRoOjppc1RleHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246Ok1vZGVyblBhdGg6OnJlY3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246Ok1vZGVyblBhdGg6OmJhc2VsaW5lIGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpp c0hvcml6b250YWwgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246Ok1vZGVyblBhdGg6OmRpck92ZXJyaWRlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjppc0xpbmVCcmVhayBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9k ZXJuUGF0aDo6bWluaW11bUNhcmV0T2Zmc2V0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjptYXhpbXVtQ2FyZXRPZmZzZXQg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Ok1v ZGVyblBhdGg6OmJpZGlMZXZlbCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6dXNlTGluZUJyZWFrQm94UmVuZGVyVHJlZUR1 bXBRdWlyayBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6TW9kZXJuUGF0aDo6aGFzSHlwaGVuIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjp0ZXh0IGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpsb2Nh bFN0YXJ0T2Zmc2V0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dElu dGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpsb2NhbEVuZE9mZnNldCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6bGVuZ3RoIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rl cm5QYXRoOjpvZmZzZXRGb3JQb3NpdGlvbiBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6aXNMYXN0VGV4dFJ1bk9uTGluZSBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9k ZXJuUGF0aDo6aXNMYXN0VGV4dFJ1biBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6cmVuZGVyZXIgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Ok1vZGVyblBhdGg6OnRyYXZl cnNlTmV4dFRleHRSdW4pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246Ok1vZGVyblBhdGg6OnRyYXZlcnNlTmV4dFRleHRSdW5JblRleHRPcmRlcik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6dHJh dmVyc2VOZXh0T25MaW5lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVn cmF0aW9uOjpNb2Rlcm5QYXRoOjp0cmF2ZXJzZVByZXZpb3VzT25MaW5lKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpvcGVyYXRvcj09 IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpN b2Rlcm5QYXRoOjphdEVuZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6c2V0QXRFbmQpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Ok1vZGVyblBhdGg6OmxlZ2FjeUlubGluZUJveCBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TW9k ZXJuUGF0aDo6cnVucyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6TW9kZXJuUGF0aDo6cnVuIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoOjpsaW5lIGNvbnN0KTogRGVsZXRl ZC4KKwogMjAyMC0xMC0wOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4K IAogICAgICAgICBOaWwtY2hlY2sgcmVzdWx0cyBvZiAtW0FWUGxheWVySXRlbVZpZGVvT3V0cHV0 IGluaXRXaXRoUGl4ZWxCdWZmZXJBdHRyaWJ1dGVzOl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvci5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0 ZXJhdG9yLmgKaW5kZXggNTNiMDFiNTM2MzYyLi40NWQ5Y2M5YWM2YmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVy YXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVJdGVyYXRvci5oCkBAIC00Miw5ICs0Miw5IEBAIGNsYXNzIFBhdGhMaW5lIHsK IHB1YmxpYzoKICAgICB1c2luZyBQYXRoVmFyaWFudCA9IFZhcmlhbnQ8CiAjaWYgRU5BQkxFKExB WU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgIE1vZGVybkxpbmVQYXRoLAorICAgICAg ICBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLAogI2VuZGlmCi0gICAgICAgIExlZ2FjeUxpbmVQYXRo CisgICAgICAgIExpbmVJdGVyYXRvckxlZ2FjeVBhdGgKICAgICA+OwogCiAgICAgUGF0aExpbmUo UGF0aFZhcmlhbnQmJik7CkBAIC02Myw3ICs2Myw3IEBAIHByb3RlY3RlZDoKIAogY2xhc3MgTGlu ZUl0ZXJhdG9yIHsKIHB1YmxpYzoKLSAgICBMaW5lSXRlcmF0b3IoKSA6IG1fbGluZShMZWdhY3lM aW5lUGF0aCB7IG51bGxwdHIgfSkgeyB9OworICAgIExpbmVJdGVyYXRvcigpIDogbV9saW5lKExp bmVJdGVyYXRvckxlZ2FjeVBhdGggeyBudWxscHRyIH0pIHsgfTsKICAgICBMaW5lSXRlcmF0b3Io UGF0aExpbmU6OlBhdGhWYXJpYW50JiYpOwogCiAgICAgTGluZUl0ZXJhdG9yJiBvcGVyYXRvcisr KCkgeyByZXR1cm4gdHJhdmVyc2VOZXh0KCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvckxlZ2FjeVBh dGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkxpbmVJdGVyYXRvckxlZ2FjeVBhdGguaAppbmRleCAxZjlmOTZiMGU3NGUuLmE3YjRhYjIwNjQx OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uTGluZUl0ZXJhdG9yTGVnYWN5UGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvckxlZ2FjeVBhdGgu aApAQCAtMzIsMTYgKzMyLDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNwYWNlIExh eW91dEludGVncmF0aW9uIHsKIAotY2xhc3MgTGVnYWN5TGluZVBhdGggeworY2xhc3MgTGluZUl0 ZXJhdG9yTGVnYWN5UGF0aCB7CiBwdWJsaWM6Ci0gICAgTGVnYWN5TGluZVBhdGgoY29uc3QgUm9v dElubGluZUJveCogcm9vdElubGluZUJveCkKKyAgICBMaW5lSXRlcmF0b3JMZWdhY3lQYXRoKGNv bnN0IFJvb3RJbmxpbmVCb3gqIHJvb3RJbmxpbmVCb3gpCiAgICAgICAgIDogbV9yb290SW5saW5l Qm94KHJvb3RJbmxpbmVCb3gpCiAgICAgewogICAgIH0KLSAgICBMZWdhY3lMaW5lUGF0aChMZWdh Y3lMaW5lUGF0aCYmKSA9IGRlZmF1bHQ7Ci0gICAgTGVnYWN5TGluZVBhdGgoY29uc3QgTGVnYWN5 TGluZVBhdGgmKSA9IGRlZmF1bHQ7Ci0gICAgTGVnYWN5TGluZVBhdGgmIG9wZXJhdG9yPShjb25z dCBMZWdhY3lMaW5lUGF0aCYpID0gZGVmYXVsdDsKLSAgICBMZWdhY3lMaW5lUGF0aCYgb3BlcmF0 b3I9KExlZ2FjeUxpbmVQYXRoJiYpID0gZGVmYXVsdDsKKyAgICBMaW5lSXRlcmF0b3JMZWdhY3lQ YXRoKExpbmVJdGVyYXRvckxlZ2FjeVBhdGgmJikgPSBkZWZhdWx0OworICAgIExpbmVJdGVyYXRv ckxlZ2FjeVBhdGgoY29uc3QgTGluZUl0ZXJhdG9yTGVnYWN5UGF0aCYpID0gZGVmYXVsdDsKKyAg ICBMaW5lSXRlcmF0b3JMZWdhY3lQYXRoJiBvcGVyYXRvcj0oY29uc3QgTGluZUl0ZXJhdG9yTGVn YWN5UGF0aCYpID0gZGVmYXVsdDsKKyAgICBMaW5lSXRlcmF0b3JMZWdhY3lQYXRoJiBvcGVyYXRv cj0oTGluZUl0ZXJhdG9yTGVnYWN5UGF0aCYmKSA9IGRlZmF1bHQ7CiAKICAgICBMYXlvdXRVbml0 IHRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZVRvcCgpOyB9CiAgICAg TGF5b3V0VW5pdCBib3R0b20oKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPmxpbmVC b3R0b20oKTsgfQpAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fcm9vdElubGlu ZUJveCA9IG1fcm9vdElubGluZUJveC0+cHJldlJvb3RCb3goKTsKICAgICB9CiAKLSAgICBib29s IG9wZXJhdG9yPT0oY29uc3QgTGVnYWN5TGluZVBhdGgmIG90aGVyKSBjb25zdCB7IHJldHVybiBt X3Jvb3RJbmxpbmVCb3ggPT0gb3RoZXIubV9yb290SW5saW5lQm94OyB9CisgICAgYm9vbCBvcGVy YXRvcj09KGNvbnN0IExpbmVJdGVyYXRvckxlZ2FjeVBhdGgmIG90aGVyKSBjb25zdCB7IHJldHVy biBtX3Jvb3RJbmxpbmVCb3ggPT0gb3RoZXIubV9yb290SW5saW5lQm94OyB9CiAKICAgICBib29s IGF0RW5kKCkgY29uc3QgeyByZXR1cm4gIW1fcm9vdElubGluZUJveDsgfQogICAgIHZvaWQgc2V0 QXRFbmQoKSB7IG1fcm9vdElubGluZUJveCA9IG51bGxwdHI7IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRv ck1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaAppbmRleCA5OWUzYmM1NzYxM2IuLmE4 NmJlMjVjOWJhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1v ZGVyblBhdGguaApAQCAtMzQsMTggKzM0LDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFt ZXNwYWNlIExheW91dEludGVncmF0aW9uIHsKIAotY2xhc3MgTW9kZXJuTGluZVBhdGggeworY2xh c3MgTGluZUl0ZXJhdG9yTW9kZXJuUGF0aCB7CiBwdWJsaWM6Ci0gICAgTW9kZXJuTGluZVBhdGgo Y29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgc2l6ZV90IGxpbmVJbmRleCkKKyAg ICBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoKGNvbnN0IElubGluZUNvbnRlbnQmIGlubGluZUNvbnRl bnQsIHNpemVfdCBsaW5lSW5kZXgpCiAgICAgICAgIDogbV9pbmxpbmVDb250ZW50KCZpbmxpbmVD b250ZW50KQogICAgICAgICAsIG1fbGluZUluZGV4KGxpbmVJbmRleCkKICAgICB7CiAgICAgICAg IEFTU0VSVChsaW5lSW5kZXggPD0gbGluZXMoKS5zaXplKCkpOwogICAgIH0KLSAgICBNb2Rlcm5M aW5lUGF0aChNb2Rlcm5MaW5lUGF0aCYmKSA9IGRlZmF1bHQ7Ci0gICAgTW9kZXJuTGluZVBhdGgo Y29uc3QgTW9kZXJuTGluZVBhdGgmKSA9IGRlZmF1bHQ7Ci0gICAgTW9kZXJuTGluZVBhdGgmIG9w ZXJhdG9yPShjb25zdCBNb2Rlcm5MaW5lUGF0aCYpID0gZGVmYXVsdDsKLSAgICBNb2Rlcm5MaW5l UGF0aCYgb3BlcmF0b3I9KE1vZGVybkxpbmVQYXRoJiYpID0gZGVmYXVsdDsKKyAgICBMaW5lSXRl cmF0b3JNb2Rlcm5QYXRoKExpbmVJdGVyYXRvck1vZGVyblBhdGgmJikgPSBkZWZhdWx0OworICAg IExpbmVJdGVyYXRvck1vZGVyblBhdGgoY29uc3QgTGluZUl0ZXJhdG9yTW9kZXJuUGF0aCYpID0g ZGVmYXVsdDsKKyAgICBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoJiBvcGVyYXRvcj0oY29uc3QgTGlu ZUl0ZXJhdG9yTW9kZXJuUGF0aCYpID0gZGVmYXVsdDsKKyAgICBMaW5lSXRlcmF0b3JNb2Rlcm5Q YXRoJiBvcGVyYXRvcj0oTGluZUl0ZXJhdG9yTW9kZXJuUGF0aCYmKSA9IGRlZmF1bHQ7CiAKICAg ICBMYXlvdXRVbml0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJv dW5kKGxpbmUoKS5yZWN0KCkueSgpKTsgfQogICAgIExheW91dFVuaXQgYm90dG9tKCkgY29uc3Qg eyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLnJlY3QoKS5tYXhZKCkp OyB9CkBAIC03Miw3ICs3Miw3IEBAIHB1YmxpYzoKICAgICAgICAgLS1tX2xpbmVJbmRleDsKICAg ICB9CiAKLSAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgTW9kZXJuTGluZVBhdGgmIG90aGVyKSBj b25zdCB7IHJldHVybiBtX2lubGluZUNvbnRlbnQgPT0gb3RoZXIubV9pbmxpbmVDb250ZW50ICYm IG1fbGluZUluZGV4ID09IG90aGVyLm1fbGluZUluZGV4OyB9CisgICAgYm9vbCBvcGVyYXRvcj09 KGNvbnN0IExpbmVJdGVyYXRvck1vZGVyblBhdGgmIG90aGVyKSBjb25zdCB7IHJldHVybiBtX2lu bGluZUNvbnRlbnQgPT0gb3RoZXIubV9pbmxpbmVDb250ZW50ICYmIG1fbGluZUluZGV4ID09IG90 aGVyLm1fbGluZUluZGV4OyB9CiAKICAgICBib29sIGF0RW5kKCkgY29uc3QgeyByZXR1cm4gbV9s aW5lSW5kZXggPT0gbGluZXMoKS5zaXplKCk7IH0KICAgICB2b2lkIHNldEF0RW5kKCkgeyBtX2xp bmVJbmRleCA9IGxpbmVzKCkuc2l6ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQu Y3BwCmluZGV4IDk0ZDAzZTg2MWU3YS4uMTBmNTY3Mzk1YmI2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmNwcApAQCAtMzEzLDcgKzMxMyw3IEBAIFRleHRSdW5JdGVyYXRvciBMaW5l TGF5b3V0Ojp0ZXh0UnVuc0Zvcihjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJUZXh0KSBjb25zdAog ICAgIGlmICghZmlyc3RJbmRleCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB7 IExheW91dEludGVncmF0aW9uOjpNb2Rlcm5QYXRoKCptX2lubGluZUNvbnRlbnQsICpmaXJzdElu ZGV4KSB9OworICAgIHJldHVybiB7IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCgqbV9pbmxpbmVDb250 ZW50LCAqZmlyc3RJbmRleCkgfTsKIH0KIAogUnVuSXRlcmF0b3IgTGluZUxheW91dDo6cnVuRm9y KGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRlckVsZW1lbnQpIGNvbnN0CkBAIC0zMjYsNyArMzI2 LDcgQEAgUnVuSXRlcmF0b3IgTGluZUxheW91dDo6cnVuRm9yKGNvbnN0IFJlbmRlckVsZW1lbnQm IHJlbmRlckVsZW1lbnQpIGNvbnN0CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2lubGlu ZUNvbnRlbnQtPnJ1bnMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgYXV0byYgcnVuID0gIG1faW5s aW5lQ29udGVudC0+cnVuc1tpXTsKICAgICAgICAgaWYgKCZydW4ubGF5b3V0Qm94KCkgPT0gbGF5 b3V0Qm94KQotICAgICAgICAgICAgcmV0dXJuIHsgTGF5b3V0SW50ZWdyYXRpb246Ok1vZGVyblBh dGgoKm1faW5saW5lQ29udGVudCwgaSkgfTsKKyAgICAgICAgICAgIHJldHVybiB7IFJ1bkl0ZXJh dG9yTW9kZXJuUGF0aCgqbV9pbmxpbmVDb250ZW50LCBpKSB9OwogICAgIH0KIAogICAgIHJldHVy biB7IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5jcHAKaW5kZXggZWRkZDA0OTY2 ODJjLi4zNjM0NGVjY2Q5MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5jcHAK QEAgLTg2LDEyICs4NiwxMiBAQCBMaW5lUnVuSXRlcmF0b3IgUnVuSXRlcmF0b3I6OnByZXZpb3Vz T25MaW5lSWdub3JpbmdMaW5lQnJlYWsoKSBjb25zdAogCiBMaW5lSXRlcmF0b3IgUnVuSXRlcmF0 b3I6OmxpbmUoKSBjb25zdAogewotICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcnVuLm1fcGF0 aFZhcmlhbnQsIFtdKGNvbnN0IExlZ2FjeVBhdGgmIHBhdGgpIHsKLSAgICAgICAgcmV0dXJuIExp bmVJdGVyYXRvcihMZWdhY3lMaW5lUGF0aCgmcGF0aC5yb290SW5saW5lQm94KCkpKTsKKyAgICBy ZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3J1bi5tX3BhdGhWYXJpYW50LCBbXShjb25zdCBSdW5JdGVy YXRvckxlZ2FjeVBhdGgmIHBhdGgpIHsKKyAgICAgICAgcmV0dXJuIExpbmVJdGVyYXRvcihMaW5l SXRlcmF0b3JMZWdhY3lQYXRoKCZwYXRoLnJvb3RJbmxpbmVCb3goKSkpOwogICAgIH0KICNpZiBF TkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICAsIFtdKGNvbnN0IE1vZGVyblBh dGgmIHBhdGgpIHsKLSAgICAgICAgcmV0dXJuIExpbmVJdGVyYXRvcihNb2Rlcm5MaW5lUGF0aCgq cGF0aC5tX2lubGluZUNvbnRlbnQsIHBhdGgucnVuKCkubGluZUluZGV4KCkpKTsKKyAgICAsIFtd KGNvbnN0IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCYgcGF0aCkgeworICAgICAgICByZXR1cm4gTGlu ZUl0ZXJhdG9yKExpbmVJdGVyYXRvck1vZGVyblBhdGgoKnBhdGgubV9pbmxpbmVDb250ZW50LCBw YXRoLnJ1bigpLmxpbmVJbmRleCgpKSk7CiAgICAgfQogI2VuZGlmCiAgICAgKTsKQEAgLTE3Nyw3 ICsxNzcsNyBAQCBUZXh0UnVuSXRlcmF0b3IgZmlyc3RUZXh0UnVuRm9yKGNvbnN0IFJlbmRlclRl eHQmIHRleHQpCiAgICAgfQogI2VuZGlmCiAKLSAgICByZXR1cm4geyBMZWdhY3lQYXRoIHsgdGV4 dC5maXJzdFRleHRCb3goKSB9IH07CisgICAgcmV0dXJuIHsgUnVuSXRlcmF0b3JMZWdhY3lQYXRo IHsgdGV4dC5maXJzdFRleHRCb3goKSB9IH07CiB9CiAKIFRleHRSdW5JdGVyYXRvciBmaXJzdFRl eHRSdW5JblRleHRPcmRlckZvcihjb25zdCBSZW5kZXJUZXh0JiB0ZXh0KQpAQCAtMTg4LDcgKzE4 OCw3IEBAIFRleHRSdW5JdGVyYXRvciBmaXJzdFRleHRSdW5JblRleHRPcmRlckZvcihjb25zdCBS ZW5kZXJUZXh0JiB0ZXh0KQogICAgICAgICAgICAgc29ydGVkVGV4dEJveGVzLmFwcGVuZCh0ZXh0 Qm94KTsKICAgICAgICAgc3RkOjpzb3J0KHNvcnRlZFRleHRCb3hlcy5iZWdpbigpLCBzb3J0ZWRU ZXh0Qm94ZXMuZW5kKCksIElubGluZVRleHRCb3g6OmNvbXBhcmVCeVN0YXJ0KTsKICAgICAgICAg YXV0byogZmlyc3QgPSBzb3J0ZWRUZXh0Qm94ZXNbMF07Ci0gICAgICAgIHJldHVybiB7IExlZ2Fj eVBhdGggeyBmaXJzdCwgV1RGTW92ZShzb3J0ZWRUZXh0Qm94ZXMpLCAwIH0gfTsKKyAgICAgICAg cmV0dXJuIHsgUnVuSXRlcmF0b3JMZWdhY3lQYXRoIHsgZmlyc3QsIFdURk1vdmUoc29ydGVkVGV4 dEJveGVzKSwgMCB9IH07CiAgICAgfQogCiAgICAgcmV0dXJuIGZpcnN0VGV4dFJ1bkZvcih0ZXh0 KTsKQEAgLTIwNyw3ICsyMDcsNyBAQCBSdW5JdGVyYXRvciBydW5Gb3IoY29uc3QgUmVuZGVyTGlu ZUJyZWFrJiByZW5kZXJFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuIGxheW91dEZvcm1hdHRp bmdDb250ZXh0TGluZUxheW91dC0+cnVuRm9yKHJlbmRlckVsZW1lbnQpOwogICAgIH0KICNlbmRp ZgotICAgIHJldHVybiB7IExlZ2FjeVBhdGgocmVuZGVyRWxlbWVudC5pbmxpbmVCb3hXcmFwcGVy KCkpIH07CisgICAgcmV0dXJuIHsgUnVuSXRlcmF0b3JMZWdhY3lQYXRoKHJlbmRlckVsZW1lbnQu aW5saW5lQm94V3JhcHBlcigpKSB9OwogfQogCiBSdW5JdGVyYXRvciBydW5Gb3IoY29uc3QgUmVu ZGVyQm94JiByZW5kZXJFbGVtZW50KQpAQCAtMjE4LDcgKzIxOCw3IEBAIFJ1bkl0ZXJhdG9yIHJ1 bkZvcihjb25zdCBSZW5kZXJCb3gmIHJlbmRlckVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4g bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LT5ydW5Gb3IocmVuZGVyRWxlbWVudCk7 CiAgICAgfQogI2VuZGlmCi0gICAgcmV0dXJuIHsgTGVnYWN5UGF0aChyZW5kZXJFbGVtZW50Lmlu bGluZUJveFdyYXBwZXIoKSkgfTsKKyAgICByZXR1cm4geyBSdW5JdGVyYXRvckxlZ2FjeVBhdGgo cmVuZGVyRWxlbWVudC5pbmxpbmVCb3hXcmFwcGVyKCkpIH07CiB9CiAKIExpbmVSdW5JdGVyYXRv ciBsaW5lUnVuKGNvbnN0IFJ1bkl0ZXJhdG9yJiBydW5JdGVyYXRvcikKQEAgLTIyNywxNSArMjI3 LDE1IEBAIExpbmVSdW5JdGVyYXRvciBsaW5lUnVuKGNvbnN0IFJ1bkl0ZXJhdG9yJiBydW5JdGVy YXRvcikKIH0KIAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQotTW9kZXJu UGF0aCYgUGF0aFJ1bjo6bW9kZXJuUGF0aCgpCitjb25zdCBSdW5JdGVyYXRvck1vZGVyblBhdGgm IFBhdGhSdW46Om1vZGVyblBhdGgoKSBjb25zdAogewotICAgIHJldHVybiBXVEY6OmdldDxNb2Rl cm5QYXRoPihtX3BhdGhWYXJpYW50KTsKKyAgICByZXR1cm4gV1RGOjpnZXQ8UnVuSXRlcmF0b3JN b2Rlcm5QYXRoPihtX3BhdGhWYXJpYW50KTsKIH0KICNlbmRpZgogCi1MZWdhY3lQYXRoJiBQYXRo UnVuOjpsZWdhY3lQYXRoKCkKK2NvbnN0IFJ1bkl0ZXJhdG9yTGVnYWN5UGF0aCYgUGF0aFJ1bjo6 bGVnYWN5UGF0aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFdURjo6Z2V0PExlZ2FjeVBhdGg+KG1f cGF0aFZhcmlhbnQpOworICAgIHJldHVybiBXVEY6OmdldDxSdW5JdGVyYXRvckxlZ2FjeVBhdGg+ KG1fcGF0aFZhcmlhbnQpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3IuaApp bmRleCA3M2ZkYjZiYTZlNTcuLjI4Zjc2ZDVjOTlmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3IuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5J dGVyYXRvci5oCkBAIC00OCw5ICs0OCw5IEBAIGNsYXNzIFBhdGhSdW4gewogcHVibGljOgogICAg IHVzaW5nIFBhdGhWYXJpYW50ID0gVmFyaWFudDwKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJ TkdfQ09OVEVYVCkKLSAgICAgICAgTW9kZXJuUGF0aCwKKyAgICAgICAgUnVuSXRlcmF0b3JNb2Rl cm5QYXRoLAogI2VuZGlmCi0gICAgICAgIExlZ2FjeVBhdGgKKyAgICAgICAgUnVuSXRlcmF0b3JM ZWdhY3lQYXRoCiAgICAgPjsKIAogICAgIFBhdGhSdW4oUGF0aFZhcmlhbnQmJik7CkBAIC05Miw5 ICs5Miw5IEBAIHByb3RlY3RlZDoKIAogICAgIC8vIFRvIGhlbHAgd2l0aCBkZWJ1Z2dpbmcuCiAj aWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgTW9kZXJuUGF0aCYgbW9k ZXJuUGF0aCgpOworICAgIGNvbnN0IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCYgbW9kZXJuUGF0aCgp IGNvbnN0OwogI2VuZGlmCi0gICAgTGVnYWN5UGF0aCYgbGVnYWN5UGF0aCgpOworICAgIGNvbnN0 IFJ1bkl0ZXJhdG9yTGVnYWN5UGF0aCYgbGVnYWN5UGF0aCgpIGNvbnN0OwogCiAgICAgUGF0aFZh cmlhbnQgbV9wYXRoVmFyaWFudDsKIH07CkBAIC0xMjEsNyArMTIxLDcgQEAgcHVibGljOgogCiBj bGFzcyBSdW5JdGVyYXRvciB7CiBwdWJsaWM6Ci0gICAgUnVuSXRlcmF0b3IoKSA6IG1fcnVuKExl Z2FjeVBhdGggeyBudWxscHRyLCB7IH0gfSkgeyB9OworICAgIFJ1bkl0ZXJhdG9yKCkgOiBtX3J1 bihSdW5JdGVyYXRvckxlZ2FjeVBhdGggeyBudWxscHRyLCB7IH0gfSkgeyB9OwogICAgIFJ1bkl0 ZXJhdG9yKFBhdGhSdW46OlBhdGhWYXJpYW50JiYpOwogCiAgICAgZXhwbGljaXQgb3BlcmF0b3Ig Ym9vbCgpIGNvbnN0IHsgcmV0dXJuICFhdEVuZCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvckxlZ2Fj eVBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvblJ1bkl0ZXJhdG9yTGVnYWN5UGF0aC5oCmluZGV4IDVmMDQ3NTc4MmEwNC4uY2FlNmViOGU0 ZGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25SdW5JdGVyYXRvckxlZ2FjeVBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvckxlZ2FjeVBhdGgu aApAQCAtMzIsOSArMzIsOSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91 dEludGVncmF0aW9uIHsKIAotY2xhc3MgTGVnYWN5UGF0aCB7CitjbGFzcyBSdW5JdGVyYXRvckxl Z2FjeVBhdGggewogcHVibGljOgotICAgIExlZ2FjeVBhdGgoY29uc3QgSW5saW5lQm94KiBpbmxp bmVCb3gsIFZlY3Rvcjxjb25zdCBJbmxpbmVUZXh0Qm94Kj4mJiBzb3J0ZWRJbmxpbmVUZXh0Qm94 ZXMgPSB7IH0sIHNpemVfdCBzb3J0ZWRJbmxpbmVUZXh0Qm94SW5kZXggPSAwKQorICAgIFJ1bkl0 ZXJhdG9yTGVnYWN5UGF0aChjb25zdCBJbmxpbmVCb3gqIGlubGluZUJveCwgVmVjdG9yPGNvbnN0 IElubGluZVRleHRCb3gqPiYmIHNvcnRlZElubGluZVRleHRCb3hlcyA9IHsgfSwgc2l6ZV90IHNv cnRlZElubGluZVRleHRCb3hJbmRleCA9IDApCiAgICAgICAgIDogbV9pbmxpbmVCb3goaW5saW5l Qm94KQogICAgICAgICAsIG1fc29ydGVkSW5saW5lVGV4dEJveGVzKFdURk1vdmUoc29ydGVkSW5s aW5lVGV4dEJveGVzKSkKICAgICAgICAgLCBtX3NvcnRlZElubGluZVRleHRCb3hJbmRleChzb3J0 ZWRJbmxpbmVUZXh0Qm94SW5kZXgpCkBAIC05OCw3ICs5OCw3IEBAIHB1YmxpYzoKICAgICAgICAg bV9pbmxpbmVCb3ggPSBtX2lubGluZUJveC0+cHJldmlvdXNMZWFmT25MaW5lKCk7CiAgICAgfQog Ci0gICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IExlZ2FjeVBhdGgmIG90aGVyKSBjb25zdCB7IHJl dHVybiBtX2lubGluZUJveCA9PSBvdGhlci5tX2lubGluZUJveDsgfQorICAgIGJvb2wgb3BlcmF0 b3I9PShjb25zdCBSdW5JdGVyYXRvckxlZ2FjeVBhdGgmIG90aGVyKSBjb25zdCB7IHJldHVybiBt X2lubGluZUJveCA9PSBvdGhlci5tX2lubGluZUJveDsgfQogCiAgICAgYm9vbCBhdEVuZCgpIGNv bnN0IHsgcmV0dXJuICFtX2lubGluZUJveDsgfQogICAgIHZvaWQgc2V0QXRFbmQoKSB7IG1faW5s aW5lQm94ID0gbnVsbHB0cjsgfQpAQCAtMTE1LDcgKzExNSw3IEBAIHByaXZhdGU6CiAgICAgc2l6 ZV90IG1fc29ydGVkSW5saW5lVGV4dEJveEluZGV4IHsgMCB9OwogfTsKIAotaW5saW5lIGNvbnN0 IElubGluZVRleHRCb3gqIExlZ2FjeVBhdGg6Om5leHRJbmxpbmVUZXh0Qm94SW5UZXh0T3JkZXIo KSBjb25zdAoraW5saW5lIGNvbnN0IElubGluZVRleHRCb3gqIFJ1bkl0ZXJhdG9yTGVnYWN5UGF0 aDo6bmV4dElubGluZVRleHRCb3hJblRleHRPcmRlcigpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3Nv cnRlZElubGluZVRleHRCb3hlcy5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKG1fc29ydGVkSW5s aW5lVGV4dEJveEluZGV4ICsgMSA8IG1fc29ydGVkSW5saW5lVGV4dEJveGVzLnNpemUoKSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3JNb2Rlcm5QYXRoLmgKaW5kZXggNjEx NjUxMTZlZmIwLi5hYzExMDU0OTJhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1 bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCkBAIC0zOSwxOCArMzksMTQgQEAgaW5saW5lIEZsb2F0UmVj dCB2ZXJ0aWNhbGx5Um91bmRlZFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIHJldHVy biB7IEZsb2F0UG9pbnQocmVjdC54KCksIHJvdW5kZihyZWN0LnkoKSkpLCByZWN0LnNpemUoKSB9 OwogfQogCi1jbGFzcyBNb2Rlcm5QYXRoIHsKK2NsYXNzIFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCB7 CiBwdWJsaWM6Ci0gICAgTW9kZXJuUGF0aChjb25zdCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250 ZW50LCBzaXplX3Qgc3RhcnRJbmRleCkKKyAgICBSdW5JdGVyYXRvck1vZGVyblBhdGgoY29uc3Qg SW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgc2l6ZV90IHN0YXJ0SW5kZXgpCiAgICAgICAg IDogbV9pbmxpbmVDb250ZW50KCZpbmxpbmVDb250ZW50KQogICAgICAgICAsIG1fcnVuSW5kZXgo c3RhcnRJbmRleCkKICAgICB7CiAKICAgICB9Ci0gICAgTW9kZXJuUGF0aChNb2Rlcm5QYXRoJiYp ID0gZGVmYXVsdDsKLSAgICBNb2Rlcm5QYXRoKGNvbnN0IE1vZGVyblBhdGgmKSA9IGRlZmF1bHQ7 Ci0gICAgTW9kZXJuUGF0aCYgb3BlcmF0b3I9KGNvbnN0IE1vZGVyblBhdGgmKSA9IGRlZmF1bHQ7 Ci0gICAgTW9kZXJuUGF0aCYgb3BlcmF0b3I9KE1vZGVyblBhdGgmJikgPSBkZWZhdWx0OwogCiAg ICAgYm9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiAhIXJ1bigpLnRleHRDb250ZW50KCk7IH0K IApAQCAtMTc4LDcgKzE3NCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHNldEF0RW5kKCk7CiAg ICAgfQogCi0gICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE1vZGVyblBhdGgmIG90aGVyKSBjb25z dCB7IHJldHVybiBtX2lubGluZUNvbnRlbnQgPT0gb3RoZXIubV9pbmxpbmVDb250ZW50ICYmIG1f cnVuSW5kZXggPT0gb3RoZXIubV9ydW5JbmRleDsgfQorICAgIGJvb2wgb3BlcmF0b3I9PShjb25z dCBSdW5JdGVyYXRvck1vZGVyblBhdGgmIG90aGVyKSBjb25zdCB7IHJldHVybiBtX2lubGluZUNv bnRlbnQgPT0gb3RoZXIubV9pbmxpbmVDb250ZW50ICYmIG1fcnVuSW5kZXggPT0gb3RoZXIubV9y dW5JbmRleDsgfQogCiAgICAgYm9vbCBhdEVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fcnVuSW5kZXgg PT0gcnVucygpLnNpemUoKSB8fCAhcnVuKCkuaGFzVW5kZXJseWluZ0xheW91dCgpOyB9CiAgICAg dm9pZCBzZXRBdEVuZCgpIHsgbV9ydW5JbmRleCA9IHJ1bnMoKS5zaXplKCk7IH0K