219853 2020-12-14 07:11:18 -0800 Remove FrameLoader::cancelAndClear 2020-12-17 14:11:42 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis achristensen beidson cdumez ews-watchlist japhet webkit-bug-importer oldest_to_newest 1714434 0 rbuis 2020-12-14 07:11:18 -0800 Remove FrameLoader::cancelAndClear. 1714435 1 416154 rbuis 2020-12-14 07:19:53 -0800 Created attachment 416154 Patch 1714531 2 416154 achristensen 2020-12-14 11:56:11 -0800 Comment on attachment 416154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416154&action=review > Source/WebCore/page/Frame.h:340 > + FrameLoader* m_loader; We don't want to increase the storage of raw pointers. This is how use-after-free bugs arise. 1714747 3 416245 rbuis 2020-12-15 07:46:03 -0800 Created attachment 416245 Patch 1714930 4 416154 rbuis 2020-12-15 14:25:47 -0800 Comment on attachment 416154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416154&action=review >> Source/WebCore/page/Frame.h:340 >> + FrameLoader* m_loader; > > We don't want to increase the storage of raw pointers. This is how use-after-free bugs arise. That is a good rule. It is just a pity that the smart pointers do not work well in this case, i.e call the destructor but keep the inner raw pointer around while the destructor is in process. Anyway, I found an alternative approach. 1715031 5 ews-feeder 2020-12-15 23:34:03 -0800 Committed r270881: <https://trac.webkit.org/changeset/270881> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416245. 1715540 6 webkit-bug-importer 2020-12-17 14:11:42 -0800 <rdar://problem/72440511> 416154 2020-12-14 07:19:53 -0800 2020-12-15 07:45:55 -0800 Patch bug-219853-20201214161951.patch text/plain 5332 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNjODk1MDM5YmI4YWRm OTgyYTY3OWU2OWYyMTYyNTYwYzI5ZGFjZC4uMjA1OGYxNjBmYzgwZGMwZjUxYTk4OTA3YmZhZjhh MzJmNmQ1MzI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjpj YW5jZWxBbmRDbGVhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2luY2UgdGhpcyBmdW5jdGlvbmFsaXR5IGlzIG9ubHkgY2FsbGVkIGF0IEZyYW1lIGRl c3RydWN0b3IKKyAgICAgICAgdGltZSwgd2UgY2FuIG1vdmUgdGhlIGNvZGUgdG8gdGhlIEZyYW1l TG9hZGVyIGRlc3RydWN0b3IuIE5vdGUKKyAgICAgICAgaG93ZXZlciB0aGF0IGl0IGlzIG5lZWRl ZCB0byBtYWtlIG1fbG9hZGVyIGEgcmF3IHBvaW50ZXIgc2luY2UKKyAgICAgICAgRnJhbWVMb2Fk ZXIgZGVzdHJ1Y3RvciB3aWxsIHJlbHkgb24gZnJhbWUtPmxvYWRlcigpIHRvIGJlIHZhbGlkLgor CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyOjp+RnJhbWVMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6 OmNhbmNlbEFuZENsZWFyKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu aDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpG cmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6fkZyYW1lKToKKyAgICAgICAgKiBwYWdl L0ZyYW1lLmg6CisKIDIwMjAtMTItMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtJRkNdIFJlbW92ZSByZWR1bmRhbnQgTGluZTo6bGluZUxvZ2ljYWxM ZWZ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkMThmNWE3N2ZlZTI0 MGVhYWE1ZjRiNTQxYTk5ZDdhODVjNjRlZGI4Li4yYzA0NjVmZmNmMTMyMjNhNmZkYThkMmQ2NmM1 M2VhYmFiMjRkMjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTMy MCw2ICszMjAsMTQgQEAgRnJhbWVMb2FkZXI6OkZyYW1lTG9hZGVyKEZyYW1lJiBmcmFtZSwgVW5p cXVlUmVmPEZyYW1lTG9hZGVyQ2xpZW50PiYmIGNsaWVudCkKIAogRnJhbWVMb2FkZXI6On5GcmFt ZUxvYWRlcigpCiB7CisgICAgbV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuY2FuY2VsKCk7 CisKKyAgICBpZiAoIW1faXNDb21wbGV0ZSkKKyAgICAgICAgY2xvc2VVUkwoKTsKKworICAgIGNs ZWFyKG1fZnJhbWUuZG9jdW1lbnQoKSwgZmFsc2UpOworICAgIG1fZnJhbWUuc2NyaXB0KCkudXBk YXRlUGxhdGZvcm1TY3JpcHRPYmplY3RzKCk7CisKICAgICBzZXRPcGVuZXIobnVsbHB0cik7CiAg ICAgZGV0YWNoRnJvbUFsbE9wZW5lZEZyYW1lcygpOwogCkBAIC02MjIsMTggKzYzMCw2IEBAIHZv aWQgRnJhbWVMb2FkZXI6OmRpZEV4cGxpY2l0T3BlbigpCiAgICAgbV9mcmFtZS5uYXZpZ2F0aW9u U2NoZWR1bGVyKCkuY2FuY2VsKCk7CiB9CiAKLQotdm9pZCBGcmFtZUxvYWRlcjo6Y2FuY2VsQW5k Q2xlYXIoKQotewotICAgIG1fZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLmNhbmNlbCgpOwot Ci0gICAgaWYgKCFtX2lzQ29tcGxldGUpCi0gICAgICAgIGNsb3NlVVJMKCk7Ci0KLSAgICBjbGVh cihtX2ZyYW1lLmRvY3VtZW50KCksIGZhbHNlKTsKLSAgICBtX2ZyYW1lLnNjcmlwdCgpLnVwZGF0 ZVBsYXRmb3JtU2NyaXB0T2JqZWN0cygpOwotfQotCiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxk Q2xlYXJXaW5kb3dOYW1lKGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgRG9jdW1lbnQmIG5ld0Rv Y3VtZW50KQogewogICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKaW5kZXggYzJmNjM5YWNlZjhlYzM0MzY5NTU1YTkzMTdlZDY5MjgyNDJl N2JiNi4uZGYyNzk2YjMzODE1NjRjYTdiZjM2NTJkZTNhMjc4YThkYjU0MDlkYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTE1NCw3ICsxNTQsNiBAQCBwdWJsaWM6CiAgICAg dm9pZCBzdG9wKCk7CiAgICAgdm9pZCBzdG9wTG9hZGluZyhVbmxvYWRFdmVudFBvbGljeSk7CiAg ICAgdm9pZCBjbG9zZVVSTCgpOwotICAgIHZvaWQgY2FuY2VsQW5kQ2xlYXIoKTsKICAgICAvLyBG SVhNRTogY2xlYXIoKSBpcyB0cnlpbmcgdG8gZG8gdG9vIG1hbnkgdGhpbmdzLiBXZSBzaG91bGQg YnJlYWsgaXQgZG93biBpbnRvIHNtYWxsZXIgZnVuY3Rpb25zIChpZGVhbGx5IHdpdGggZmV3ZXIg cmF3IEJvb2xlYW4gcGFyYW1ldGVycykuCiAgICAgdm9pZCBjbGVhcihEb2N1bWVudCogbmV3RG9j dW1lbnQsIGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzID0gdHJ1ZSwgYm9vbCBjbGVhclNjcmlw dE9iamVjdHMgPSB0cnVlLCBib29sIGNsZWFyRnJhbWVWaWV3ID0gdHJ1ZSwgV1RGOjpGdW5jdGlv bjx2b2lkKCk+JiYgaGFuZGxlRE9NV2luZG93Q3JlYXRpb24gPSBudWxscHRyKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lLmNwcAppbmRleCA2MmE0MDU0YjJkY2Y0OGNjNjg0NTBlYmUwNGNkYzQzNjZlM2YzZmNl Li41OGE4OTM4ZDE5YmY5MWVkYjkxMjVkZTdjNmE3MjE1YjA0Yzg2OWE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lLmNwcApAQCAtMTUxLDcgKzE1MSw3IEBAIEZyYW1lOjpGcmFtZShQYWdlJiBwYWdlLCBIVE1M RnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwgVW5pcXVlUmVmPEZyYW1lTG9hCiAgICAg LCBtX3BhZ2UobWFrZVdlYWtQdHIocGFnZSkpCiAgICAgLCBtX3NldHRpbmdzKCZwYWdlLnNldHRp bmdzKCkpCiAgICAgLCBtX3RyZWVOb2RlKCp0aGlzLCBwYXJlbnRGcm9tT3duZXJFbGVtZW50KG93 bmVyRWxlbWVudCkpCi0gICAgLCBtX2xvYWRlcihtYWtlVW5pcXVlUmVmPEZyYW1lTG9hZGVyPigq dGhpcywgV1RGTW92ZShmcmFtZUxvYWRlckNsaWVudCkpKQorICAgICwgbV9sb2FkZXIobmV3IEZy YW1lTG9hZGVyKCp0aGlzLCBXVEZNb3ZlKGZyYW1lTG9hZGVyQ2xpZW50KSkpCiAgICAgLCBtX25h dmlnYXRpb25TY2hlZHVsZXIobWFrZVVuaXF1ZVJlZjxOYXZpZ2F0aW9uU2NoZWR1bGVyPigqdGhp cykpCiAgICAgLCBtX293bmVyRWxlbWVudChtYWtlV2Vha1B0cihvd25lckVsZW1lbnQpKQogICAg ICwgbV9zY3JpcHQobWFrZVVuaXF1ZVJlZjxTY3JpcHRDb250cm9sbGVyPigqdGhpcykpCkBAIC0x OTAsNyArMTkwLDggQEAgUmVmPEZyYW1lPiBGcmFtZTo6Y3JlYXRlKFBhZ2UqIHBhZ2UsIEhUTUxG cmFtZU93bmVyRWxlbWVudCogb3duZXJFbGVtZW50LCBVbmlxdWUKIEZyYW1lOjp+RnJhbWUoKQog ewogICAgIHNldFZpZXcobnVsbHB0cik7Ci0gICAgbG9hZGVyKCkuY2FuY2VsQW5kQ2xlYXIoKTsK KyAgICBkZWxldGUgbV9sb2FkZXI7CisgICAgbV9sb2FkZXIgPSBudWxscHRyOwogCiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBub3QgYmUgZG9pbmcgYWxsIHRoaXMgd29yayBpbnNpZGUgdGhlIGRl c3RydWN0b3IKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCmluZGV4IGM4ZjFjNTc1M2JmY2Y5NGJiYTcwMGJiNmEy MmFmNTc4MGQxY2Y5MTMuLmNlYWNlNTFiMWRkM2UyMTkzMWM2N2E4MTA3NGQ5Yzg4NDhkMGRiOGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lLmgKQEAgLTE2OCw4ICsxNjgsOCBAQCBwdWJsaWM6CiAgICAgY29uc3Qg RWRpdG9yJiBlZGl0b3IoKSBjb25zdCB7IHJldHVybiBkb2N1bWVudCgpLT5lZGl0b3IoKTsgfQog ICAgIEV2ZW50SGFuZGxlciYgZXZlbnRIYW5kbGVyKCkgeyByZXR1cm4gbV9ldmVudEhhbmRsZXI7 IH0KICAgICBjb25zdCBFdmVudEhhbmRsZXImIGV2ZW50SGFuZGxlcigpIGNvbnN0IHsgcmV0dXJu IG1fZXZlbnRIYW5kbGVyOyB9Ci0gICAgY29uc3QgRnJhbWVMb2FkZXImIGxvYWRlcigpIGNvbnN0 IHsgcmV0dXJuIG1fbG9hZGVyLmdldCgpOyB9Ci0gICAgRnJhbWVMb2FkZXImIGxvYWRlcigpIHsg cmV0dXJuIG1fbG9hZGVyLmdldCgpOyB9CisgICAgY29uc3QgRnJhbWVMb2FkZXImIGxvYWRlcigp IGNvbnN0IHsgcmV0dXJuICptX2xvYWRlcjsgfQorICAgIEZyYW1lTG9hZGVyJiBsb2FkZXIoKSB7 IHJldHVybiAqbV9sb2FkZXI7IH0KICAgICBOYXZpZ2F0aW9uU2NoZWR1bGVyJiBuYXZpZ2F0aW9u U2NoZWR1bGVyKCkgY29uc3Q7CiAgICAgRnJhbWVTZWxlY3Rpb24mIHNlbGVjdGlvbigpIHsgcmV0 dXJuIGRvY3VtZW50KCktPnNlbGVjdGlvbigpOyB9CiAgICAgY29uc3QgRnJhbWVTZWxlY3Rpb24m IHNlbGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIGRvY3VtZW50KCktPnNlbGVjdGlvbigpOyB9CkBA IC0zMzcsNyArMzM3LDcgQEAgcHJpdmF0ZToKICAgICBXZWFrUHRyPFBhZ2U+IG1fcGFnZTsKICAg ICBjb25zdCBSZWZQdHI8U2V0dGluZ3M+IG1fc2V0dGluZ3M7CiAgICAgbXV0YWJsZSBGcmFtZVRy ZWUgbV90cmVlTm9kZTsKLSAgICBVbmlxdWVSZWY8RnJhbWVMb2FkZXI+IG1fbG9hZGVyOworICAg IEZyYW1lTG9hZGVyKiBtX2xvYWRlcjsKICAgICBtdXRhYmxlIFVuaXF1ZVJlZjxOYXZpZ2F0aW9u U2NoZWR1bGVyPiBtX25hdmlnYXRpb25TY2hlZHVsZXI7CiAKICAgICBXZWFrUHRyPEhUTUxGcmFt ZU93bmVyRWxlbWVudD4gbV9vd25lckVsZW1lbnQ7Cg== 416245 2020-12-15 07:46:03 -0800 2020-12-15 23:34:03 -0800 Patch bug-219853-20201215164600.patch text/plain 3044 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkwM2U4ZmM2MmE1ZDA3 NmI2MWU3ZjliNDYxMDkzYTA4NTEzYTY1My4uOThkODE5OTNjZTdmZGJhNzRmMWNiMTFmMzljZjll MTUyYjkzNDkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTE1ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjpj YW5jZWxBbmRDbGVhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2luY2UgdGhpcyBmdW5jdGlvbmFsaXR5IGlzIG9ubHkgY2FsbGVkIGF0IEZyYW1lIGRl c3RydWN0b3IKKyAgICAgICAgdGltZSwgd2UgY2FuIG1vdmUgdGhlIGNvZGUgdG8gdGhhdCBkZXN0 cnVjdG9yLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyOjpjYW5jZWxBbmRDbGVhcik6IERlbGV0ZWQuCisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZTo6fkZyYW1lKToKKwogMjAyMC0xMi0xNCAgQ2hyaXMgRmxlaXphY2gg IDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBpbXBsZW1lbnQgcHJlZmVycy1j b250cmFzdDogbW9yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZDQ2 ZjgyYjgwNjJlZDQwNDA5YTVlNjJhYmJmMjU0MjE2YmE2NzU1OC4uOGIxN2NmNjI5Y2RlMTg0ZjM2 Yjk2Nzg2YTBiYTJkZDJkYmJmZTUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC02MjMsMTggKzYyMyw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRpZEV4cGxpY2l0T3Bl bigpCiAgICAgbV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuY2FuY2VsKCk7CiB9CiAKLQot dm9pZCBGcmFtZUxvYWRlcjo6Y2FuY2VsQW5kQ2xlYXIoKQotewotICAgIG1fZnJhbWUubmF2aWdh dGlvblNjaGVkdWxlcigpLmNhbmNlbCgpOwotCi0gICAgaWYgKCFtX2lzQ29tcGxldGUpCi0gICAg ICAgIGNsb3NlVVJMKCk7Ci0KLSAgICBjbGVhcihtX2ZyYW1lLmRvY3VtZW50KCksIGZhbHNlKTsK LSAgICBtX2ZyYW1lLnNjcmlwdCgpLnVwZGF0ZVBsYXRmb3JtU2NyaXB0T2JqZWN0cygpOwotfQot CiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkQ2xlYXJXaW5kb3dOYW1lKGNvbnN0IEZyYW1lJiBm cmFtZSwgY29uc3QgRG9jdW1lbnQmIG5ld0RvY3VtZW50KQogewogICAgIGlmICghZnJhbWUuaXNN YWluRnJhbWUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggOWJlYTZiNWZh NDc4ODk4YzViN2RhZTNlZmRlZDM4NDQyZDE5Y2M5YS4uZDNmOTViMWU3NmEzZjU5ZjE4NjcyYzdm ZGI5ODE4NTQ3ZmFmZmRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTE1 Miw3ICsxNTIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdG9wKCk7CiAgICAgdm9pZCBzdG9wTG9h ZGluZyhVbmxvYWRFdmVudFBvbGljeSk7CiAgICAgdm9pZCBjbG9zZVVSTCgpOwotICAgIHZvaWQg Y2FuY2VsQW5kQ2xlYXIoKTsKICAgICAvLyBGSVhNRTogY2xlYXIoKSBpcyB0cnlpbmcgdG8gZG8g dG9vIG1hbnkgdGhpbmdzLiBXZSBzaG91bGQgYnJlYWsgaXQgZG93biBpbnRvIHNtYWxsZXIgZnVu Y3Rpb25zIChpZGVhbGx5IHdpdGggZmV3ZXIgcmF3IEJvb2xlYW4gcGFyYW1ldGVycykuCiAgICAg dm9pZCBjbGVhcihEb2N1bWVudCogbmV3RG9jdW1lbnQsIGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0 aWVzID0gdHJ1ZSwgYm9vbCBjbGVhclNjcmlwdE9iamVjdHMgPSB0cnVlLCBib29sIGNsZWFyRnJh bWVWaWV3ID0gdHJ1ZSwgV1RGOjpGdW5jdGlvbjx2b2lkKCk+JiYgaGFuZGxlRE9NV2luZG93Q3Jl YXRpb24gPSBudWxscHRyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCA2MmE0MDU0YjJkY2Y0 OGNjNjg0NTBlYmUwNGNkYzQzNjZlM2YzZmNlLi4yNWJlZDMxZGEzOWNjNjU5ZjgyNTVjYTAxMzgy NTJiZTExMWM5NTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTkwLDcgKzE5MCwxMyBAQCBS ZWY8RnJhbWU+IEZyYW1lOjpjcmVhdGUoUGFnZSogcGFnZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50 KiBvd25lckVsZW1lbnQsIFVuaXF1ZQogRnJhbWU6On5GcmFtZSgpCiB7CiAgICAgc2V0Vmlldyhu dWxscHRyKTsKLSAgICBsb2FkZXIoKS5jYW5jZWxBbmRDbGVhcigpOworICAgIG5hdmlnYXRpb25T Y2hlZHVsZXIoKS5jYW5jZWwoKTsKKworICAgIGlmICghbG9hZGVyKCkuaXNDb21wbGV0ZSgpKQor ICAgICAgICBsb2FkZXIoKS5jbG9zZVVSTCgpOworCisgICAgbG9hZGVyKCkuY2xlYXIoZG9jdW1l bnQoKSwgZmFsc2UpOworICAgIHNjcmlwdCgpLnVwZGF0ZVBsYXRmb3JtU2NyaXB0T2JqZWN0cygp OwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBub3QgYmUgZG9pbmcgYWxsIHRoaXMgd29yayBp bnNpZGUgdGhlIGRlc3RydWN0b3IKIAo=