173624 2017-06-20 15:58:02 -0700 Add more release logging for process assertions 2017-06-23 14:26:31 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham commit-queue ggaren kling koivisto oldest_to_newest 1321278 0 cdumez 2017-06-20 15:58:02 -0700 Add more release logging for process assertions to help debug issues such as <rdar://problem/32412701>. 1321280 1 313450 cdumez 2017-06-20 15:59:26 -0700 Created attachment 313450 Patch 1321292 2 313452 cdumez 2017-06-20 16:28:18 -0700 Created attachment 313452 Patch 1322428 3 313452 ggaren 2017-06-23 13:58:13 -0700 Comment on attachment 313452 Patch r=me 1322436 4 313452 commit-queue 2017-06-23 14:26:29 -0700 Comment on attachment 313452 Patch Clearing flags on attachment: 313452 Committed r218764: <http://trac.webkit.org/changeset/218764> 1322437 5 commit-queue 2017-06-23 14:26:31 -0700 All reviewed patches have been landed. Closing bug. 313450 2017-06-20 15:59:26 -0700 2017-06-20 16:28:17 -0700 Patch bug-173624-20170620155925.patch text/plain 4213 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDA5MDhmYjZiNTJmMDk3 ZWJmOGJiZWE5OTgzNDM0ZWE3OWMwNWFmNy4uZDYwZTQ5ZWQxMTg1MzExODk0OGU0ZDk3Y2ZhMmNk NzYwOGU1MTEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1vcmUgcmVsZWFzZSBs b2dnaW5nIGZvciBwcm9jZXNzIGFzc2VydGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzYyNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI0 MTI3MDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIG1vcmUgcmVsZWFzZSBsb2dnaW5nIGZvciBwcm9jZXNzIGFzc2VydGlvbnMgdG8gaGVscCBk ZWJ1ZyBpc3N1ZXMgc3VjaAorICAgICAgICBhcyA8cmRhcjovL3Byb2JsZW0vMzI0MTI3MDE+Lgor CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25uZWN0VG9Qcm9jZXNzKToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzQXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nl c3NBc3NlcnRpb246OnNldFN0YXRlKToKKwogMjAxNy0wNi0yMCAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIERuRF0gW1dLMl0gUmVtb3ZlIGN1 c3RvbSBsb2dpYyBmb3IgZGlzYW1iaWd1YXRpbmcgbG9uZyBwcmVzcyBhY3Rpb24gc2hlZXQgZ2Vz dHVyZXMgYW5kIGRyYWcgbGlmdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Byb2Nlc3NUaHJvdHRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCmluZGV4IDY2ZjQ0ZGZiYTBmMDQzZWQxMjU3ZTUwNjJkODQ1MGJiMTVmODUy OGYuLmVlZDNlNjAxYWZlNmM4ZGNkYmMzZDI4NWFiMTE5OWU5ZDIzYzY3NjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKQEAgLTkzLDYgKzkzLDgg QEAgdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjp1cGRhdGVBc3NlcnRpb24oKQogCiB2b2lkIFByb2Nl c3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MocGlkX3QgcGlkKQogeworICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25u ZWN0VG9Qcm9jZXNzKCVkKSIsIHRoaXMsIHBpZCk7CisKICAgICBtX3N1c3BlbmRUaW1lci5zdG9w KCk7CiAgICAgaWYgKG1fc2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlvbikKICAgICAgICAg bV9hc3NlcnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4ocGlk LCBhc3NlcnRpb25TdGF0ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCA2YjIyNDAxNzFmMDMxYWIwM2NjMzcxMTk0 YjZiYTNkZDg1MzRkODg3Li4xNmVmZjhkMjllOTkxMDg0YmZlYWVjNWFjMjQxNWNmNDNkZjcyMjIx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0 aW9uSU9TLm1tCkBAIC0xNjYsNyArMTY2LDcgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fz c2VydGlvbihwaWRfdCBwaWQsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW4KICAg ICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOwogICAgIEJLU1Byb2Nlc3NBc3NlcnRp b25BY3F1aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewogICAgICAg ICBpZiAoIWFjcXVpcmVkKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNz U3VzcGVuc2lvbiwgIlVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyAlZCIs IHBpZCk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwg IiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBVbmFibGUgdG8gYWNxdWlyZSBhc3NlcnRpb24gZm9y IHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBwaWQpOwogICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFp bl9xdWV1ZSgpLCBeewogICAgICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykKQEAgLTE3NCw5ICsx NzQsMTEgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFz c2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW4KICAgICAgICAgICAgIH0pOwogICAgICAg ICB9CiAgICAgfTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJv Y2Vzc0Fzc2VydGlvbigpIEFjcXVpcmluZyBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQg JWQiLCB0aGlzLCBwaWQpOwogICAgIG1fYXNzZXJ0aW9uID0gYWRvcHROUyhbW0JLU1Byb2Nlc3NB c3NlcnRpb24gYWxsb2NdIGluaXRXaXRoUElEOnBpZCBmbGFnczpmbGFnc0ZvclN0YXRlKGFzc2Vy dGlvblN0YXRlKSByZWFzb246QktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbkV4dGVuc2lvbiBuYW1l OkAiV2ViIGNvbnRlbnQgdmlzaWJsZSIgd2l0aEhhbmRsZXI6aGFuZGxlcl0pOwogICAgIG1fYXNz ZXJ0aW9uLmdldCgpLmludmFsaWRhdGlvbkhhbmRsZXIgPSBeKCkgewogICAgICAgICBkaXNwYXRj aF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgICAgICAgICAgUkVMRUFT RV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQcm9jZXNz IGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCB3YXMgaW52YWxpZGF0ZWQiLCB0aGlz LCBwaWQpOwogICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQogICAgICAgICAgICAgICAgIG1hcmtB c0ludmFsaWRhdGVkKCk7CiAgICAgICAgIH0pOwpAQCAtMTg5LDYgKzE5MSw4IEBAIFByb2Nlc3NB c3NlcnRpb246On5Qcm9jZXNzQXNzZXJ0aW9uKCkKIAogICAgIGlmIChQcm9jZXNzQXNzZXJ0aW9u Q2xpZW50KiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkKICAgICAgICAgW1tXS1Byb2Nlc3NBc3Nl cnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgc2hhcmVkXSByZW1vdmVDbGllbnQ6KmNsaWVudF07 CisKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gflByb2Nlc3NBc3Nl cnRpb24oKSBSZWxlYXNpbmcgcHJvY2VzcyBhc3NlcnRpb24iLCB0aGlzKTsKICAgICBbbV9hc3Nl cnRpb24gaW52YWxpZGF0ZV07CiB9CiAKQEAgLTIwNSw2ICsyMDksNyBAQCB2b2lkIFByb2Nlc3NB c3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQogICAgIGlm IChtX2Fzc2VydGlvblN0YXRlID09IGFzc2VydGlvblN0YXRlKQogICAgICAgICByZXR1cm47CiAK KyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlv bjo6c2V0U3RhdGUoJXUpIiwgdGhpcywgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGFzc2VydGlvblN0 YXRlKSk7CiAgICAgbV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlvblN0YXRlOwogICAgIFttX2Fz c2VydGlvbiBzZXRGbGFnczpmbGFnc0ZvclN0YXRlKGFzc2VydGlvblN0YXRlKV07CiB9Cg== 313452 2017-06-20 16:28:18 -0700 2017-06-23 14:26:29 -0700 Patch bug-173624-20170620162817.patch text/plain 5377 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDA5MDhmYjZiNTJmMDk3 ZWJmOGJiZWE5OTgzNDM0ZWE3OWMwNWFmNy4uZDYwZTQ5ZWQxMTg1MzExODk0OGU0ZDk3Y2ZhMmNk NzYwOGU1MTEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1vcmUgcmVsZWFzZSBs b2dnaW5nIGZvciBwcm9jZXNzIGFzc2VydGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzYyNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI0 MTI3MDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIG1vcmUgcmVsZWFzZSBsb2dnaW5nIGZvciBwcm9jZXNzIGFzc2VydGlvbnMgdG8gaGVscCBk ZWJ1ZyBpc3N1ZXMgc3VjaAorICAgICAgICBhcyA8cmRhcjovL3Byb2JsZW0vMzI0MTI3MDE+Lgor CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25uZWN0VG9Qcm9jZXNzKToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzQXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nl c3NBc3NlcnRpb246OnNldFN0YXRlKToKKwogMjAxNy0wNi0yMCAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIERuRF0gW1dLMl0gUmVtb3ZlIGN1 c3RvbSBsb2dpYyBmb3IgZGlzYW1iaWd1YXRpbmcgbG9uZyBwcmVzcyBhY3Rpb24gc2hlZXQgZ2Vz dHVyZXMgYW5kIGRyYWcgbGlmdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Byb2Nlc3NUaHJvdHRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCmluZGV4IDY2ZjQ0ZGZiYTBmMDQzZWQxMjU3ZTUwNjJkODQ1MGJiMTVmODUy OGYuLmVlZDNlNjAxYWZlNmM4ZGNkYmMzZDI4NWFiMTE5OWU5ZDIzYzY3NjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKQEAgLTkzLDYgKzkzLDgg QEAgdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjp1cGRhdGVBc3NlcnRpb24oKQogCiB2b2lkIFByb2Nl c3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MocGlkX3QgcGlkKQogeworICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25u ZWN0VG9Qcm9jZXNzKCVkKSIsIHRoaXMsIHBpZCk7CisKICAgICBtX3N1c3BlbmRUaW1lci5zdG9w KCk7CiAgICAgaWYgKG1fc2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlvbikKICAgICAgICAg bV9hc3NlcnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4ocGlk LCBhc3NlcnRpb25TdGF0ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCA2YjIyNDAxNzFmMDMxYWIwM2NjMzcxMTk0 YjZiYTNkZDg1MzRkODg3Li5jOTIzMTI5ODdlM2MzOGQzN2U0OWFjNDIxZDJlNjVkOTk3ZTRiNGRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0 aW9uSU9TLm1tCkBAIC0xMDUsNiArMTA1LDcgQEAgdXNpbmcgV2ViS2l0OjpQcm9jZXNzQXNzZXJ0 aW9uQ2xpZW50OwogLSAodm9pZClfdXBkYXRlQmFja2dyb3VuZFRhc2sKIHsKICAgICBpZiAoX25l ZWRzVG9SdW5JbkJhY2tncm91bmRDb3VudCAmJiBfYmFja2dyb3VuZFRhc2sgPT0gVUlCYWNrZ3Jv dW5kVGFza0ludmFsaWQpIHsKKyAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24s ICIlcCAtIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciAtIGJlZ2luQmFj a2dyb3VuZFRhc2tXaXRoTmFtZSIsIHNlbGYpOwogICAgICAgICBfYmFja2dyb3VuZFRhc2sgPSBb W1VJQXBwbGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dIGJlZ2luQmFja2dyb3VuZFRhc2tXaXRo TmFtZTpAImNvbS5hcHBsZS5XZWJLaXQuUHJvY2Vzc0Fzc2VydGlvbiIgZXhwaXJhdGlvbkhhbmRs ZXI6XnsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAi QmFja2dyb3VuZCB0YXNrIGV4cGlyZWQgd2hpbGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2Vy dGlvbiAoaXNNYWluVGhyZWFkPyAlZCkuIiwgUnVuTG9vcDo6aXNNYWluKCkpOwogICAgICAgICAg ICAgLy8gVGhlIGV4cGlyYXRpb24gaGFuZGxlciBnZXRzIGNhbGxlZCBvbiBhIG5vbi1tYWluIHRo cmVhZCB3aGVuIHRoZSB1bmRlcmx5aW5nIGFzc2VydGlvbiBjb3VsZCBub3QgYmUgdGFrZW4gKHJk YXI6Ly9wcm9ibGVtLzI3Mjc4NDE5KS4KQEAgLTEyMSw2ICsxMjIsNyBAQCB1c2luZyBXZWJLaXQ6 OlByb2Nlc3NBc3NlcnRpb25DbGllbnQ7CiAgICAgfQogCiAgICAgaWYgKCFfbmVlZHNUb1J1bklu QmFja2dyb3VuZENvdW50ICYmIF9iYWNrZ3JvdW5kVGFzayAhPSBVSUJhY2tncm91bmRUYXNrSW52 YWxpZCkgeworICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQ cm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIC0gZW5kQmFja2dyb3VuZFRhc2si LCBzZWxmKTsKICAgICAgICAgW1tVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBlbmRC YWNrZ3JvdW5kVGFzazpfYmFja2dyb3VuZFRhc2tdOwogICAgICAgICBfYmFja2dyb3VuZFRhc2sg PSBVSUJhY2tncm91bmRUYXNrSW52YWxpZDsKICAgICB9CkBAIC0xNjYsNyArMTY4LDcgQEAgUHJv Y2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFzc2VydGlvblN0YXRl IGFzc2VydGlvblN0YXRlLCBGdW4KICAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigp OwogICAgIEJLU1Byb2Nlc3NBc3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4o Qk9PTCBhY3F1aXJlZCkgewogICAgICAgICBpZiAoIWFjcXVpcmVkKSB7Ci0gICAgICAgICAgICBS RUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIlVuYWJsZSB0byBhY3F1aXJlIGFz c2VydGlvbiBmb3IgcHJvY2VzcyAlZCIsIHBpZCk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBVbmFibGUg dG8gYWNxdWlyZSBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBwaWQp OwogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBkaXNwYXRj aF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewogICAgICAgICAgICAgICAgIGlm ICh3ZWFrVGhpcykKQEAgLTE3NCw5ICsxNzYsMTEgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vz c0Fzc2VydGlvbihwaWRfdCBwaWQsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW4K ICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAgICAgfTsKKyAgICBSRUxFQVNFX0xPRyhQcm9j ZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigpIEFjcXVpcmluZyBhc3NlcnRp b24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBwaWQpOwogICAgIG1fYXNzZXJ0aW9u ID0gYWRvcHROUyhbW0JLU1Byb2Nlc3NBc3NlcnRpb24gYWxsb2NdIGluaXRXaXRoUElEOnBpZCBm bGFnczpmbGFnc0ZvclN0YXRlKGFzc2VydGlvblN0YXRlKSByZWFzb246QktTUHJvY2Vzc0Fzc2Vy dGlvblJlYXNvbkV4dGVuc2lvbiBuYW1lOkAiV2ViIGNvbnRlbnQgdmlzaWJsZSIgd2l0aEhhbmRs ZXI6aGFuZGxlcl0pOwogICAgIG1fYXNzZXJ0aW9uLmdldCgpLmludmFsaWRhdGlvbkhhbmRsZXIg PSBeKCkgewogICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgp LCBeeworICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFBy b2Nlc3NBc3NlcnRpb24oKSBQcm9jZXNzIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAl ZCB3YXMgaW52YWxpZGF0ZWQiLCB0aGlzLCBwaWQpOwogICAgICAgICAgICAgaWYgKHdlYWtUaGlz KQogICAgICAgICAgICAgICAgIG1hcmtBc0ludmFsaWRhdGVkKCk7CiAgICAgICAgIH0pOwpAQCAt MTg5LDYgKzE5Myw4IEBAIFByb2Nlc3NBc3NlcnRpb246On5Qcm9jZXNzQXNzZXJ0aW9uKCkKIAog ICAgIGlmIChQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50KiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkK ICAgICAgICAgW1tXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgc2hhcmVk XSByZW1vdmVDbGllbnQ6KmNsaWVudF07CisKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVu c2lvbiwgIiVwIC0gflByb2Nlc3NBc3NlcnRpb24oKSBSZWxlYXNpbmcgcHJvY2VzcyBhc3NlcnRp b24iLCB0aGlzKTsKICAgICBbbV9hc3NlcnRpb24gaW52YWxpZGF0ZV07CiB9CiAKQEAgLTIwNSw2 ICsyMTEsNyBAQCB2b2lkIFByb2Nlc3NBc3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvblN0YXRl IGFzc2VydGlvblN0YXRlKQogICAgIGlmIChtX2Fzc2VydGlvblN0YXRlID09IGFzc2VydGlvblN0 YXRlKQogICAgICAgICByZXR1cm47CiAKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lv biwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoJXUpIiwgdGhpcywgc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KGFzc2VydGlvblN0YXRlKSk7CiAgICAgbV9hc3NlcnRpb25TdGF0ZSA9IGFz c2VydGlvblN0YXRlOwogICAgIFttX2Fzc2VydGlvbiBzZXRGbGFnczpmbGFnc0ZvclN0YXRlKGFz c2VydGlvblN0YXRlKV07CiB9Cg==