147124 2015-07-20 14:56:18 -0700 Fix crash due to RemoteLayerTreeDisplayRefreshMonitor outliving RemoteLayerTreeDrawingArea 2015-07-20 17:24:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P1 Normal --- 1 wenson_hsieh webkit-unassigned commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1110770 0 wenson_hsieh 2015-07-20 14:56:18 -0700 On occasion, a RemoteLayerTreeDrawingArea may be outlived by one or more of its RemoteLayerTreeDisplayRefreshMonitors. Upon destruction of the RemoteLayerTreeDisplayRefreshMonitor, this may cause the monitor to access a method of its drawing area, which has been deallocated. This results in a crash. 1110783 1 wenson_hsieh 2015-07-20 15:26:45 -0700 <rdar://problem/21582858> 1110790 2 257135 wenson_hsieh 2015-07-20 15:35:04 -0700 Created attachment 257135 Patch 1110794 3 257135 simon.fraser 2015-07-20 15:44:38 -0700 Comment on attachment 257135 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257135&action=review > Source/WebKit2/WebProcess/WebPage/Cocoa/RemoteLayerTreeDisplayRefreshMonitor.mm:78 > +void RemoteLayerTreeDisplayRefreshMonitor::clearDrawingArea() > +{ > + m_drawingArea = nullptr; > +} You don't need this. The WeakPtr does this for you. > Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:95 > + for (RemoteLayerTreeDisplayRefreshMonitor* monitor : m_displayRefreshMonitors) > + monitor->clearDrawingArea(); This is not needed. 1110798 4 257135 wenson_hsieh 2015-07-20 16:00:59 -0700 Comment on attachment 257135 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257135&action=review >> Source/WebKit2/WebProcess/WebPage/Cocoa/RemoteLayerTreeDisplayRefreshMonitor.mm:78 >> +} > > You don't need this. The WeakPtr does this for you. Fixed! >> Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:95 >> + monitor->clearDrawingArea(); > > This is not needed. Got it -- fixed! 1110799 5 257139 wenson_hsieh 2015-07-20 16:02:14 -0700 Created attachment 257139 Patch 1110814 6 wenson_hsieh 2015-07-20 16:35:07 -0700 From the ChangeLog: logically, a RemoteLayerTreeDrawingArea should always outlive its refresh monitors. Refer to https://bugs.webkit.org/show_bug.cgi?id=147128 for more details. 1110841 7 257139 commit-queue 2015-07-20 17:24:23 -0700 Comment on attachment 257139 Patch Clearing flags on attachment: 257139 Committed r187050: <http://trac.webkit.org/changeset/187050> 1110842 8 commit-queue 2015-07-20 17:24:26 -0700 All reviewed patches have been landed. Closing bug. 257135 2015-07-20 15:35:04 -0700 2015-07-20 16:02:10 -0700 Patch bug-147124-20150720153350.patch text/plain 6610 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjdlNTgxMzg4ODY5NmYx ZTI2YWQ4N2U1ZjA1NjY0NjBjYjI4MjMzNS4uZTMxZTkwNzNiNTkyZGYzMGM3YWY0ZTBmYzU0NTEw NjI5MGZlZTFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA3LTIwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBjcmFzaCBk dWUgdG8gUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yIG91dGxpdmluZyBSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ3MTI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTU4Mjg1OD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWZhY3Rv cnMgUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yIHRvIHVzZSBhIHdlYWsgcG9p bnRlciByYXRoZXIgdGhhbiBhIHJlZmVyZW5jZQorICAgICAgICB0byBpdHMgUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEsIHNpbmNlIHRoZSBkcmF3aW5nIGFyZWEgbWF5IGJlIGRlYWxsb2NhdGVk IGJlZm9yZSB0aGUgbW9uaXRvcgorICAgICAgICBpbiBzb21lIHJhcmUgY2FzZXMuIFRoaXMgcmFy ZWx5IGNhdXNlZCBwYWdlcyB1c2luZyByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgdG8gY3Jhc2ggb24g aU9TLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1JlbW90ZUxheWVyVHJl ZURpc3BsYXlSZWZyZXNoTW9uaXRvci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9D b2NvYS9SZW1vdGVMYXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3IubW06CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvcjo6UmVtb3RlTGF5ZXJU cmVlRGlzcGxheVJlZnJlc2hNb25pdG9yKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJU cmVlRGlzcGxheVJlZnJlc2hNb25pdG9yOjp+UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hN b25pdG9yKTogT24gZGVzdHJ1Y3Rpb24sIGNoZWNrcworICAgICAgICAgICAgZmlyc3QgdG8gc2Vl IHdoZXRoZXIgb3Igbm90IHRoZSBkcmF3aW5nIGFyZWEgaGFzIGJlZW4gZGVhbGxvY2F0ZWQgYmVm b3JlIHRlbGxpbmcgaXQgdG8gdXBkYXRlIGl0cyBtb25pdG9ycy4KKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yOjpyZXF1ZXN0UmVmcmVzaENhbGxi YWNrKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25p dG9yOjpjbGVhckRyYXdpbmdBcmVhKTogQ2xlYXJzIHRoZSB3ZWFrIHBvaW50ZXIgdG8gdGhlIGRy YXdpbmcgYXJlYS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhOjpjcmVhdGVXZWFrUHRyKTogQ3JlYXRlcyBhbmQgcmV0dXJucyBhIG5ldyB3ZWFrIHBv aW50ZXIgdG8gaXRzZWxmLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjp+UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEpOiBVcG9uIGRlc3RydWN0aW9uLCB0ZWxscyBhbGwgaXRzIGFzc29jaWF0ZWQKKyAgICAgICAg ICAgIG1vbml0b3JzIHRvIGNsZWFyIHRoZWlyIHdlYWsgcG9pbnRlcnMgdG8gaXRzZWxmLgorCiAy MDE1LTA3LTIwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbU2VjY29tcF0gU2hvdWxkIGJlIGVhc2llciB0byBkZWJ1ZyBibG9ja2VkIHN5c2Nh bGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2Ev UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25p dG9yLmgKaW5kZXggMzFmN2MyNGYxYzZhOGI1NDUxMDA0MGU4MjBhMGIwZTEzMWI5YjQ4ZC4uZTNh OWJjNDMzODEwOWZjMjU1YTFkOGFjYmNmMzAxNzQ2NDNkNWY3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1JlbW90ZUxheWVyVHJlZURpc3BsYXlS ZWZyZXNoTW9uaXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9D b2NvYS9SZW1vdGVMYXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3IuaApAQCAtNDUsMTEgKzQ1 LDEzIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcmVxdWVzdFJlZnJlc2hDYWxsYmFjaygp IG92ZXJyaWRlOwogCiAgICAgdm9pZCBkaWRVcGRhdGVMYXllcnMoKTsKKyAgICAKKyAgICB2b2lk IGNsZWFyRHJhd2luZ0FyZWEoKTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBSZW1vdGVMYXll clRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3IoUGxhdGZvcm1EaXNwbGF5SUQsIFJlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhJik7CiAKLSAgICBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSYgbV9k cmF3aW5nQXJlYTsKKyAgICBXZWFrUHRyPFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhPiBtX2Ry YXdpbmdBcmVhOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0NvY29hL1JlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvci5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9SZW1vdGVMYXllclRyZWVE aXNwbGF5UmVmcmVzaE1vbml0b3IubW0KaW5kZXggZTRjNjRjNDk4MTgxOWE5N2ZjYWM1NTI0NjZk MjRhZTQ5MDJkN2JjYi4uMjY3Yzk2Yjg5MzM1NzliYWY2MTE3YzIzZDYzM2E2ZjhlYzQ0NzAwOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1JlbW90 ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25p dG9yLm1tCkBAIC0zNiwyMiArMzYsMjMgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIFJlbW90ZUxh eWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvcjo6UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJl c2hNb25pdG9yKFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJRCwgUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEmIGRyYXdpbmdBcmVhKQogICAgIDogRGlzcGxheVJlZnJlc2hNb25pdG9yKGRpc3Bs YXlJRCkKLSAgICAsIG1fZHJhd2luZ0FyZWEoZHJhd2luZ0FyZWEpCisgICAgLCBtX2RyYXdpbmdB cmVhKGRyYXdpbmdBcmVhLmNyZWF0ZVdlYWtQdHIoKSkKIHsKIH0KIAogUmVtb3RlTGF5ZXJUcmVl RGlzcGxheVJlZnJlc2hNb25pdG9yOjp+UmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25p dG9yKCkKIHsKLSAgICBtX2RyYXdpbmdBcmVhLndpbGxEZXN0cm95RGlzcGxheVJlZnJlc2hNb25p dG9yKHRoaXMpOworICAgIGlmIChtX2RyYXdpbmdBcmVhKQorICAgICAgICBtX2RyYXdpbmdBcmVh LT53aWxsRGVzdHJveURpc3BsYXlSZWZyZXNoTW9uaXRvcih0aGlzKTsKIH0KIAogYm9vbCBSZW1v dGVMYXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3I6OnJlcXVlc3RSZWZyZXNoQ2FsbGJhY2so KQogewotICAgIGlmICghaXNBY3RpdmUoKSkKKyAgICBpZiAoIW1fZHJhd2luZ0FyZWEgfHwgIWlz QWN0aXZlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghaXNTY2hlZHVsZWQo KSkKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWEmPihtX2RyYXdpbmdBcmVhKS5zY2hl ZHVsZUNvbXBvc2l0aW5nTGF5ZXJGbHVzaCgpOworICAgICAgICBzdGF0aWNfY2FzdDxEcmF3aW5n QXJlYSY+KCptX2RyYXdpbmdBcmVhLmdldCgpKS5zY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJGbHVz aCgpOwogCiAgICAgc2V0SXNBY3RpdmUodHJ1ZSk7CiAgICAgc2V0SXNTY2hlZHVsZWQodHJ1ZSk7 CkBAIC03MCw2ICs3MSwxMSBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9u aXRvcjo6ZGlkVXBkYXRlTGF5ZXJzKCkKIAogICAgIGhhbmRsZURpc3BsYXlSZWZyZXNoZWROb3Rp ZmljYXRpb25Pbk1haW5UaHJlYWQodGhpcyk7CiB9CisgICAgCit2b2lkIFJlbW90ZUxheWVyVHJl ZURpc3BsYXlSZWZyZXNoTW9uaXRvcjo6Y2xlYXJEcmF3aW5nQXJlYSgpCit7CisgICAgbV9kcmF3 aW5nQXJlYSA9IG51bGxwdHI7Cit9CiAKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYS5oCmluZGV4IDA2ODhhMDM5ZTlhMjIxMzI3ZGU1NzI0NzFmYTg4OGQyYTBhZjIzYTguLjQy NGI5MmIxNTEwMTFkYTljODA5NWY0NTlhMTVmOTk1MWU0MjM1YTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhLmgKQEAgLTU2LDYgKzU2LDggQEAgcHVibGljOgogCiAgICAgdWlu dDY0X3QgbmV4dFRyYW5zYWN0aW9uSUQoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRUcmFuc2Fj dGlvbklEICsgMTsgfQogCisgICAgV2Vha1B0cjxSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYT4g Y3JlYXRlV2Vha1B0cigpIHsgcmV0dXJuIG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigp OyB9CisgICAgCiBwcml2YXRlOgogICAgIC8vIERyYXdpbmdBcmVhCiAgICAgdmlydHVhbCB2b2lk IHNldE5lZWRzRGlzcGxheSgpIG92ZXJyaWRlOwpAQCAtMTY2LDYgKzE2OCw4IEBAIHByaXZhdGU6 CiAKICAgICBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBtX2NvbnRlbnRMYXllcjsKICAgICBXZWJD b3JlOjpHcmFwaGljc0xheWVyKiBtX3ZpZXdPdmVybGF5Um9vdExheWVyOworICAgIAorICAgIFdl YWtQdHJGYWN0b3J5PFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhPiBtX3dlYWtQdHJGYWN0b3J5 OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYS5tbQppbmRleCA4MjEyZjVmOGUzZDhiMDQ4M2QyODg5OGNjYzg0NDk1MDlhZTMyYjkz Li43NGNhMDFmZjBiZmVhMTA0NzdjZWE3NzU3MmYwNWUyNjZiMmRlMWYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KQEAgLTcyLDYgKzcyLDcgQEAgUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWE6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBh Z2UsIGNvbnN0IFcKICAgICAsIG1fY3VycmVudFRyYW5zYWN0aW9uSUQoMCkKICAgICAsIG1fY29u dGVudExheWVyKG51bGxwdHIpCiAgICAgLCBtX3ZpZXdPdmVybGF5Um9vdExheWVyKG51bGxwdHIp CisgICAgLCBtX3dlYWtQdHJGYWN0b3J5KHRoaXMpCiB7CiAgICAgd2ViUGFnZS5jb3JlUGFnZSgp LT5zZXR0aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHRydWUpOwogI2lmIFBMQVRGT1JN KElPUykKQEAgLTkwLDYgKzkxLDkgQEAgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OlJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGNvbnN0IFcKIAogUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWE6On5SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSgpCiB7Cisg ICAgZm9yIChSZW1vdGVMYXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3IqIG1vbml0b3IgOiBt X2Rpc3BsYXlSZWZyZXNoTW9uaXRvcnMpCisgICAgICAgIG1vbml0b3ItPmNsZWFyRHJhd2luZ0Fy ZWEoKTsKKyAgICAKICAgICBkaXNwYXRjaF9yZWxlYXNlKG1fY29tbWl0UXVldWUpOwogfQogCg== 257139 2015-07-20 16:02:14 -0700 2015-07-20 17:24:23 -0700 Patch bug-147124-20150720160101.patch text/plain 5809 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjdlNTgxMzg4ODY5NmYx ZTI2YWQ4N2U1ZjA1NjY0NjBjYjI4MjMzNS4uODBkY2JlYjRhNjIzMjk4NDRjOGE2ZWE5YzAyOGI0 N2I4ZDBmZDI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA3LTIwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBjcmFzaCBk dWUgdG8gUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yIG91dGxpdmluZyBSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ3MTI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTU4Mjg1OD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWZhY3Rv cnMgUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yIHRvIHVzZSBhIHdlYWsgcG9p bnRlciByYXRoZXIgdGhhbiBhIHJlZmVyZW5jZQorICAgICAgICB0byBpdHMgUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEsIHNpbmNlIHRoZSBkcmF3aW5nIGFyZWEgbWF5IGJlIGRlYWxsb2NhdGVk IGJlZm9yZSB0aGUgbW9uaXRvcgorICAgICAgICBpbiBzb21lIHJhcmUgY2FzZXMuIFRoaXMgcmFy ZWx5IGNhdXNlZCBwYWdlcyB1c2luZyByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgdG8gY3Jhc2ggb24g aU9TLiBIb3dldmVyLAorICAgICAgICB0aGlzIHNob3VsZCBub3QgYmUgdGhlIGNhc2U6IGxvZ2lj YWxseSwgYSBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSBzaG91bGQgYWx3YXlzIG91dGxpdmUg aXRzCisgICAgICAgIHJlZnJlc2ggbW9uaXRvcnMuIFJlZmVyIHRvIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcxMjggZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9SZW1vdGVMYXllclRyZWVEaXNwbGF5UmVmcmVz aE1vbml0b3IuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3RlTGF5 ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVM YXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3I6OlJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZy ZXNoTW9uaXRvcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZy ZXNoTW9uaXRvcjo6flJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvcik6IE9uIGRl c3RydWN0aW9uLCBjaGVja3MKKyAgICAgICAgICAgIGZpcnN0IHRvIHNlZSB3aGV0aGVyIG9yIG5v dCB0aGUgZHJhd2luZyBhcmVhIGhhcyBiZWVuIGRlYWxsb2NhdGVkIGJlZm9yZSB0ZWxsaW5nIGl0 IHRvIHVwZGF0ZSBpdHMgbW9uaXRvcnMuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJl ZURpc3BsYXlSZWZyZXNoTW9uaXRvcjo6cmVxdWVzdFJlZnJlc2hDYWxsYmFjayk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6Y3JlYXRlV2Vha1B0 cik6IENyZWF0ZXMgYW5kIHJldHVybnMgYSBuZXcgd2VhayBwb2ludGVyIHRvIGl0c2VsZi4KKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6UmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWEpOgorCiAyMDE1LTA3LTIwICBNaWNoYWVsIENhdGFuemFybyAg PG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbU2VjY29tcF0gU2hvdWxkIGJlIGVh c2llciB0byBkZWJ1ZyBibG9ja2VkIHN5c2NhbGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hN b25pdG9yLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3Rl TGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yLmgKaW5kZXggMzFmN2MyNGYxYzZhOGI1NDUx MDA0MGU4MjBhMGIwZTEzMWI5YjQ4ZC4uOTA2OWQ5MjBhZWE5MDRjYTU4YjU2M2Q3MGE2M2FmY2Q2 ZmJhMDhiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nv Y29hL1JlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9SZW1vdGVMYXllclRyZWVEaXNwbGF5UmVm cmVzaE1vbml0b3IuaApAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4 cGxpY2l0IFJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvcihQbGF0Zm9ybURpc3Bs YXlJRCwgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEmKTsKIAotICAgIFJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhJiBtX2RyYXdpbmdBcmVhOworICAgIFdlYWtQdHI8UmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWE+IG1fZHJhd2luZ0FyZWE7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJl ZnJlc2hNb25pdG9yLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29h L1JlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvci5tbQppbmRleCBlNGM2NGM0OTgx ODE5YTk3ZmNhYzU1MjQ2NmQyNGFlNDkwMmQ3YmNiLi5iZjJmNzI0YmNhODkyMGVkMWJkNjJmMDhj YjQyNzRhNzZjMzk0OGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvQ29jb2EvUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9SZW1vdGVMYXllclRyZWVE aXNwbGF5UmVmcmVzaE1vbml0b3IubW0KQEAgLTM2LDIyICszNiwyMyBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogUmVtb3RlTGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yOjpSZW1vdGVMYXll clRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3IoUGxhdGZvcm1EaXNwbGF5SUQgZGlzcGxheUlELCBS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSYgZHJhd2luZ0FyZWEpCiAgICAgOiBEaXNwbGF5UmVm cmVzaE1vbml0b3IoZGlzcGxheUlEKQotICAgICwgbV9kcmF3aW5nQXJlYShkcmF3aW5nQXJlYSkK KyAgICAsIG1fZHJhd2luZ0FyZWEoZHJhd2luZ0FyZWEuY3JlYXRlV2Vha1B0cigpKQogewogfQog CiBSZW1vdGVMYXllclRyZWVEaXNwbGF5UmVmcmVzaE1vbml0b3I6On5SZW1vdGVMYXllclRyZWVE aXNwbGF5UmVmcmVzaE1vbml0b3IoKQogewotICAgIG1fZHJhd2luZ0FyZWEud2lsbERlc3Ryb3lE aXNwbGF5UmVmcmVzaE1vbml0b3IodGhpcyk7CisgICAgaWYgKG1fZHJhd2luZ0FyZWEpCisgICAg ICAgIG1fZHJhd2luZ0FyZWEtPndpbGxEZXN0cm95RGlzcGxheVJlZnJlc2hNb25pdG9yKHRoaXMp OwogfQogCiBib29sIFJlbW90ZUxheWVyVHJlZURpc3BsYXlSZWZyZXNoTW9uaXRvcjo6cmVxdWVz dFJlZnJlc2hDYWxsYmFjaygpCiB7Ci0gICAgaWYgKCFpc0FjdGl2ZSgpKQorICAgIGlmICghbV9k cmF3aW5nQXJlYSB8fCAhaXNBY3RpdmUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg aWYgKCFpc1NjaGVkdWxlZCgpKQotICAgICAgICBzdGF0aWNfY2FzdDxEcmF3aW5nQXJlYSY+KG1f ZHJhd2luZ0FyZWEpLnNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZsdXNoKCk7CisgICAgICAgIHN0 YXRpY19jYXN0PERyYXdpbmdBcmVhJj4oKm1fZHJhd2luZ0FyZWEuZ2V0KCkpLnNjaGVkdWxlQ29t cG9zaXRpbmdMYXllckZsdXNoKCk7CiAKICAgICBzZXRJc0FjdGl2ZSh0cnVlKTsKICAgICBzZXRJ c1NjaGVkdWxlZCh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAppbmRl eCAwNjg4YTAzOWU5YTIyMTMyN2RlNTcyNDcxZmE4ODhkMmEwYWYyM2E4Li40MjRiOTJiMTUxMDEx ZGE5YzgwOTVmNDU5YTE1Zjk5NTFlNDIzNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYS5oCkBAIC01Niw2ICs1Niw4IEBAIHB1YmxpYzoKIAogICAgIHVpbnQ2NF90IG5leHRU cmFuc2FjdGlvbklEKCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50VHJhbnNhY3Rpb25JRCArIDE7 IH0KIAorICAgIFdlYWtQdHI8UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE+IGNyZWF0ZVdlYWtQ dHIoKSB7IHJldHVybiBtX3dlYWtQdHJGYWN0b3J5LmNyZWF0ZVdlYWtQdHIoKTsgfQorICAgIAog cHJpdmF0ZToKICAgICAvLyBEcmF3aW5nQXJlYQogICAgIHZpcnR1YWwgdm9pZCBzZXROZWVkc0Rp c3BsYXkoKSBvdmVycmlkZTsKQEAgLTE2Niw2ICsxNjgsOCBAQCBwcml2YXRlOgogCiAgICAgV2Vi Q29yZTo6R3JhcGhpY3NMYXllciogbV9jb250ZW50TGF5ZXI7CiAgICAgV2ViQ29yZTo6R3JhcGhp Y3NMYXllciogbV92aWV3T3ZlcmxheVJvb3RMYXllcjsKKyAgICAKKyAgICBXZWFrUHRyRmFjdG9y eTxSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYT4gbV93ZWFrUHRyRmFjdG9yeTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0K aW5kZXggODIxMmY1ZjhlM2Q4YjA0ODNkMjg4OThjY2M4NDQ5NTA5YWUzMmI5My4uYTJjZWY1OGIw YTEwNzk0ZmMxZjQ3ZDUyOGQyY2Y2ZmJhY2I3MGM5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhLm1tCkBAIC03Miw2ICs3Miw3IEBAIFJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBjb25zdCBX CiAgICAgLCBtX2N1cnJlbnRUcmFuc2FjdGlvbklEKDApCiAgICAgLCBtX2NvbnRlbnRMYXllcihu dWxscHRyKQogICAgICwgbV92aWV3T3ZlcmxheVJvb3RMYXllcihudWxscHRyKQorICAgICwgbV93 ZWFrUHRyRmFjdG9yeSh0aGlzKQogewogICAgIHdlYlBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3Mo KS5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZSh0cnVlKTsKICNpZiBQTEFURk9STShJT1MpCg==