235425 2022-01-20 16:21:40 -0800 Make bmalloc work better with various MallocStackLogging modes 2022-01-20 18:13:18 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham ggaren nham webkit-bug-importer ysuzuki oldest_to_newest 1832615 0 nham 2022-01-20 16:21:40 -0800 Make bmalloc work better with various MallocStackLogging modes 1832617 1 449622 nham 2022-01-20 16:30:04 -0800 Created attachment 449622 Patch 1832619 2 449622 ysuzuki 2022-01-20 16:35:58 -0800 Comment on attachment 449622 Patch r=me 1832623 3 449624 nham 2022-01-20 16:48:52 -0800 Created attachment 449624 Patch for landing 1832645 4 ews-feeder 2022-01-20 18:12:52 -0800 Committed r288340 (246246@main): <https://commits.webkit.org/246246@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449624. 1832646 5 webkit-bug-importer 2022-01-20 18:13:18 -0800 <rdar://problem/87861260> 449622 2022-01-20 16:30:04 -0800 2022-01-20 16:48:50 -0800 Patch bug-235425-20220120163003.patch text/plain 4474 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggZWYyODdjMzUxYzE5YTRi ZjBjMTNhZTZiMGY2YTI0ZDBjYTMzYTVhYy4uZjZjNjBkYjM1NjEzOTM4MTA3NjZiNmMzY2NlNjM1 ODJlYjFhNzNhMyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAxLTIwICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgYm1hbGxvYyB3b3JrIGJldHRl ciB3aXRoIHZhcmlvdXMgTWFsbG9jU3RhY2tMb2dnaW5nIG1vZGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0MjUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNvbmRpdGlvbmFsaXplcyB0aGUg d2F5IHN5c3RlbSBtYWxsb2MgaXMgdXNlZCBkZXBlbmRpbmcgb24gdGhlIGV4YWN0IHZhbHVlIG9m IHRoZQorICAgICAgICBNYWxsb2NTdGFja0xvZ2dpbmcgZW52aXJvbm1lbnQgdmFyaWFibGU6CisK KyAgICAgICAgLSBJZiB0aGUgbW9kZSBpcyAidm0iIG9yICJ2bWxpdGUiLCB0aGVuIHdlIGRvbid0 IG5lZWQgdG8gdXNlIHN5c3RlbSBtYWxsb2MgYXQgYWxsLCBzaW5jZQorICAgICAgICAgIHRob3Nl IGxvZ2dpbmcgbW9kZXMgb25seSBpbnRlcmNlcHQgc3lzY2FsbHMuCisgICAgICAgIC0gSWYgdGhl IG1vZGUgaXMgImxpdGUiLCB0aGVuIHdlIHNob3VsZCB1c2UgdGhlIGRlZmF1bHQgbWFsbG9jIHpv bmUgKHJhdGhlciB0aGFuIG91ciBjdXN0b20KKyAgICAgICAgICAiV2ViS2l0IFVzaW5nIFN5c3Rl bSBNYWxsb2MiIHpvbmUpLCBzaW5jZSB0aGUgbGl0ZSBtb2RlIG9ubHkgaW50ZXJjZXB0cyBhbGxv Y2F0aW9ucyBmcm9tCisgICAgICAgICAgdGhlIGRlZmF1bHQgem9uZS4KKworICAgICAgICBCZWZv cmUgdGhpcyBjaGFuZ2UsIHRoZSBsaXRlIG1vZGUgd291bGRuJ3QgY2FwdHVyZSBmYXN0TWFsbG9j IGNhbGxzdGFja3MsIHdoaWNoIG1hZGUgaXQgbGVzcworICAgICAgICB1c2VmdWwgdGhhbiBpdCBz aG91bGQgaGF2ZSBiZWVuLgorCisgICAgICAgICogYm1hbGxvYy9EZWJ1Z0hlYXAuY3BwOgorICAg ICAgICAoYm1hbGxvYzo6c2hvdWxkVXNlRGVmYXVsdE1hbGxvY1pvbmUpOgorICAgICAgICAoYm1h bGxvYzo6RGVidWdIZWFwOjpEZWJ1Z0hlYXApOgorICAgICAgICAqIGJtYWxsb2MvRW52aXJvbm1l bnQuY3BwOgorICAgICAgICAoYm1hbGxvYzo6aXNNYWxsb2NFbnZpcm9ubWVudFZhcmlhYmxlSW1w bHlpbmdTeXN0ZW1NYWxsb2NTZXQpOgorICAgICAgICAoYm1hbGxvYzo6RW52aXJvbm1lbnQ6OmNv bXB1dGVJc0RlYnVnSGVhcEVuYWJsZWQpOgorCiAyMDIyLTAxLTE5ICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW2xpYnBhc10gRGlzYWJsZSBQQVNfQVNTRVJU IG9uIERhcndpbiBBUk02NCAobm90IGluIEFSTTY0RSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFs bG9jL2JtYWxsb2MvRGVidWdIZWFwLmNwcCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvRGVidWdI ZWFwLmNwcAppbmRleCA0NmY0ZGU5YjZhMWEyMDA3MjRkMzhmMjUyNTgzNGZmNzg1ZmY2ZmFlLi44 MWZiMjE0ZDMwMTQwY2ZiNWJmMmU5NTk3ZTYwMzkxY2U2NjZmNzNjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvYm1hbGxvYy9ibWFsbG9jL0RlYnVnSGVhcC5jcHAKKysrIGIvU291cmNlL2JtYWxsb2MvYm1h bGxvYy9EZWJ1Z0hlYXAuY3BwCkBAIC00NCwxMSArNDQsMjcgQEAgREVGSU5FX1NUQVRJQ19QRVJf UFJPQ0VTU19TVE9SQUdFKERlYnVnSGVhcCk7CiAKICNpZiBCT1MoREFSV0lOKQogCitzdGF0aWMg Ym9vbCBzaG91bGRVc2VEZWZhdWx0TWFsbG9jWm9uZSgpCit7CisgICAgaWYgKGdldGVudigiREVC VUdfSEVBUF9VU0VfREVGQVVMVF9aT05FIikpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAg Ly8gVGhlIGxpdGUgbG9nZ2luZyBtb2RlIG9ubHkgaW50ZXJjZXB0cyBhbGxvY2F0aW9ucyBmcm9t IHRoZSBkZWZhdWx0IHpvbmUuCisgICAgY29uc3QgY2hhciogbWFsbG9jU3RhY2tMb2dnaW5nID0g Z2V0ZW52KCJNYWxsb2NTdGFja0xvZ2dpbmciKTsKKyAgICBpZiAobWFsbG9jU3RhY2tMb2dnaW5n ICYmICFzdHJjbXAobWFsbG9jU3RhY2tMb2dnaW5nLCAibGl0ZSIpKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogRGVidWdIZWFwOjpEZWJ1Z0hlYXAoY29u c3QgTG9ja0hvbGRlciYpCi0gICAgOiBtX3pvbmUobWFsbG9jX2NyZWF0ZV96b25lKDAsIDApKQor ICAgIDogbV96b25lKG1hbGxvY19kZWZhdWx0X3pvbmUoKSkKICAgICAsIG1fcGFnZVNpemUodm1Q YWdlU2l6ZSgpKQogewotICAgIG1hbGxvY19zZXRfem9uZV9uYW1lKG1fem9uZSwgIldlYktpdCBV c2luZyBTeXN0ZW0gTWFsbG9jIik7CisgICAgaWYgKCFzaG91bGRVc2VEZWZhdWx0TWFsbG9jWm9u ZSgpKSB7CisgICAgICAgIG1fem9uZSA9IG1hbGxvY19jcmVhdGVfem9uZSgwLCAwKTsKKyAgICAg ICAgbWFsbG9jX3NldF96b25lX25hbWUobV96b25lLCAiV2ViS2l0IFVzaW5nIFN5c3RlbSBNYWxs b2MiKTsKKyAgICB9CiB9CiAKIHZvaWQqIERlYnVnSGVhcDo6bWFsbG9jKHNpemVfdCBzaXplLCBG YWlsdXJlQWN0aW9uIGFjdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2Mv RW52aXJvbm1lbnQuY3BwIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9FbnZpcm9ubWVudC5jcHAK aW5kZXggNTFlMTcxYjFmMDFmOWVmMzYwODhiMzM4NGFmYTBkYTA3ZmY4MTRhYi4uMjk3MmJkNjU1 M2E2NzU1YTY1MjU2MDkzMTRkODZjMmI4ZTRlZjIxMyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxs b2MvYm1hbGxvYy9FbnZpcm9ubWVudC5jcHAKKysrIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9F bnZpcm9ubWVudC5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgaW50IG1hbGxvY19lbmdhZ2VkX25hbm8o dm9pZCk7CiAKIG5hbWVzcGFjZSBibWFsbG9jIHsKIAotc3RhdGljIGJvb2wgaXNNYWxsb2NFbnZp cm9ubWVudFZhcmlhYmxlU2V0KCkKK3N0YXRpYyBib29sIGlzTWFsbG9jRW52aXJvbm1lbnRWYXJp YWJsZUltcGx5aW5nU3lzdGVtTWFsbG9jU2V0KCkKIHsKICAgICBjb25zdCBjaGFyKiBsaXN0W10g PSB7CiAgICAgICAgICJNYWxsb2MiLApAQCAtNjcsOSArNjcsNyBAQCBzdGF0aWMgYm9vbCBpc01h bGxvY0Vudmlyb25tZW50VmFyaWFibGVTZXQoKQogICAgICAgICAiTWFsbG9jR3VhcmRFZGdlcyIs CiAgICAgICAgICJNYWxsb2NEb05vdFByb3RlY3RQcmVsdWRlIiwKICAgICAgICAgIk1hbGxvY0Rv Tm90UHJvdGVjdFBvc3RsdWRlIiwKLSAgICAgICAgIk1hbGxvY1N0YWNrTG9nZ2luZyIsCiAgICAg ICAgICJNYWxsb2NTdGFja0xvZ2dpbmdOb0NvbXBhY3QiLAotICAgICAgICAiTWFsbG9jU3RhY2tM b2dnaW5nRGlyZWN0b3J5IiwKICAgICAgICAgIk1hbGxvY1NjcmliYmxlIiwKICAgICAgICAgIk1h bGxvY0NoZWNrSGVhcFN0YXJ0IiwKICAgICAgICAgIk1hbGxvY0NoZWNrSGVhcEVhY2giLApAQCAt ODYsNiArODQsMTIgQEAgc3RhdGljIGJvb2wgaXNNYWxsb2NFbnZpcm9ubWVudFZhcmlhYmxlU2V0 KCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAorICAgIC8vIFVzZSBzeXN0ZW0g bWFsbG9jIGFueXRpbWUgTWFsbG9jU3RhY2tMb2dnaW5nIGlzIGVuYWJsZWQsIGV4Y2VwdCB3aGVu IHRoZSAidm0iIG9yICJ2bWxpdGUiIGxvZ2dpbmcgbW9kZXMgYXJlIGVuYWJsZWQuCisgICAgLy8g VGhvc2UgbW9kZXMgb25seSBpbnRlcmNlcHQgc3lzY2FsbHMgcmF0aGVyIHRoYW4gbWFsbG9jcywg c28gdGhleSBkb24ndCBuZWNlc3NhcmlseSBpbXBseSB0aGUgdXNlIG9mIHN5c3RlbSBtYWxsb2Mu CisgICAgY29uc3QgY2hhciogbWFsbG9jU3RhY2tMb2dnaW5nID0gZ2V0ZW52KCJNYWxsb2NTdGFj a0xvZ2dpbmciKTsKKyAgICBpZiAobWFsbG9jU3RhY2tMb2dnaW5nICYmIHN0cm5jbXAobWFsbG9j U3RhY2tMb2dnaW5nLCAidm0iLCAyKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKQEAgLTE2NSw3ICsxNjksNyBAQCBFbnZpcm9ubWVudDo6RW52aXJvbm1l bnQoY29uc3QgTG9ja0hvbGRlciYpCiAKIGJvb2wgRW52aXJvbm1lbnQ6OmNvbXB1dGVJc0RlYnVn SGVhcEVuYWJsZWQoKQogewotICAgIGlmIChpc01hbGxvY0Vudmlyb25tZW50VmFyaWFibGVTZXQo KSkKKyAgICBpZiAoaXNNYWxsb2NFbnZpcm9ubWVudFZhcmlhYmxlSW1wbHlpbmdTeXN0ZW1NYWxs b2NTZXQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgaWYgKGlzTGliZ21hbGxvY0VuYWJs ZWQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7Cg== 449624 2022-01-20 16:48:52 -0800 2022-01-20 18:12:54 -0800 Patch for landing bug-235425-20220120164852.patch text/plain 4479 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggZWYyODdjMzUxYzE5YTRi ZjBjMTNhZTZiMGY2YTI0ZDBjYTMzYTVhYy4uYjg5MTRmMmJlYzQyOTQ5YzUwYzBhOTVkY2Q2OWZm ZGIxOTQ4YjhlZSAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAxLTIwICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgYm1hbGxvYyB3b3JrIGJldHRl ciB3aXRoIHZhcmlvdXMgTWFsbG9jU3RhY2tMb2dnaW5nIG1vZGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0MjUKKworICAgICAgICBSZXZpZXdl ZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIFRoaXMgY29uZGl0aW9uYWxpemVzIHRoZSB3 YXkgc3lzdGVtIG1hbGxvYyBpcyB1c2VkIGRlcGVuZGluZyBvbiB0aGUgZXhhY3QgdmFsdWUgb2Yg dGhlCisgICAgICAgIE1hbGxvY1N0YWNrTG9nZ2luZyBlbnZpcm9ubWVudCB2YXJpYWJsZToKKwor ICAgICAgICAtIElmIHRoZSBtb2RlIGlzICJ2bSIgb3IgInZtbGl0ZSIsIHRoZW4gd2UgZG9uJ3Qg bmVlZCB0byB1c2Ugc3lzdGVtIG1hbGxvYyBhdCBhbGwsIHNpbmNlCisgICAgICAgICAgdGhvc2Ug bG9nZ2luZyBtb2RlcyBvbmx5IGludGVyY2VwdCBzeXNjYWxscy4KKyAgICAgICAgLSBJZiB0aGUg bW9kZSBpcyAibGl0ZSIsIHRoZW4gd2Ugc2hvdWxkIHVzZSB0aGUgZGVmYXVsdCBtYWxsb2Mgem9u ZSAocmF0aGVyIHRoYW4gb3VyIGN1c3RvbQorICAgICAgICAgICJXZWJLaXQgVXNpbmcgU3lzdGVt IE1hbGxvYyIgem9uZSksIHNpbmNlIHRoZSBsaXRlIG1vZGUgb25seSBpbnRlcmNlcHRzIGFsbG9j YXRpb25zIGZyb20KKyAgICAgICAgICB0aGUgZGVmYXVsdCB6b25lLgorCisgICAgICAgIEJlZm9y ZSB0aGlzIGNoYW5nZSwgdGhlIGxpdGUgbW9kZSBkaWRuJ3QgY2FwdHVyZSBibWFsbG9jL0Zhc3RN YWxsb2MgY2FsbHN0YWNrcywgd2hpY2ggbWFkZQorICAgICAgICBpdCBsZXNzIHVzZWZ1bCB0aGFu IGl0IHNob3VsZCBoYXZlIGJlZW4uCisKKyAgICAgICAgKiBibWFsbG9jL0RlYnVnSGVhcC5jcHA6 CisgICAgICAgIChibWFsbG9jOjpzaG91bGRVc2VEZWZhdWx0TWFsbG9jWm9uZSk6CisgICAgICAg IChibWFsbG9jOjpEZWJ1Z0hlYXA6OkRlYnVnSGVhcCk6CisgICAgICAgICogYm1hbGxvYy9FbnZp cm9ubWVudC5jcHA6CisgICAgICAgIChibWFsbG9jOjppc01hbGxvY0Vudmlyb25tZW50VmFyaWFi bGVJbXBseWluZ1N5c3RlbU1hbGxvY1NldCk6CisgICAgICAgIChibWFsbG9jOjpFbnZpcm9ubWVu dDo6Y29tcHV0ZUlzRGVidWdIZWFwRW5hYmxlZCk6CisKIDIwMjItMDEtMTkgIFl1c3VrZSBTdXp1 a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbbGlicGFzXSBEaXNhYmxlIFBBU19B U1NFUlQgb24gRGFyd2luIEFSTTY0IChub3QgaW4gQVJNNjRFKQpkaWZmIC0tZ2l0IGEvU291cmNl L2JtYWxsb2MvYm1hbGxvYy9EZWJ1Z0hlYXAuY3BwIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9E ZWJ1Z0hlYXAuY3BwCmluZGV4IDQ2ZjRkZTliNmExYTIwMDcyNGQzOGYyNTI1ODM0ZmY3ODVmZjZm YWUuLjgxZmIyMTRkMzAxNDBjZmI1YmYyZTk1OTdlNjAzOTFjZTY2NmY3M2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvRGVidWdIZWFwLmNwcAorKysgYi9Tb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL0RlYnVnSGVhcC5jcHAKQEAgLTQ0LDExICs0NCwyNyBAQCBERUZJTkVfU1RBVElD X1BFUl9QUk9DRVNTX1NUT1JBR0UoRGVidWdIZWFwKTsKIAogI2lmIEJPUyhEQVJXSU4pCiAKK3N0 YXRpYyBib29sIHNob3VsZFVzZURlZmF1bHRNYWxsb2Nab25lKCkKK3sKKyAgICBpZiAoZ2V0ZW52 KCJERUJVR19IRUFQX1VTRV9ERUZBVUxUX1pPTkUiKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisK KyAgICAvLyBUaGUgbGl0ZSBsb2dnaW5nIG1vZGUgb25seSBpbnRlcmNlcHRzIGFsbG9jYXRpb25z IGZyb20gdGhlIGRlZmF1bHQgem9uZS4KKyAgICBjb25zdCBjaGFyKiBtYWxsb2NTdGFja0xvZ2dp bmcgPSBnZXRlbnYoIk1hbGxvY1N0YWNrTG9nZ2luZyIpOworICAgIGlmIChtYWxsb2NTdGFja0xv Z2dpbmcgJiYgIXN0cmNtcChtYWxsb2NTdGFja0xvZ2dpbmcsICJsaXRlIikpCisgICAgICAgIHJl dHVybiB0cnVlOworCisgICAgcmV0dXJuIGZhbHNlOworfQorCiBEZWJ1Z0hlYXA6OkRlYnVnSGVh cChjb25zdCBMb2NrSG9sZGVyJikKLSAgICA6IG1fem9uZShtYWxsb2NfY3JlYXRlX3pvbmUoMCwg MCkpCisgICAgOiBtX3pvbmUobWFsbG9jX2RlZmF1bHRfem9uZSgpKQogICAgICwgbV9wYWdlU2l6 ZSh2bVBhZ2VTaXplKCkpCiB7Ci0gICAgbWFsbG9jX3NldF96b25lX25hbWUobV96b25lLCAiV2Vi S2l0IFVzaW5nIFN5c3RlbSBNYWxsb2MiKTsKKyAgICBpZiAoIXNob3VsZFVzZURlZmF1bHRNYWxs b2Nab25lKCkpIHsKKyAgICAgICAgbV96b25lID0gbWFsbG9jX2NyZWF0ZV96b25lKDAsIDApOwor ICAgICAgICBtYWxsb2Nfc2V0X3pvbmVfbmFtZShtX3pvbmUsICJXZWJLaXQgVXNpbmcgU3lzdGVt IE1hbGxvYyIpOworICAgIH0KIH0KIAogdm9pZCogRGVidWdIZWFwOjptYWxsb2Moc2l6ZV90IHNp emUsIEZhaWx1cmVBY3Rpb24gYWN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1h bGxvYy9FbnZpcm9ubWVudC5jcHAgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0Vudmlyb25tZW50 LmNwcAppbmRleCA1MWUxNzFiMWYwMWY5ZWYzNjA4OGIzMzg0YWZhMGRhMDdmZjgxNGFiLi4yOTcy YmQ2NTUzYTY3NTVhNjUyNTYwOTMxNGQ4NmMyYjhlNGVmMjEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv Ym1hbGxvYy9ibWFsbG9jL0Vudmlyb25tZW50LmNwcAorKysgYi9Tb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0Vudmlyb25tZW50LmNwcApAQCAtNTksNyArNTksNyBAQCBpbnQgbWFsbG9jX2VuZ2FnZWRf bmFubyh2b2lkKTsKIAogbmFtZXNwYWNlIGJtYWxsb2MgewogCi1zdGF0aWMgYm9vbCBpc01hbGxv Y0Vudmlyb25tZW50VmFyaWFibGVTZXQoKQorc3RhdGljIGJvb2wgaXNNYWxsb2NFbnZpcm9ubWVu dFZhcmlhYmxlSW1wbHlpbmdTeXN0ZW1NYWxsb2NTZXQoKQogewogICAgIGNvbnN0IGNoYXIqIGxp c3RbXSA9IHsKICAgICAgICAgIk1hbGxvYyIsCkBAIC02Nyw5ICs2Nyw3IEBAIHN0YXRpYyBib29s IGlzTWFsbG9jRW52aXJvbm1lbnRWYXJpYWJsZVNldCgpCiAgICAgICAgICJNYWxsb2NHdWFyZEVk Z2VzIiwKICAgICAgICAgIk1hbGxvY0RvTm90UHJvdGVjdFByZWx1ZGUiLAogICAgICAgICAiTWFs bG9jRG9Ob3RQcm90ZWN0UG9zdGx1ZGUiLAotICAgICAgICAiTWFsbG9jU3RhY2tMb2dnaW5nIiwK ICAgICAgICAgIk1hbGxvY1N0YWNrTG9nZ2luZ05vQ29tcGFjdCIsCi0gICAgICAgICJNYWxsb2NT dGFja0xvZ2dpbmdEaXJlY3RvcnkiLAogICAgICAgICAiTWFsbG9jU2NyaWJibGUiLAogICAgICAg ICAiTWFsbG9jQ2hlY2tIZWFwU3RhcnQiLAogICAgICAgICAiTWFsbG9jQ2hlY2tIZWFwRWFjaCIs CkBAIC04Niw2ICs4NCwxMiBAQCBzdGF0aWMgYm9vbCBpc01hbGxvY0Vudmlyb25tZW50VmFyaWFi bGVTZXQoKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCisgICAgLy8gVXNlIHN5 c3RlbSBtYWxsb2MgYW55dGltZSBNYWxsb2NTdGFja0xvZ2dpbmcgaXMgZW5hYmxlZCwgZXhjZXB0 IHdoZW4gdGhlICJ2bSIgb3IgInZtbGl0ZSIgbG9nZ2luZyBtb2RlcyBhcmUgZW5hYmxlZC4KKyAg ICAvLyBUaG9zZSBtb2RlcyBvbmx5IGludGVyY2VwdCBzeXNjYWxscyByYXRoZXIgdGhhbiBtYWxs b2NzLCBzbyB0aGV5IGRvbid0IG5lY2Vzc2FyaWx5IGltcGx5IHRoZSB1c2Ugb2Ygc3lzdGVtIG1h bGxvYy4KKyAgICBjb25zdCBjaGFyKiBtYWxsb2NTdGFja0xvZ2dpbmcgPSBnZXRlbnYoIk1hbGxv Y1N0YWNrTG9nZ2luZyIpOworICAgIGlmIChtYWxsb2NTdGFja0xvZ2dpbmcgJiYgc3RybmNtcCht YWxsb2NTdGFja0xvZ2dpbmcsICJ2bSIsIDIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAg IHJldHVybiBmYWxzZTsKIH0KIApAQCAtMTY1LDcgKzE2OSw3IEBAIEVudmlyb25tZW50OjpFbnZp cm9ubWVudChjb25zdCBMb2NrSG9sZGVyJikKIAogYm9vbCBFbnZpcm9ubWVudDo6Y29tcHV0ZUlz RGVidWdIZWFwRW5hYmxlZCgpCiB7Ci0gICAgaWYgKGlzTWFsbG9jRW52aXJvbm1lbnRWYXJpYWJs ZVNldCgpKQorICAgIGlmIChpc01hbGxvY0Vudmlyb25tZW50VmFyaWFibGVJbXBseWluZ1N5c3Rl bU1hbGxvY1NldCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBpZiAoaXNMaWJnbWFsbG9j RW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsK