189182 2018-08-30 21:26:38 -0700 Move LibWebRTCMediaEndpoint data channel code to LibWebRTCDataChannelHandler 2018-08-31 08:53:33 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf alex commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1455539 0 youennf 2018-08-30 21:26:38 -0700 Refactoring to ease future developments. 1455543 1 348593 youennf 2018-08-30 21:28:37 -0700 Created attachment 348593 Patch 1455559 2 348601 youennf 2018-08-30 21:45:20 -0700 Created attachment 348601 Patch 1455668 3 348601 alex 2018-08-31 06:26:05 -0700 Comment on attachment 348601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348601&action=review LGTM > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:750 > + auto& connection = protectedThis->m_peerConnectionBackend.connection(); > + connection.fireEvent(LibWebRTCDataChannelHandler::channelEvent(*connection.scriptExecutionContext(), WTFMove(dataChannel))); You can avoid the connection variable. 1455682 4 youennf 2018-08-31 08:25:04 -0700 > > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:750 > > + auto& connection = protectedThis->m_peerConnectionBackend.connection(); > > + connection.fireEvent(LibWebRTCDataChannelHandler::channelEvent(*connection.scriptExecutionContext(), WTFMove(dataChannel))); > > You can avoid the connection variable. Right, I think it reads better as two lines though. 1455690 5 348601 commit-queue 2018-08-31 08:52:04 -0700 Comment on attachment 348601 Patch Clearing flags on attachment: 348601 Committed r235552: <https://trac.webkit.org/changeset/235552> 1455691 6 commit-queue 2018-08-31 08:52:06 -0700 All reviewed patches have been landed. Closing bug. 1455695 7 webkit-bug-importer 2018-08-31 08:53:33 -0700 <rdar://problem/43941822> 348593 2018-08-30 21:28:37 -0700 2018-08-30 21:45:19 -0700 Patch bug-189182-20180830212837.patch text/plain 9898 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg1YjdjOWVkZGNkMDRm ZGZlYmIyMDQyNGVlODQ0MGVhMTA4NjBhOC4uZGViNDUwZDAyMzk1ZDQ0Y2M3MGRhNTNkY2Y2YTAx ODFlMGRhNTI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA4LTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIExpYldlYlJUQ01l ZGlhRW5kcG9pbnQgZGF0YSBjaGFubmVsIGNvZGUgdG8gTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5k bGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODkx ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3Zp bmcgZGF0YSBjaGFubmVsIGNvZGUgb3V0c2lkZSBvZiBMaWJXZWJSVENNZWRpYUVuZHBvaW50Lgor ICAgICAgICBUaGlzIHdpbGwgYWxsb3cgZnV0dXJlIGRldmVsb3BtZW50IHRvIHN1cHBvcnQgdW5p ZmllZCBwbGFuLgorICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyOjpmcm9t UlRDRGF0YUNoYW5uZWxJbml0KToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcjo6Y2hhbm5lbEV2ZW50KToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaDoKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmNyZWF0ZURhdGFDaGFubmVs KToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6Ok9uRGF0YUNoYW5u ZWwpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01l ZGlhRW5kcG9pbnQuaDoKKwogMjAxOC0wOC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgTW92ZSBzZXNzaW9uIG9ic2VydmVycyBvdXRzaWRlIExpYldlYlJU Q01lZGlhRW5kcG9pbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5l bEhhbmRsZXIuY3BwCmluZGV4IDYzNjBjZDhiMDZlNzMyY2FlYjgwNjMxYzg5YTkxOGNlZWI5MTJj NjguLjhhMDIzN2U4YjgyMzVmNThiNzAxMWZhMzYxNTVlNTQ5YmRiZWY2MGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0Rh dGFDaGFubmVsSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmNwcApAQCAtMjcsMTEg KzI3LDYwIEBACiAKICNpZiBVU0UoTElCV0VCUlRDKQogCisjaW5jbHVkZSAiRXZlbnROYW1lcy5o IgorI2luY2x1ZGUgIkxpYldlYlJUQ1V0aWxzLmgiCiAjaW5jbHVkZSAiUlRDRGF0YUNoYW5uZWwu aCIKKyNpbmNsdWRlICJSVENEYXRhQ2hhbm5lbEV2ZW50LmgiCiAjaW5jbHVkZSA8d3RmL01haW5U aHJlYWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit3ZWJydGM6OkRhdGFDaGFubmVsSW5p dCBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI6OmZyb21SVENEYXRhQ2hhbm5lbEluaXQoY29u c3QgUlRDRGF0YUNoYW5uZWxJbml0JiBvcHRpb25zKQoreworICAgIHdlYnJ0Yzo6RGF0YUNoYW5u ZWxJbml0IGluaXQ7CisgICAgaWYgKG9wdGlvbnMub3JkZXJlZCkKKyAgICAgICAgaW5pdC5vcmRl cmVkID0gKm9wdGlvbnMub3JkZXJlZDsKKyAgICBpZiAob3B0aW9ucy5tYXhQYWNrZXRMaWZlVGlt ZSkKKyAgICAgICAgaW5pdC5tYXhSZXRyYW5zbWl0VGltZSA9ICpvcHRpb25zLm1heFBhY2tldExp ZmVUaW1lOworICAgIGlmIChvcHRpb25zLm1heFJldHJhbnNtaXRzKQorICAgICAgICBpbml0Lm1h eFJldHJhbnNtaXRzID0gKm9wdGlvbnMubWF4UmV0cmFuc21pdHM7CisgICAgaW5pdC5wcm90b2Nv bCA9IG9wdGlvbnMucHJvdG9jb2wudXRmOCgpLmRhdGEoKTsKKyAgICBpZiAob3B0aW9ucy5uZWdv dGlhdGVkKQorICAgICAgICBpbml0Lm5lZ290aWF0ZWQgPSAqb3B0aW9ucy5uZWdvdGlhdGVkOwor ICAgIGlmIChvcHRpb25zLmlkKQorICAgICAgICBpbml0LmlkID0gKm9wdGlvbnMuaWQ7CisgICAg cmV0dXJuIGluaXQ7Cit9CisKK1JlZjxSVENEYXRhQ2hhbm5lbEV2ZW50PiBMaWJXZWJSVENEYXRh Q2hhbm5lbEhhbmRsZXI6OmNoYW5uZWxFdmVudChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250 ZXh0LCBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpEYXRhQ2hhbm5lbEludGVyZmFjZT4mJiBk YXRhQ2hhbm5lbCkKK3sKKyAgICBhdXRvIHByb3RvY29sID0gZGF0YUNoYW5uZWwtPnByb3RvY29s KCk7CisgICAgYXV0byBsYWJlbCA9IGRhdGFDaGFubmVsLT5sYWJlbCgpOworCisgICAgUlRDRGF0 YUNoYW5uZWxJbml0IGluaXQ7CisgICAgaW5pdC5vcmRlcmVkID0gZGF0YUNoYW5uZWwtPm9yZGVy ZWQoKTsKKyAgICBpbml0Lm1heFBhY2tldExpZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJh bnNtaXRUaW1lKCk7CisgICAgaW5pdC5tYXhSZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhS ZXRyYW5zbWl0cygpOworICAgIGluaXQucHJvdG9jb2wgPSBmcm9tU3RkU3RyaW5nKHByb3RvY29s KTsKKyAgICBpbml0Lm5lZ290aWF0ZWQgPSBkYXRhQ2hhbm5lbC0+bmVnb3RpYXRlZCgpOworICAg IGluaXQuaWQgPSBkYXRhQ2hhbm5lbC0+aWQoKTsKKworICAgIGJvb2wgaXNPcGVuZWQgPSBkYXRh Q2hhbm5lbC0+c3RhdGUoKSA9PSB3ZWJydGM6OkRhdGFDaGFubmVsSW50ZXJmYWNlOjprT3BlbjsK KworICAgIGF1dG8gaGFuZGxlciA9ICBzdGQ6Om1ha2VfdW5pcXVlPExpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcj4oV1RGTW92ZShkYXRhQ2hhbm5lbCkpOworICAgIGF1dG8gY2hhbm5lbCA9IFJU Q0RhdGFDaGFubmVsOjpjcmVhdGUoY29udGV4dCwgV1RGTW92ZShoYW5kbGVyKSwgZnJvbVN0ZFN0 cmluZyhsYWJlbCksIFdURk1vdmUoaW5pdCkpOworCisgICAgaWYgKGlzT3BlbmVkKSB7CisgICAg ICAgIGNhbGxPbk1haW5UaHJlYWQoW2NoYW5uZWwgPSBjaGFubmVsLmNvcHlSZWYoKV0geworICAg ICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIHdyaXRlIGNoYW5uZWwtPmRp ZENoYW5nZVJlYWR5U3RhdGUoLi4uKQorICAgICAgICAgICAgUlRDRGF0YUNoYW5uZWxIYW5kbGVy Q2xpZW50JiBjbGllbnQgPSBjaGFubmVsLmdldCgpOworICAgICAgICAgICAgY2xpZW50LmRpZENo YW5nZVJlYWR5U3RhdGUoUlRDRGF0YUNoYW5uZWxTdGF0ZTo6T3Blbik7CisgICAgICAgIH0pOwor ICAgIH0KKworICAgIHJldHVybiBSVENEYXRhQ2hhbm5lbEV2ZW50OjpjcmVhdGUoZXZlbnROYW1l cygpLmRhdGFjaGFubmVsRXZlbnQsIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5j ZWxhYmxlOjpObywgV1RGTW92ZShjaGFubmVsKSk7Cit9CisKIExpYldlYlJUQ0RhdGFDaGFubmVs SGFuZGxlcjo6fkxpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcigpCiB7CiAgICAgaWYgKG1fY2xp ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3 ZWJydGMvTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaApp bmRleCA1NWNlODI1YzQ1ZGE3ODNkNTA0ZDdkNDQ4MDQyZWM2ZmRiOWE4ODhmLi4yYWExMTgwZGFl ZmM3OGYwNjZmYjcxNGY3NmU5NTY2NDBiOGMxOTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9M aWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaApAQCAtMzYsMTUgKzM2LDI1IEBACiAKICNwcmFn bWEgR0NDIGRpYWdub3N0aWMgcG9wCiAKK25hbWVzcGFjZSB3ZWJydGMgeworc3RydWN0IERhdGFD aGFubmVsSW5pdDsKK30KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBSVENEYXRhQ2hh bm5lbEV2ZW50OwogY2xhc3MgUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50Oworc3RydWN0IFJU Q0RhdGFDaGFubmVsSW5pdDsKK2NsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAKIGNsYXNz IExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlciBmaW5hbCA6IHB1YmxpYyBSVENEYXRhQ2hhbm5l bEhhbmRsZXIsIHByaXZhdGUgd2VicnRjOjpEYXRhQ2hhbm5lbE9ic2VydmVyIHsKIHB1YmxpYzoK ICAgICBleHBsaWNpdCBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIocnRjOjpzY29wZWRfcmVm cHRyPHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbnRlcmZhY2U+JiYgY2hhbm5lbCkgOiBtX2NoYW5uZWwo V1RGTW92ZShjaGFubmVsKSkgeyBBU1NFUlQobV9jaGFubmVsKTsgfQogICAgIH5MaWJXZWJSVENE YXRhQ2hhbm5lbEhhbmRsZXIoKTsKIAorICAgIHN0YXRpYyB3ZWJydGM6OkRhdGFDaGFubmVsSW5p dCBmcm9tUlRDRGF0YUNoYW5uZWxJbml0KGNvbnN0IFJUQ0RhdGFDaGFubmVsSW5pdCYpOworICAg IHN0YXRpYyBSZWY8UlRDRGF0YUNoYW5uZWxFdmVudD4gY2hhbm5lbEV2ZW50KFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmLCBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpEYXRhQ2hhbm5lbEludGVy ZmFjZT4mJik7CisKIHByaXZhdGU6CiAgICAgLy8gUlRDRGF0YUNoYW5uZWxIYW5kbGVyIEFQSQog ICAgIHZvaWQgc2V0Q2xpZW50KFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudCYpIGZpbmFsOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAppbmRleCA3ZDEwMTgx MGQ2ZTRiMWQwY2JkYWZlNWUyYmQ4ZDJmOWYwOGE4NWY1Li4wZWI0MjUyMTA2Y2NjZjhlYjAwNzY4 NTJkOTE5YTFhMjk1MWRkODFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVu ZHBvaW50LmNwcApAQCAtNDQ1LDY1ICs0NDUsMTggQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBv aW50OjpPbkFkZFRyYWNrKHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFJlY2VpdmVySW4K IAogc3RkOjp1bmlxdWVfcHRyPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gTGliV2ViUlRDTWVkaWFF bmRwb2ludDo6Y3JlYXRlRGF0YUNoYW5uZWwoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgUlRD RGF0YUNoYW5uZWxJbml0JiBvcHRpb25zKQogewotICAgIEFTU0VSVChtX2JhY2tlbmQpOwotCi0g ICAgd2VicnRjOjpEYXRhQ2hhbm5lbEluaXQgaW5pdDsKLSAgICBpZiAob3B0aW9ucy5vcmRlcmVk KQotICAgICAgICBpbml0Lm9yZGVyZWQgPSAqb3B0aW9ucy5vcmRlcmVkOwotICAgIGlmIChvcHRp b25zLm1heFBhY2tldExpZmVUaW1lKQotICAgICAgICBpbml0Lm1heFJldHJhbnNtaXRUaW1lID0g Km9wdGlvbnMubWF4UGFja2V0TGlmZVRpbWU7Ci0gICAgaWYgKG9wdGlvbnMubWF4UmV0cmFuc21p dHMpCi0gICAgICAgIGluaXQubWF4UmV0cmFuc21pdHMgPSAqb3B0aW9ucy5tYXhSZXRyYW5zbWl0 czsKLSAgICBpbml0LnByb3RvY29sID0gb3B0aW9ucy5wcm90b2NvbC51dGY4KCkuZGF0YSgpOwot ICAgIGlmIChvcHRpb25zLm5lZ290aWF0ZWQpCi0gICAgICAgIGluaXQubmVnb3RpYXRlZCA9ICpv cHRpb25zLm5lZ290aWF0ZWQ7Ci0gICAgaWYgKG9wdGlvbnMuaWQpCi0gICAgICAgIGluaXQuaWQg PSAqb3B0aW9ucy5pZDsKLQorICAgIGF1dG8gaW5pdCA9IExpYldlYlJUQ0RhdGFDaGFubmVsSGFu ZGxlcjo6ZnJvbVJUQ0RhdGFDaGFubmVsSW5pdChvcHRpb25zKTsKICAgICBhdXRvIGNoYW5uZWwg PSBtX2JhY2tlbmQtPkNyZWF0ZURhdGFDaGFubmVsKGxhYmVsLnV0ZjgoKS5kYXRhKCksICZpbml0 KTsKLSAgICBpZiAoIWNoYW5uZWwpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgcmV0 dXJuIHN0ZDo6bWFrZV91bmlxdWU8TGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyPihXVEZNb3Zl KGNoYW5uZWwpKTsKLX0KLQotdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGREYXRhQ2hh bm5lbChydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpEYXRhQ2hhbm5lbEludGVyZmFjZT4mJiBk YXRhQ2hhbm5lbCkKLXsKLSAgICBhdXRvIHByb3RvY29sID0gZGF0YUNoYW5uZWwtPnByb3RvY29s KCk7Ci0gICAgYXV0byBsYWJlbCA9IGRhdGFDaGFubmVsLT5sYWJlbCgpOwotCi0gICAgUlRDRGF0 YUNoYW5uZWxJbml0IGluaXQ7Ci0gICAgaW5pdC5vcmRlcmVkID0gZGF0YUNoYW5uZWwtPm9yZGVy ZWQoKTsKLSAgICBpbml0Lm1heFBhY2tldExpZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJh bnNtaXRUaW1lKCk7Ci0gICAgaW5pdC5tYXhSZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhS ZXRyYW5zbWl0cygpOwotICAgIGluaXQucHJvdG9jb2wgPSBmcm9tU3RkU3RyaW5nKHByb3RvY29s KTsKLSAgICBpbml0Lm5lZ290aWF0ZWQgPSBkYXRhQ2hhbm5lbC0+bmVnb3RpYXRlZCgpOwotICAg IGluaXQuaWQgPSBkYXRhQ2hhbm5lbC0+aWQoKTsKLQotICAgIGJvb2wgaXNPcGVuZWQgPSBkYXRh Q2hhbm5lbC0+c3RhdGUoKSA9PSB3ZWJydGM6OkRhdGFDaGFubmVsSW50ZXJmYWNlOjprT3BlbjsK LQotICAgIGF1dG8gaGFuZGxlciA9ICBzdGQ6Om1ha2VfdW5pcXVlPExpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcj4oV1RGTW92ZShkYXRhQ2hhbm5lbCkpOwotICAgIEFTU0VSVChtX3BlZXJDb25u ZWN0aW9uQmFja2VuZC5jb25uZWN0aW9uKCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKLSAg ICBhdXRvIGNoYW5uZWwgPSBSVENEYXRhQ2hhbm5lbDo6Y3JlYXRlKCptX3BlZXJDb25uZWN0aW9u QmFja2VuZC5jb25uZWN0aW9uKCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBXVEZNb3ZlKGhh bmRsZXIpLCBmcm9tU3RkU3RyaW5nKGxhYmVsKSwgV1RGTW92ZShpbml0KSk7Ci0KLSAgICBpZiAo aXNPcGVuZWQpIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbY2hhbm5lbCA9IGNoYW5uZWwu Y29weVJlZigpXSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8g d3JpdGUgY2hhbm5lbC0+ZGlkQ2hhbmdlUmVhZHlTdGF0ZSguLi4pCi0gICAgICAgICAgICBSVENE YXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQmIGNsaWVudCA9IGNoYW5uZWwuZ2V0KCk7Ci0gICAgICAg ICAgICBjbGllbnQuZGlkQ2hhbmdlUmVhZHlTdGF0ZShSVENEYXRhQ2hhbm5lbFN0YXRlOjpPcGVu KTsKLSAgICAgICAgfSk7Ci0gICAgfQotCi0gICAgbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuY29u bmVjdGlvbigpLmZpcmVFdmVudChSVENEYXRhQ2hhbm5lbEV2ZW50OjpjcmVhdGUoZXZlbnROYW1l cygpLmRhdGFjaGFubmVsRXZlbnQsCi0gICAgICAgIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVu dDo6SXNDYW5jZWxhYmxlOjpObywgV1RGTW92ZShjaGFubmVsKSkpOworICAgIHJldHVybiBjaGFu bmVsID8gc3RkOjptYWtlX3VuaXF1ZTxMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI+KFdURk1v dmUoY2hhbm5lbCkpIDogbnVsbHB0cjsKIH0KIAogdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50 OjpPbkRhdGFDaGFubmVsKHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6OkRhdGFDaGFubmVsSW50 ZXJmYWNlPiBkYXRhQ2hhbm5lbCkKIHsKLSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFDaGFubmVsID0gV1RGTW92ZShkYXRhQ2hhbm5lbCld IHsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGRhdGFDaGFubmVsID0gV1RGTW92ZShkYXRhQ2hhbm5lbCldKCkgbXV0YWJsZSB7CiAgICAgICAg IGlmIChwcm90ZWN0ZWRUaGlzLT5pc1N0b3BwZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgcHJvdGVjdGVkVGhpcy0+YWRkRGF0YUNoYW5uZWwocnRjOjpzY29wZWRfcmVmcHRyPHdl YnJ0Yzo6RGF0YUNoYW5uZWxJbnRlcmZhY2U+KGRhdGFDaGFubmVsKSk7CisgICAgICAgIGF1dG8m IGNvbm5lY3Rpb24gPSBwcm90ZWN0ZWRUaGlzLT5tX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jb25u ZWN0aW9uKCk7CisgICAgICAgIGNvbm5lY3Rpb24uZmlyZUV2ZW50KExpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcjo6Y2hhbm5lbEV2ZW50KCpjb25uZWN0aW9uLnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKSwgV1RGTW92ZShkYXRhQ2hhbm5lbCkpKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVk aWFFbmRwb2ludC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCmluZGV4IDQ3NGI0NzU5YWEzY2IyMTJiNjJhMzY1 MmYxNzgxOGQ3YzY2MGM0YTMuLmY2ZDIyOTU5MDk5YmM5YzBjZjEyMTJhZjM3ZjVlNTc1OTE1Yjc3 ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTEyNSw3 ICsxMjUsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkUmVtb3RlU3RyZWFtKHdlYnJ0Yzo6TWVk aWFTdHJlYW1JbnRlcmZhY2UmKTsKICAgICB2b2lkIGFkZFJlbW90ZVRyYWNrKHJ0Yzo6c2NvcGVk X3JlZnB0cjx3ZWJydGM6OlJ0cFJlY2VpdmVySW50ZXJmYWNlPiYmLCBjb25zdCBzdGQ6OnZlY3Rv cjxydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpNZWRpYVN0cmVhbUludGVyZmFjZT4+Jik7CiAg ICAgdm9pZCByZW1vdmVSZW1vdGVTdHJlYW0od2VicnRjOjpNZWRpYVN0cmVhbUludGVyZmFjZSYp OwotICAgIHZvaWQgYWRkRGF0YUNoYW5uZWwocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6RGF0 YUNoYW5uZWxJbnRlcmZhY2U+JiYpOwogCiAgICAgdm9pZCBPblN0YXRzRGVsaXZlcmVkKGNvbnN0 IHJ0Yzo6c2NvcGVkX3JlZnB0cjxjb25zdCB3ZWJydGM6OlJUQ1N0YXRzUmVwb3J0PiYpIGZpbmFs OwogICAgIHZvaWQgZ2F0aGVyU3RhdHNGb3JMb2dnaW5nKCk7Cg== 348601 2018-08-30 21:45:20 -0700 2018-08-31 08:52:04 -0700 Patch bug-189182-20180830214519.patch text/plain 10042 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTU0MjdlYzI2N2ViMzdm MGU5ZjBkZjZkNGQwZDY1Nzk2OGY2ODBhNC4uNGQxZmJjOGJiNzczMWVhMzliMzI0ZWIyM2M4NDU4 NDM5YWQ2ZWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA4LTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIExpYldlYlJUQ01l ZGlhRW5kcG9pbnQgZGF0YSBjaGFubmVsIGNvZGUgdG8gTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5k bGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODkx ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3Zp bmcgZGF0YSBjaGFubmVsIGNvZGUgb3V0c2lkZSBvZiBMaWJXZWJSVENNZWRpYUVuZHBvaW50Lgor ICAgICAgICBUaGlzIHdpbGwgYWxsb3cgZnV0dXJlIGRldmVsb3BtZW50IHRvIHN1cHBvcnQgdW5p ZmllZCBwbGFuLgorICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyOjpmcm9t UlRDRGF0YUNoYW5uZWxJbml0KToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcjo6Y2hhbm5lbEV2ZW50KToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaDoKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmNyZWF0ZURhdGFDaGFubmVs KToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6Ok9uRGF0YUNoYW5u ZWwpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01l ZGlhRW5kcG9pbnQuaDoKKwogMjAxOC0wOC0zMCAgT2xpdmlhIEJhcm5ldHQgIDxvYmFybmV0dEBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjM1NDg5KTogZmFzdC9kb20vbmF2aWdh dG9yLWRldGFjaGVkLW5vLWNyYXNoLmh0bWwgY3Jhc2hlcyB1bmRlciBOYXZpZ2F0b3I6OnNoYXJl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmNwcApp bmRleCA2MzYwY2Q4YjA2ZTczMmNhZWI4MDYzMWM4OWE5MThjZWViOTEyYzY4Li5iY2ZlMmE0NWYw ZTg5NGQ4MjBkYmYyYjY5YzdhNTM3OGMyYWFlZWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlci5jcHAKQEAgLTI3LDExICsyNyw2NCBAQAogCiAj aWYgVVNFKExJQldFQlJUQykKIAorI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJS VENEYXRhQ2hhbm5lbC5oIgorI2luY2x1ZGUgIlJUQ0RhdGFDaGFubmVsRXZlbnQuaCIKICNpbmNs dWRlIDx3dGYvTWFpblRocmVhZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3dlYnJ0Yzo6 RGF0YUNoYW5uZWxJbml0IExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6ZnJvbVJUQ0RhdGFD aGFubmVsSW5pdChjb25zdCBSVENEYXRhQ2hhbm5lbEluaXQmIG9wdGlvbnMpCit7CisgICAgd2Vi cnRjOjpEYXRhQ2hhbm5lbEluaXQgaW5pdDsKKyAgICBpZiAob3B0aW9ucy5vcmRlcmVkKQorICAg ICAgICBpbml0Lm9yZGVyZWQgPSAqb3B0aW9ucy5vcmRlcmVkOworICAgIGlmIChvcHRpb25zLm1h eFBhY2tldExpZmVUaW1lKQorICAgICAgICBpbml0Lm1heFJldHJhbnNtaXRUaW1lID0gKm9wdGlv bnMubWF4UGFja2V0TGlmZVRpbWU7CisgICAgaWYgKG9wdGlvbnMubWF4UmV0cmFuc21pdHMpCisg ICAgICAgIGluaXQubWF4UmV0cmFuc21pdHMgPSAqb3B0aW9ucy5tYXhSZXRyYW5zbWl0czsKKyAg ICBpbml0LnByb3RvY29sID0gb3B0aW9ucy5wcm90b2NvbC51dGY4KCkuZGF0YSgpOworICAgIGlm IChvcHRpb25zLm5lZ290aWF0ZWQpCisgICAgICAgIGluaXQubmVnb3RpYXRlZCA9ICpvcHRpb25z Lm5lZ290aWF0ZWQ7CisgICAgaWYgKG9wdGlvbnMuaWQpCisgICAgICAgIGluaXQuaWQgPSAqb3B0 aW9ucy5pZDsKKyAgICByZXR1cm4gaW5pdDsKK30KKworc3RhdGljIGlubGluZSBTdHJpbmcgZnJv bVN0ZFN0cmluZyhjb25zdCBzdGQ6OnN0cmluZyYgdmFsdWUpCit7CisgICAgcmV0dXJuIFN0cmlu Zzo6ZnJvbVVURjgodmFsdWUuZGF0YSgpLCB2YWx1ZS5sZW5ndGgoKSk7Cit9CisKK1JlZjxSVENE YXRhQ2hhbm5lbEV2ZW50PiBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI6OmNoYW5uZWxFdmVu dChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBydGM6OnNjb3BlZF9yZWZwdHI8d2Vi cnRjOjpEYXRhQ2hhbm5lbEludGVyZmFjZT4mJiBkYXRhQ2hhbm5lbCkKK3sKKyAgICBhdXRvIHBy b3RvY29sID0gZGF0YUNoYW5uZWwtPnByb3RvY29sKCk7CisgICAgYXV0byBsYWJlbCA9IGRhdGFD aGFubmVsLT5sYWJlbCgpOworCisgICAgUlRDRGF0YUNoYW5uZWxJbml0IGluaXQ7CisgICAgaW5p dC5vcmRlcmVkID0gZGF0YUNoYW5uZWwtPm9yZGVyZWQoKTsKKyAgICBpbml0Lm1heFBhY2tldExp ZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJhbnNtaXRUaW1lKCk7CisgICAgaW5pdC5tYXhS ZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhSZXRyYW5zbWl0cygpOworICAgIGluaXQucHJv dG9jb2wgPSBmcm9tU3RkU3RyaW5nKHByb3RvY29sKTsKKyAgICBpbml0Lm5lZ290aWF0ZWQgPSBk YXRhQ2hhbm5lbC0+bmVnb3RpYXRlZCgpOworICAgIGluaXQuaWQgPSBkYXRhQ2hhbm5lbC0+aWQo KTsKKworICAgIGJvb2wgaXNPcGVuZWQgPSBkYXRhQ2hhbm5lbC0+c3RhdGUoKSA9PSB3ZWJydGM6 OkRhdGFDaGFubmVsSW50ZXJmYWNlOjprT3BlbjsKKworICAgIGF1dG8gaGFuZGxlciA9ICBzdGQ6 Om1ha2VfdW5pcXVlPExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcj4oV1RGTW92ZShkYXRhQ2hh bm5lbCkpOworICAgIGF1dG8gY2hhbm5lbCA9IFJUQ0RhdGFDaGFubmVsOjpjcmVhdGUoY29udGV4 dCwgV1RGTW92ZShoYW5kbGVyKSwgZnJvbVN0ZFN0cmluZyhsYWJlbCksIFdURk1vdmUoaW5pdCkp OworCisgICAgaWYgKGlzT3BlbmVkKSB7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NoYW5u ZWwgPSBjaGFubmVsLmNvcHlSZWYoKV0geworICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZCBiZSBhYmxlIHRvIHdyaXRlIGNoYW5uZWwtPmRpZENoYW5nZVJlYWR5U3RhdGUoLi4uKQorICAg ICAgICAgICAgUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50JiBjbGllbnQgPSBjaGFubmVsLmdl dCgpOworICAgICAgICAgICAgY2xpZW50LmRpZENoYW5nZVJlYWR5U3RhdGUoUlRDRGF0YUNoYW5u ZWxTdGF0ZTo6T3Blbik7CisgICAgICAgIH0pOworICAgIH0KKworICAgIHJldHVybiBSVENEYXRh Q2hhbm5lbEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmRhdGFjaGFubmVsRXZlbnQsIEV2ZW50 OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObywgV1RGTW92ZShjaGFubmVs KSk7Cit9CisKIExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6fkxpYldlYlJUQ0RhdGFDaGFu bmVsSGFuZGxlcigpCiB7CiAgICAgaWYgKG1fY2xpZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDRGF0YUNoYW5uZWxI YW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9M aWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaAppbmRleCA1NWNlODI1YzQ1ZGE3ODNkNTA0ZDdk NDQ4MDQyZWM2ZmRiOWE4ODhmLi4yYWExMTgwZGFlZmM3OGYwNjZmYjcxNGY3NmU5NTY2NDBiOGMx OTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndl YnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIu aApAQCAtMzYsMTUgKzM2LDI1IEBACiAKICNwcmFnbWEgR0NDIGRpYWdub3N0aWMgcG9wCiAKK25h bWVzcGFjZSB3ZWJydGMgeworc3RydWN0IERhdGFDaGFubmVsSW5pdDsKK30KKwogbmFtZXNwYWNl IFdlYkNvcmUgewogCitjbGFzcyBSVENEYXRhQ2hhbm5lbEV2ZW50OwogY2xhc3MgUlRDRGF0YUNo YW5uZWxIYW5kbGVyQ2xpZW50Oworc3RydWN0IFJUQ0RhdGFDaGFubmVsSW5pdDsKK2NsYXNzIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAKIGNsYXNzIExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxl ciBmaW5hbCA6IHB1YmxpYyBSVENEYXRhQ2hhbm5lbEhhbmRsZXIsIHByaXZhdGUgd2VicnRjOjpE YXRhQ2hhbm5lbE9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBMaWJXZWJSVENEYXRh Q2hhbm5lbEhhbmRsZXIocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbnRl cmZhY2U+JiYgY2hhbm5lbCkgOiBtX2NoYW5uZWwoV1RGTW92ZShjaGFubmVsKSkgeyBBU1NFUlQo bV9jaGFubmVsKTsgfQogICAgIH5MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIoKTsKIAorICAg IHN0YXRpYyB3ZWJydGM6OkRhdGFDaGFubmVsSW5pdCBmcm9tUlRDRGF0YUNoYW5uZWxJbml0KGNv bnN0IFJUQ0RhdGFDaGFubmVsSW5pdCYpOworICAgIHN0YXRpYyBSZWY8UlRDRGF0YUNoYW5uZWxF dmVudD4gY2hhbm5lbEV2ZW50KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBydGM6OnNjb3BlZF9y ZWZwdHI8d2VicnRjOjpEYXRhQ2hhbm5lbEludGVyZmFjZT4mJik7CisKIHByaXZhdGU6CiAgICAg Ly8gUlRDRGF0YUNoYW5uZWxIYW5kbGVyIEFQSQogICAgIHZvaWQgc2V0Q2xpZW50KFJUQ0RhdGFD aGFubmVsSGFuZGxlckNsaWVudCYpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENN ZWRpYUVuZHBvaW50LmNwcAppbmRleCBiZjEyMGQwMjliOTgwYzM1MjhmZWIwNDA5NWFiYTBlOTI0 YTc2YWQ1Li43ZjY3NWYzOWVlMDkwODlkNDIxM2U3MzA0YTRkZjBmYzM4ZDI5ZTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcApAQCAtNzM2LDY1ICs3MzYs MTggQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpPbkFkZFRyYWNrKHJ0Yzo6c2NvcGVk X3JlZnB0cjx3ZWJydGM6OlJ0cFJlY2VpdmVySW4KIAogc3RkOjp1bmlxdWVfcHRyPFJUQ0RhdGFD aGFubmVsSGFuZGxlcj4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6Y3JlYXRlRGF0YUNoYW5uZWwo Y29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgUlRDRGF0YUNoYW5uZWxJbml0JiBvcHRpb25zKQog ewotICAgIEFTU0VSVChtX2JhY2tlbmQpOwotCi0gICAgd2VicnRjOjpEYXRhQ2hhbm5lbEluaXQg aW5pdDsKLSAgICBpZiAob3B0aW9ucy5vcmRlcmVkKQotICAgICAgICBpbml0Lm9yZGVyZWQgPSAq b3B0aW9ucy5vcmRlcmVkOwotICAgIGlmIChvcHRpb25zLm1heFBhY2tldExpZmVUaW1lKQotICAg ICAgICBpbml0Lm1heFJldHJhbnNtaXRUaW1lID0gKm9wdGlvbnMubWF4UGFja2V0TGlmZVRpbWU7 Ci0gICAgaWYgKG9wdGlvbnMubWF4UmV0cmFuc21pdHMpCi0gICAgICAgIGluaXQubWF4UmV0cmFu c21pdHMgPSAqb3B0aW9ucy5tYXhSZXRyYW5zbWl0czsKLSAgICBpbml0LnByb3RvY29sID0gb3B0 aW9ucy5wcm90b2NvbC51dGY4KCkuZGF0YSgpOwotICAgIGlmIChvcHRpb25zLm5lZ290aWF0ZWQp Ci0gICAgICAgIGluaXQubmVnb3RpYXRlZCA9ICpvcHRpb25zLm5lZ290aWF0ZWQ7Ci0gICAgaWYg KG9wdGlvbnMuaWQpCi0gICAgICAgIGluaXQuaWQgPSAqb3B0aW9ucy5pZDsKLQorICAgIGF1dG8g aW5pdCA9IExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6ZnJvbVJUQ0RhdGFDaGFubmVsSW5p dChvcHRpb25zKTsKICAgICBhdXRvIGNoYW5uZWwgPSBtX2JhY2tlbmQtPkNyZWF0ZURhdGFDaGFu bmVsKGxhYmVsLnV0ZjgoKS5kYXRhKCksICZpbml0KTsKLSAgICBpZiAoIWNoYW5uZWwpCi0gICAg ICAgIHJldHVybiBudWxscHRyOwotCi0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8TGliV2Vi UlRDRGF0YUNoYW5uZWxIYW5kbGVyPihXVEZNb3ZlKGNoYW5uZWwpKTsKLX0KLQotdm9pZCBMaWJX ZWJSVENNZWRpYUVuZHBvaW50OjphZGREYXRhQ2hhbm5lbChydGM6OnNjb3BlZF9yZWZwdHI8d2Vi cnRjOjpEYXRhQ2hhbm5lbEludGVyZmFjZT4mJiBkYXRhQ2hhbm5lbCkKLXsKLSAgICBhdXRvIHBy b3RvY29sID0gZGF0YUNoYW5uZWwtPnByb3RvY29sKCk7Ci0gICAgYXV0byBsYWJlbCA9IGRhdGFD aGFubmVsLT5sYWJlbCgpOwotCi0gICAgUlRDRGF0YUNoYW5uZWxJbml0IGluaXQ7Ci0gICAgaW5p dC5vcmRlcmVkID0gZGF0YUNoYW5uZWwtPm9yZGVyZWQoKTsKLSAgICBpbml0Lm1heFBhY2tldExp ZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJhbnNtaXRUaW1lKCk7Ci0gICAgaW5pdC5tYXhS ZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhSZXRyYW5zbWl0cygpOwotICAgIGluaXQucHJv dG9jb2wgPSBmcm9tU3RkU3RyaW5nKHByb3RvY29sKTsKLSAgICBpbml0Lm5lZ290aWF0ZWQgPSBk YXRhQ2hhbm5lbC0+bmVnb3RpYXRlZCgpOwotICAgIGluaXQuaWQgPSBkYXRhQ2hhbm5lbC0+aWQo KTsKLQotICAgIGJvb2wgaXNPcGVuZWQgPSBkYXRhQ2hhbm5lbC0+c3RhdGUoKSA9PSB3ZWJydGM6 OkRhdGFDaGFubmVsSW50ZXJmYWNlOjprT3BlbjsKLQotICAgIGF1dG8gaGFuZGxlciA9ICBzdGQ6 Om1ha2VfdW5pcXVlPExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcj4oV1RGTW92ZShkYXRhQ2hh bm5lbCkpOwotICAgIEFTU0VSVChtX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jb25uZWN0aW9uKCku c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKLSAgICBhdXRvIGNoYW5uZWwgPSBSVENEYXRhQ2hh bm5lbDo6Y3JlYXRlKCptX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jb25uZWN0aW9uKCkuc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpLCBXVEZNb3ZlKGhhbmRsZXIpLCBmcm9tU3RkU3RyaW5nKGxhYmVs KSwgV1RGTW92ZShpbml0KSk7Ci0KLSAgICBpZiAoaXNPcGVuZWQpIHsKLSAgICAgICAgY2FsbE9u TWFpblRocmVhZChbY2hhbm5lbCA9IGNoYW5uZWwuY29weVJlZigpXSB7Ci0gICAgICAgICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gd3JpdGUgY2hhbm5lbC0+ZGlkQ2hhbmdlUmVh ZHlTdGF0ZSguLi4pCi0gICAgICAgICAgICBSVENEYXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQmIGNs aWVudCA9IGNoYW5uZWwuZ2V0KCk7Ci0gICAgICAgICAgICBjbGllbnQuZGlkQ2hhbmdlUmVhZHlT dGF0ZShSVENEYXRhQ2hhbm5lbFN0YXRlOjpPcGVuKTsKLSAgICAgICAgfSk7Ci0gICAgfQotCi0g ICAgbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuY29ubmVjdGlvbigpLmZpcmVFdmVudChSVENEYXRh Q2hhbm5lbEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmRhdGFjaGFubmVsRXZlbnQsCi0gICAg ICAgIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObywgV1RGTW92 ZShjaGFubmVsKSkpOworICAgIHJldHVybiBjaGFubmVsID8gc3RkOjptYWtlX3VuaXF1ZTxMaWJX ZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI+KFdURk1vdmUoY2hhbm5lbCkpIDogbnVsbHB0cjsKIH0K IAogdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpPbkRhdGFDaGFubmVsKHJ0Yzo6c2NvcGVk X3JlZnB0cjx3ZWJydGM6OkRhdGFDaGFubmVsSW50ZXJmYWNlPiBkYXRhQ2hhbm5lbCkKIHsKLSAg ICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFD aGFubmVsID0gV1RGTW92ZShkYXRhQ2hhbm5lbCldIHsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFDaGFubmVsID0gV1RGTW92ZShkYXRh Q2hhbm5lbCldKCkgbXV0YWJsZSB7CiAgICAgICAgIGlmIChwcm90ZWN0ZWRUaGlzLT5pc1N0b3Bw ZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+YWRkRGF0 YUNoYW5uZWwocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbnRlcmZhY2U+ KGRhdGFDaGFubmVsKSk7CisgICAgICAgIGF1dG8mIGNvbm5lY3Rpb24gPSBwcm90ZWN0ZWRUaGlz LT5tX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jb25uZWN0aW9uKCk7CisgICAgICAgIGNvbm5lY3Rp b24uZmlyZUV2ZW50KExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6Y2hhbm5lbEV2ZW50KCpj b25uZWN0aW9uLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgV1RGTW92ZShkYXRhQ2hhbm5lbCkp KTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5o CmluZGV4IDUyMzMxNjgxYmY3OGZhMjY3YjVkMWRiMGRlNGUyMWEyNjNjZjM2NTkuLmQ3YTI2M2M1 ZWIzZGQ3MDMwMGE3MDUxZTkyY2I3MGNmODBjMTI5MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJX ZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTEyNCw3ICsxMjQsNiBAQCBwcml2YXRlOgogICAgIHZv aWQgYWRkUmVtb3RlU3RyZWFtKHdlYnJ0Yzo6TWVkaWFTdHJlYW1JbnRlcmZhY2UmKTsKICAgICB2 b2lkIGFkZFJlbW90ZVRyYWNrKHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFJlY2VpdmVy SW50ZXJmYWNlPiYmLCBjb25zdCBzdGQ6OnZlY3RvcjxydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRj OjpNZWRpYVN0cmVhbUludGVyZmFjZT4+Jik7CiAgICAgdm9pZCByZW1vdmVSZW1vdGVTdHJlYW0o d2VicnRjOjpNZWRpYVN0cmVhbUludGVyZmFjZSYpOwotICAgIHZvaWQgYWRkRGF0YUNoYW5uZWwo cnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbnRlcmZhY2U+JiYpOwogCiAg ICAgdm9pZCBPblN0YXRzRGVsaXZlcmVkKGNvbnN0IHJ0Yzo6c2NvcGVkX3JlZnB0cjxjb25zdCB3 ZWJydGM6OlJUQ1N0YXRzUmVwb3J0PiYpIGZpbmFsOwogICAgIHZvaWQgZ2F0aGVyU3RhdHNGb3JM b2dnaW5nKCk7Cg==