229513 2021-08-25 13:50:22 -0700 Replace the uint64_t used to identify form submits with a strongly typed identifier 2021-08-25 17:40:28 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser achristensen cdumez simon.fraser webkit-bug-importer oldest_to_newest 1787291 0 simon.fraser 2021-08-25 13:50:22 -0700 Replace the uint64_t used to identify form submits with a strongly typed identifier 1787292 1 436419 simon.fraser 2021-08-25 13:51:04 -0700 Created attachment 436419 Patch 1787404 2 ews-feeder 2021-08-25 17:39:47 -0700 Committed r281606 (240964@main): <https://commits.webkit.org/240964@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436419. 1787405 3 webkit-bug-importer 2021-08-25 17:40:28 -0700 <rdar://problem/82366424> 436419 2021-08-25 13:51:04 -0700 2021-08-25 17:39:48 -0700 Patch bug-229513-20210825135103.patch text/plain 12401 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIxODYyN2JjMGI0NWJiMThh NmMxYWMxNTNhNDIzMzJkNjNlYWZjNWQuLjA2MzE3ZjEwZjJhY2ViMzcyZDFlNDQ1MjkzMzYzZjcz NDk5ZDdmZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDgtMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSB0aGUgdWlu dDY0X3QgdXNlZCB0byBpZGVudGlmeSBmb3JtIHN1Ym1pdHMgd2l0aCBhIHN0cm9uZ2x5IHR5cGVk IGlkZW50aWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyOTUxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEludHJvZHVjZSBGb3JtU3VibWl0TGlzdGVuZXJJZGVudGlmaWVyIGFuZCB1c2UgaXQgaW4g cGxhY2Ugb2YgYSB1aW50NjRfdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0L21lc3NhZ2Vz LnB5OgorICAgICAgICAodHlwZXNfdGhhdF9jYW5ub3RfYmVfZm9yd2FyZF9kZWNsYXJlZCk6Cisg ICAgICAgIChoZWFkZXJzX2Zvcl90eXBlKToKKyAgICAgICAgKiBTaGFyZWQvSWRlbnRpZmllclR5 cGVzLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6d2lsbFN1Ym1pdEZvcm0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlz cGF0Y2hXaWxsU3VibWl0Rm9ybSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZy YW1lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OnNldFVwV2lsbFN1Ym1pdEZvcm1M aXN0ZW5lcik6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpjb250aW51ZVdpbGxTdWJtaXRG b3JtKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmNvbnRpbnVlV2lsbFN1Ym1pdEZvcm0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW46CisKIDIwMjEtMDgtMjUgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAog ICAgICAgICBbTW9udGVyZXldIExheW91dFRlc3QgbWVkaWEvZWxlbWVudC1jb250YWluaW5nLXBp cC12aWRlby1nb2luZy1pbnRvLWZ1bGxzY3JlZW4uaHRtbCBpcyBmbGFreSB0aW1lb3V0L2NyYXNo CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5IGIv U291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQppbmRleCA0Y2IyMGY0ODI4 OTA4ODYyZTA1ZmI1ODdlZjVjYWViOGJkNGZlOTJiLi5mYjIzNDdkNWY4OWM4NTEwZmQ3MDViNDI1 YTRlYzUyNDU4NGNlNTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0 L21lc3NhZ2VzLnB5CisrKyBiL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMu cHkKQEAgLTMxNCw2ICszMTQsNyBAQCBkZWYgdHlwZXNfdGhhdF9jYW5ub3RfYmVfZm9yd2FyZF9k ZWNsYXJlZCgpOgogICAgICAgICAnV2ViS2l0OjpDb250ZW50V29ybGRJZGVudGlmaWVyJywKICAg ICAgICAgJ1dlYktpdDo6RGlzcGxheUxpbmtPYnNlcnZlcklEJywKICAgICAgICAgJ1dlYktpdDo6 RG93bmxvYWRJRCcsCisgICAgICAgICdXZWJLaXQ6OkZvcm1TdWJtaXRMaXN0ZW5lcklkZW50aWZp ZXInLAogICAgICAgICAnV2ViS2l0OjpHZW9sb2NhdGlvbklkZW50aWZpZXInLAogICAgICAgICAn V2ViS2l0OjpHcmFwaGljc0NvbnRleHRHTElkZW50aWZpZXInLAogICAgICAgICAnV2ViS2l0OjpJ bWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGUnLApAQCAtNzc1LDYgKzc3Niw3IEBAIGRlZiBoZWFkZXJz X2Zvcl90eXBlKHR5cGUpOgogICAgICAgICAnV2ViS2l0OjpDb250ZW50V29ybGRJZGVudGlmaWVy JzogWyciQ29udGVudFdvcmxkU2hhcmVkLmgiJ10sCiAgICAgICAgICdXZWJLaXQ6OkRvY3VtZW50 RWRpdGluZ0NvbnRleHRSZXF1ZXN0JzogWyciRG9jdW1lbnRFZGl0aW5nQ29udGV4dC5oIiddLAog ICAgICAgICAnV2ViS2l0OjpGaW5kT3B0aW9ucyc6IFsnIldlYkZpbmRPcHRpb25zLmgiJ10sCisg ICAgICAgICdXZWJLaXQ6OkZvcm1TdWJtaXRMaXN0ZW5lcklkZW50aWZpZXInOiBbJyJJZGVudGlm aWVyVHlwZXMuaCInXSwKICAgICAgICAgJ1dlYktpdDo6R2VzdHVyZVJlY29nbml6ZXJTdGF0ZSc6 IFsnIkdlc3R1cmVUeXBlcy5oIiddLAogICAgICAgICAnV2ViS2l0OjpHZXN0dXJlVHlwZSc6IFsn Ikdlc3R1cmVUeXBlcy5oIiddLAogICAgICAgICAnV2ViS2l0OjpMYXN0TmF2aWdhdGlvbldhc0Fw cEluaXRpYXRlZCc6IFsnIkFwcFByaXZhY3lSZXBvcnQuaCInXSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0lkZW50aWZpZXJUeXBlcy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv SWRlbnRpZmllclR5cGVzLmgKaW5kZXggNTVmMjNlMjhlODdiOTk0ZjQ0NzljN2YzMzcxOWY5NjZj ZWY1YzA0OS4uZWUyOWM0MzRhNGUyYzk2MTI5ZDk4MGMyZWQzNDYyZDI1M2VmOWYwNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvSWRlbnRpZmllclR5cGVzLmgKKysrIGIvU291cmNl L1dlYktpdC9TaGFyZWQvSWRlbnRpZmllclR5cGVzLmgKQEAgLTI5LDYgKzI5LDkgQEAKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKK2VudW0gRm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmllclR5cGUg eyB9OwordXNpbmcgRm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmllciA9IE9iamVjdElkZW50aWZp ZXI8Rm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmllclR5cGU+OworCiBlbnVtIFBhZ2VHcm91cElk ZW50aWZpZXJUeXBlIHsgfTsKIHVzaW5nIFBhZ2VHcm91cElkZW50aWZpZXIgPSBPYmplY3RJZGVu dGlmaWVyPFBhZ2VHcm91cElkZW50aWZpZXJUeXBlPjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMTExMzE5ZDhkM2VmMGRmMWUxNjYwMzczY2ZhYzlkOWRl ZThhNTdmOS4uNWZiMzA4OTUwMTU2MjQ4NjY2MTUzYzYyNGY0MDM0ZWE0YTg4NGZkZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC01Njg2LDcgKzU2ODYsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6dW5hYmxlVG9JbXBsZW1lbnRQb2xpY3koRnJhbWVJZGVudGlm aWVyIGZyYW1lSUQsIGNvbnN0IFJlc291cgogCiAvLyBGb3JtQ2xpZW50CiAKLXZvaWQgV2ViUGFn ZVByb3h5Ojp3aWxsU3VibWl0Rm9ybShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgRnJhbWVJZGVu dGlmaWVyIHNvdXJjZUZyYW1lSUQsIGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJp bmc+PiYgdGV4dEZpZWxkVmFsdWVzLCB1aW50NjRfdCBsaXN0ZW5lcklELCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCit2b2lkIFdlYlBhZ2VQcm94eTo6d2lsbFN1Ym1pdEZvcm0oRnJhbWVJZGVu dGlmaWVyIGZyYW1lSUQsIEZyYW1lSWRlbnRpZmllciBzb3VyY2VGcmFtZUlELCBjb25zdCBWZWN0 b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4mIHRleHRGaWVsZFZhbHVlcywgRm9ybVN1Ym1p dExpc3RlbmVySWRlbnRpZmllciBsaXN0ZW5lcklELCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEp CiB7CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpOwogICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI2YjgwNmMzNmJhZmNkNzI5MzE3NjQ2YzlmZjZk ZWY2YjlkMTMyN2YuLmVhMWMyMmZiNmIxMWJlOTY4OTkyODI2NGQzYmYzZmM4NDcxMDliOGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMDY2LDcgKzIwNjYsNyBA QCBwcml2YXRlOgogCiAgICAgV2ViQ29udGVudE1vZGUgZWZmZWN0aXZlQ29udGVudE1vZGVBZnRl ckFkanVzdGluZ1BvbGljaWVzKEFQSTo6V2Vic2l0ZVBvbGljaWVzJiwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0Jik7CiAKLSAgICB2b2lkIHdpbGxTdWJtaXRGb3JtKFdlYkNvcmU6OkZy YW1lSWRlbnRpZmllciwgV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyIHNvdXJjZUZyYW1lSUQsIGNv bnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+PiYgdGV4dEZpZWxkVmFsdWVzLCB1 aW50NjRfdCBsaXN0ZW5lcklELCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgd2lsbFN1Ym1p dEZvcm0oV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyLCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIg c291cmNlRnJhbWVJRCwgY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+JiB0 ZXh0RmllbGRWYWx1ZXMsIEZvcm1TdWJtaXRMaXN0ZW5lcklkZW50aWZpZXIsIGNvbnN0IFVzZXJE YXRhJik7CiAKICAgICB2b2lkIGNvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbihVUkwmJiwgV2Vi Q29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0cyYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IGI4ODAzY2Q1MjIyYjZhNzA4 NGZhMmU3MjIwMjc3NzRiNWZlMDY1NjYuLmJjMzdiOGZjNmFkZjNlYWQxODcyZDExNTVmZjBjYmQw MDlkYzBhZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku bWVzc2FnZXMuaW4KQEAgLTE2MSw3ICsxNjEsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkg ewogICAgIERpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKFN0cmlu ZyBzdWdnZXN0ZWRGaWxlbmFtZSwgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEpCiAKICAgICAjIEZv cm1zIG1lc3NhZ2VzCi0gICAgV2lsbFN1Ym1pdEZvcm0oV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVy IGZyYW1lSUQsIFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciBzb3VyY2VGcmFtZUlELCBWZWN0b3I8 c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4gdGV4dEZpZWxkVmFsdWVzLCB1aW50NjRfdCBsaXN0 ZW5lcklELCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQorICAgIFdpbGxTdWJtaXRGb3JtKFdl YkNvcmU6OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIg c291cmNlRnJhbWVJRCwgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+IHRleHRGaWVs ZFZhbHVlcywgV2ViS2l0OjpGb3JtU3VibWl0TGlzdGVuZXJJZGVudGlmaWVyIGxpc3RlbmVySUQs IFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog ICAgIEludGVycHJldEtleUV2ZW50KHN0cnVjdCBXZWJLaXQ6OkVkaXRvclN0YXRlIHN0YXRlLCBi b29sIGlzQ2hhckV2ZW50KSAtPiAoYm9vbCBoYW5kbGVkKSBTeW5jaHJvbm91cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggNDk0ZDllNTAxNDlkYjVhYTQyNzcxYjFiMmZjZWNm NGFhNTc4ODJjMy4uNzIzMTVhNTc1ODczNWVkNWVmMTk2NjYyOTFlNjEwZDM4Y2MwZTllMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMDk0LDcgKzEwOTQsNyBAQCB2b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxTdWJtaXRGb3JtKEZvcm1TdGF0ZSYg Zm9ybVN0YXRlLCBDb21wbGV0aQogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gdXNlckRhdGE7CiAg ICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVGb3JtQ2xpZW50KCkud2lsbFN1Ym1pdEZvcm0od2Vi UGFnZSwgJmZvcm0sIG1fZnJhbWUucHRyKCksIHNvdXJjZUZyYW1lLCB2YWx1ZXMsIHVzZXJEYXRh KTsKIAotICAgIHVpbnQ2NF90IGxpc3RlbmVySUQgPSBtX2ZyYW1lLT5zZXRVcFdpbGxTdWJtaXRG b3JtTGlzdGVuZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIGF1dG8gbGlzdGVu ZXJJRCA9IG1fZnJhbWUtPnNldFVwV2lsbFN1Ym1pdEZvcm1MaXN0ZW5lcihXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSk7CiAKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OldpbGxTdWJtaXRGb3JtKG1fZnJhbWUtPmZyYW1lSUQoKSwgc291cmNlRnJhbWUtPmZyYW1l SUQoKSwgdmFsdWVzLCBsaXN0ZW5lcklELCBVc2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0b24o KS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNw cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAz MGI2OGUwZDI1YTRjMjRiM2Y1NTE2ZWNlM2FkYmNhM2U0ODJkMzhlLi4zNjIwOGIwM2Y4Y2M2MzY3 ODY3MWRkYmRiNGNhMjdmYjliYjE1ZGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViRnJhbWUuY3BwCkBAIC0yMTgsMTQgKzIxOCwxNCBAQCB1aW50NjRfdCBXZWJG cmFtZTo6c2V0VXBQb2xpY3lMaXN0ZW5lcihXZWJDb3JlOjpQb2xpY3lDaGVja0lkZW50aWZpZXIg aWRlbnRpZmllcgogICAgIHJldHVybiBwb2xpY3lMaXN0ZW5lcklEOwogfQogCi11aW50NjRfdCBX ZWJGcmFtZTo6c2V0VXBXaWxsU3VibWl0Rm9ybUxpc3RlbmVyKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK0Zvcm1TdWJtaXRMaXN0ZW5lcklkZW50aWZpZXIg V2ViRnJhbWU6OnNldFVwV2lsbFN1Ym1pdEZvcm1MaXN0ZW5lcihDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgdWludDY0X3QgaWRlbnRpZmllciA9 IGdlbmVyYXRlTGlzdGVuZXJJRCgpOworICAgIGF1dG8gaWRlbnRpZmllciA9IEZvcm1TdWJtaXRM aXN0ZW5lcklkZW50aWZpZXI6OmdlbmVyYXRlKCk7CiAgICAgbV93aWxsU3VibWl0Rm9ybUNvbXBs ZXRpb25IYW5kbGVycy5zZXQoaWRlbnRpZmllciwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp OwogICAgIHJldHVybiBpZGVudGlmaWVyOwogfQogCi12b2lkIFdlYkZyYW1lOjpjb250aW51ZVdp bGxTdWJtaXRGb3JtKHVpbnQ2NF90IGxpc3RlbmVySUQpCit2b2lkIFdlYkZyYW1lOjpjb250aW51 ZVdpbGxTdWJtaXRGb3JtKEZvcm1TdWJtaXRMaXN0ZW5lcklkZW50aWZpZXIgbGlzdGVuZXJJRCkK IHsKICAgICBSZWY8V2ViRnJhbWU+IHByb3RlY3RlZFRoaXMoKnRoaXMpOwogICAgIGlmIChhdXRv IGNvbXBsZXRpb25IYW5kbGVyID0gbV93aWxsU3VibWl0Rm9ybUNvbXBsZXRpb25IYW5kbGVycy50 YWtlKGxpc3RlbmVySUQpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZy YW1lLmgKaW5kZXggYWFlYjY5M2JiMmEzMzBkZDcwMzAwYzlhNjVjNGMzY2M3MjE4ZTJmNi4uMTRi MWM0MDE2YTI5MjNlOTMwMTA0MjA5YTg0NWNlZjg3NWVmN2NiMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5oCkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbmNs dWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlICJEb3dubG9hZElELmgiCisjaW5jbHVkZSAiSWRl bnRpZmllclR5cGVzLmgiCiAjaW5jbHVkZSAiUG9saWN5RGVjaXNpb24uaCIKICNpbmNsdWRlICJT aGFyZWFibGVCaXRtYXAuaCIKICNpbmNsdWRlICJUcmFuc2FjdGlvbklELmgiCkBAIC04OSw4ICs5 MCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGludmFsaWRhdGVQb2xpY3lMaXN0ZW5lcnMoKTsKICAg ICB2b2lkIGRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklELCBQb2xp Y3lEZWNpc2lvbiYmKTsKIAotICAgIHVpbnQ2NF90IHNldFVwV2lsbFN1Ym1pdEZvcm1MaXN0ZW5l cihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwotICAgIHZvaWQgY29udGludWVXaWxsU3Vi bWl0Rm9ybSh1aW50NjRfdCk7CisgICAgRm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmllciBzZXRV cFdpbGxTdWJtaXRGb3JtTGlzdGVuZXIoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKKyAg ICB2b2lkIGNvbnRpbnVlV2lsbFN1Ym1pdEZvcm0oRm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmll cik7CiAKICAgICB2b2lkIHN0YXJ0RG93bmxvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lID0geyB9KTsKICAgICB2b2lkIGNvbnZl cnRNYWluUmVzb3VyY2VMb2FkVG9Eb3dubG9hZChXZWJDb3JlOjpEb2N1bWVudExvYWRlciosIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmKTsKQEAgLTIwNyw3ICsyMDgsNyBAQCBwcml2YXRlOgogICAgIH07CiAgICAgSGFzaE1h cDx1aW50NjRfdCwgUG9saWN5Q2hlY2s+IG1fcGVuZGluZ1BvbGljeUNoZWNrczsKIAotICAgIEhh c2hNYXA8dWludDY0X3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4+IG1fd2lsbFN1Ym1pdEZv cm1Db21wbGV0aW9uSGFuZGxlcnM7CisgICAgSGFzaE1hcDxGb3JtU3VibWl0TGlzdGVuZXJJZGVu dGlmaWVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+PiBtX3dpbGxTdWJtaXRGb3JtQ29tcGxl dGlvbkhhbmRsZXJzOwogICAgIHN0ZDo6b3B0aW9uYWw8RG93bmxvYWRJRD4gbV9wb2xpY3lEb3du bG9hZElEOwogCiAgICAgV2Vha1B0cjxMb2FkTGlzdGVuZXI+IG1fbG9hZExpc3RlbmVyOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBjZmJlNTRm MDI2MzQyMDllOGEzMTJhZDVlZDA5YzcyNjkwM2FlZjBjLi4wNGUzYWUyMDE0M2YyZjNkYmQyMDY0 YTMwMmYwMWI4NGVkY2E5NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcApAQCAtMzUyMSw3ICszNTIxLDcgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNl aXZlUG9saWN5RGVjaXNpb24oRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NF90IGxpc3Rl bmUKICAgICBmcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIFdURk1v dmUocG9saWN5RGVjaXNpb24pKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpjb250aW51ZVdpbGxTdWJt aXRGb3JtKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklEKQordm9p ZCBXZWJQYWdlOjpjb250aW51ZVdpbGxTdWJtaXRGb3JtKEZyYW1lSWRlbnRpZmllciBmcmFtZUlE LCBGb3JtU3VibWl0TGlzdGVuZXJJZGVudGlmaWVyIGxpc3RlbmVySUQpCiB7CiAgICAgV2ViRnJh bWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAg ICAgaWYgKCFmcmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aAppbmRleCAxZTYxNGM3MzllYTUzNGY5MTM5NjE5MTFjYzk1ZDdmZGE4ODUzYjEzLi4xODgxYTVm MzY2MzIzYzczNDBjMDA4ZmZmODY2NGUzOTVkYmM5NWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xNjkzLDcgKzE2OTMsNyBAQCBwcml2YXRlOgog I2VuZGlmCiAKICAgICB2b2lkIGRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpGcmFt ZUlkZW50aWZpZXIsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeURlY2lzaW9uJiYsIGNvbnN0 IFZlY3RvcjxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+Jik7Ci0gICAgdm9pZCBjb250aW51ZVdp bGxTdWJtaXRGb3JtKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciwgdWludDY0X3QgbGlzdGVuZXJJ RCk7CisgICAgdm9pZCBjb250aW51ZVdpbGxTdWJtaXRGb3JtKFdlYkNvcmU6OkZyYW1lSWRlbnRp ZmllciwgRm9ybVN1Ym1pdExpc3RlbmVySWRlbnRpZmllcik7CiAgICAgdm9pZCBzZXRVc2VyQWdl bnQoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBzZXRDdXN0b21UZXh0RW5jb2RpbmdOYW1lKGNv bnN0IFN0cmluZyYpOwogICAgIHZvaWQgc3VzcGVuZEFjdGl2ZURPTU9iamVjdHNBbmRBbmltYXRp b25zKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgppbmRleCBhMGFhNTU0Zjc0OTgyMDJkMGJiMDZjZjk3NzAxYzI0OTI1NTlk NDM2Li4wOGIwMzQxZjE0M2E5MTNlOGM4ZTU1NGM2YmI2MGU5ZTc2ODc3NzY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4K QEAgLTE5Niw3ICsxOTYsNyBAQCBHZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKGVudW06 dWludDhfdCBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZQogICAgIE5vdGlmeVVz ZXJTY3JpcHRzKCkKICAgICBEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oV2ViQ29yZTo6RnJhbWVJ ZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIHN0cnVjdCBXZWJLaXQ6OlBv bGljeURlY2lzaW9uIHBvbGljeURlY2lzaW9uLCBWZWN0b3I8V2ViS2l0OjpTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGU+IG5ldHdvcmtFeHRlbnNpb25zU2FuZGJveEV4dGVuc2lvbnMpCiAKLSAgICBD b250aW51ZVdpbGxTdWJtaXRGb3JtKFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCB1 aW50NjRfdCBsaXN0ZW5lcklEKQorICAgIENvbnRpbnVlV2lsbFN1Ym1pdEZvcm0oV2ViQ29yZTo6 RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIFdlYktpdDo6Rm9ybVN1Ym1pdExpc3RlbmVySWRlbnRp ZmllciBsaXN0ZW5lcklEKQogCiAgICAgQ2xlYXJTZWxlY3Rpb24oKQogICAgIFJlc3RvcmVTZWxl Y3Rpb25JbkZvY3VzZWRFZGl0YWJsZUVsZW1lbnQoKQo=