182926 2018-02-19 09:57:27 -0800 [RenderTreeBuilder] Remove redundant RenderObject::removeFromParentAndDestroy 2018-02-19 11:03:43 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1400382 0 zalan 2018-02-19 09:57:27 -0800 call removeAndDestroyChild directly instead. 1400383 1 webkit-bug-importer 2018-02-19 09:58:10 -0800 <rdar://problem/37674997> 1400386 2 334162 zalan 2018-02-19 10:02:27 -0800 Created attachment 334162 Patch 1400414 3 334162 commit-queue 2018-02-19 10:47:21 -0800 Comment on attachment 334162 Patch Rejecting attachment 334162 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 334162, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: rdparty/autoinstalled/mechanize/_urllib2_fork.py", line 332, in _call_chain result = func(*args) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1170, in https_open return self.do_open(conn_factory, req) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1118, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://webkit-queues.webkit.org/results/6574637 1400425 4 zalan 2018-02-19 11:03:43 -0800 Committed r228701: <https://trac.webkit.org/changeset/228701> 334162 2018-02-19 10:02:27 -0800 2018-02-19 10:47:21 -0800 Patch bug-182926-20180219100226.patch text/plain 16355 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUyOWZjNTI1YWU5MWNm OWIyMDI0OWRmOWQ5ODM2MjYxOWQzNWY1Zi4uM2NhYzE1MTM0MTJlN2UzMzM4N2FlZWUyYWExMGRm NDcwZWY1M2E1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDE4LTAyLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBSZW1vdmUgcmVkdW5kYW50IFJlbmRlck9iamVjdDo6cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ry b3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjky NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzc2NzQ5OTc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCBSZW5kZXJUcmVlQnVpbGRlcjo6cmVt b3ZlQW5kRGVzdHJveUNoaWxkKCkgZGlyZWN0bHkgaW5zdGVhZC4gCisKKyAgICAgICAgTm8gY2hh bmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldEZ1bGxTY3JlZW5SZW5kZXJlcik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJveE1vZGVsT2JqZWN0OjpyZW1vdmVBbmREZXN0cm95QWxsQ29udGludWF0aW9ucyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCdXR0b246OnNldFRleHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGdWxs U2NyZWVuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZ1bGxTY3JlZW46OndpbGxCZURl c3Ryb3llZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGdWxsU2NyZWVuOjp1bndyYXBSZW5k ZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxpc3RJdGVtOjp3aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0 OjpyZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dEZyYWdtZW50Ojp3aWxsQmVEZXN0 cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dEZyYWdtZW50OjpzZXRUZXh0KToK KyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OnJlbW92ZUZyb21QYXJlbnRBbmREZXN0 cm95Q2xlYW5pbmdVcEFub255bW91c1dyYXBwZXJzKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUcmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUcmVlQnVpbGRlcjo6TGlzdDo6dXBkYXRlSXRlbU1hcmtlcik6CisgICAgICAgICogcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpkZXN0cm95RnJhZ21lbnRl ZEZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1u OjpoYW5kbGVTcGFubmVyUmVtb3ZhbCk6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyUnVieS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVp bGRlcjo6UnVieTo6bW92ZUJsb2NrQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VHJlZUJ1aWxkZXI6OlJ1Ynk6OnRha2VDaGlsZCk6CisKIDIwMTgtMDItMTkgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIE1vdmUg UmVuZGVyRWxlbWVudDo6cmVtb3ZlQW5kRGVzdHJveUNoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxk ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGZlYzlmZjkyNTM3OTMwNWNiMTlhZjNlMGY5 MjNhN2NiNmM2MTE2Y2YuLmE1Yzg0ZmFmZWQxYjU5NDExNTM0ODhkZjM2NTZjNjc1YzY2YTA2MTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNjMxNSw3ICs2MzE1LDcgQEAgdm9pZCBEb2N1 bWVudDo6c2V0RnVsbFNjcmVlblJlbmRlcmVyKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyLCBS ZW5kZXJGdWxsU2NyZWUKICAgICB9CiAKICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVyZXIpCi0g ICAgICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShi dWlsZGVyKTsKKyAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm1fZnVsbFNj cmVlblJlbmRlcmVyKTsKICAgICBBU1NFUlQoIW1fZnVsbFNjcmVlblJlbmRlcmVyKTsKIAogICAg IG1fZnVsbFNjcmVlblJlbmRlcmVyID0gbWFrZVdlYWtQdHIocmVuZGVyZXIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggOGZm OTc3YjExNDdhNGI3N2EwMzhiODE3YmFmNjBmNjg2YTM3OWNhNC4uMzc2Mjk1MDZiNGE3YWJhZWQ0 NTY5N2RhMTBkM2JhYjBhNTE1MmU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0yNTU4LDcgKzI1NTgsNyBAQCB2b2lkIFJl bmRlckJveE1vZGVsT2JqZWN0OjpyZW1vdmVBbmREZXN0cm95QWxsQ29udGludWF0aW9ucyhSZW5k ZXJUcmVlQnVpbGRlciYgYgogICAgIEFTU0VSVChjb250aW51YXRpb25DaGFpbk5vZGVNYXAoKS5j b250YWlucyh0aGlzKSk7CiAgICAgYXV0byYgY29udGludWF0aW9uQ2hhaW5Ob2RlID0gKmNvbnRp bnVhdGlvbkNoYWluTm9kZU1hcCgpLmdldCh0aGlzKTsKICAgICB3aGlsZSAoY29udGludWF0aW9u Q2hhaW5Ob2RlLm5leHQpCi0gICAgICAgIGNvbnRpbnVhdGlvbkNoYWluTm9kZS5uZXh0LT5yZW5k ZXJlci0+cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3koYnVpbGRlcik7CisgICAgICAgIGJ1aWxk ZXIucmVtb3ZlQW5kRGVzdHJveUNoaWxkKCpjb250aW51YXRpb25DaGFpbk5vZGUubmV4dC0+cmVu ZGVyZXIpOwogICAgIHJlbW92ZUZyb21Db250aW51YXRpb25DaGFpbigpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCmluZGV4IDA1OTVmNTVhMWQ2MWI1YTk5 ODljMjI4NTQwYTUwMmE0NWZhMWMzNDMuLjQ2YjljN2M3NmM3MjU3MGIyNTc2ZDk0NTEwZjAwMjA5 NjRiMzcwMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0 b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCkBA IC0xMTcsMTEgKzExNyw5IEBAIHZvaWQgUmVuZGVyQnV0dG9uOjpzZXRUZXh0KGNvbnN0IFN0cmlu ZyYgc3RyKQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChSZW5kZXJUcmVlQnVpbGRl cjo6Y3VycmVudCgpKQotICAgICAgICBtX2J1dHRvblRleHQtPnJlbW92ZUZyb21QYXJlbnRBbmRE ZXN0cm95KCpSZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpKTsKLSAgICBlbHNlIHsKLSAgICAg ICAgUmVuZGVyVHJlZUJ1aWxkZXIgYnVpbGRlcigqZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkpOwot ICAgICAgICBtX2J1dHRvblRleHQtPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KGJ1aWxkZXIp OwotICAgIH0KKyAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKS0+cmVtb3ZlQW5k RGVzdHJveUNoaWxkKCptX2J1dHRvblRleHQpOworICAgIGVsc2UKKyAgICAgICAgUmVuZGVyVHJl ZUJ1aWxkZXIoKmRvY3VtZW50KCkucmVuZGVyVmlldygpKS5yZW1vdmVBbmREZXN0cm95Q2hpbGQo Km1fYnV0dG9uVGV4dCk7CiB9CiAKIFN0cmluZyBSZW5kZXJCdXR0b246OnRleHQoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uY3BwCmluZGV4IGUz ZTgzMTVlMDQ0ZDhjYjZjYzVlYjM2MDc0YzM2NjcwNzc2NzBmM2QuLjE1YmI5YTk2NjUzNWJhMDdj Yjc2OGRkMjg5NmE2Njk4NzVkODllYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGdWxsU2NyZWVuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRnVsbFNjcmVlbi5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgUmVuZGVyRnVsbFNjcmVlbjo6 UmVuZGVyRnVsbFNjcmVlbihEb2N1bWVudCYgZG9jdW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUp CiB2b2lkIFJlbmRlckZ1bGxTY3JlZW46OndpbGxCZURlc3Ryb3llZChSZW5kZXJUcmVlQnVpbGRl ciYgYnVpbGRlcikKIHsKICAgICBpZiAobV9wbGFjZWhvbGRlcikgewotICAgICAgICBtX3BsYWNl aG9sZGVyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShidWlsZGVyKTsKKyAgICAgICAgYnVp bGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm1fcGxhY2Vob2xkZXIpOwogICAgICAgICBBU1NF UlQoIW1fcGxhY2Vob2xkZXIpOwogICAgIH0KIApAQCAtMTY5LDcgKzE2OSw3IEBAIHZvaWQgUmVu ZGVyRnVsbFNjcmVlbjo6dW53cmFwUmVuZGVyZXIoYm9vbCYgcmVxdWlyZXNSZW5kZXJUcmVlUmVi dWlsZCkKICAgICAgICAgICAgICAgICBpZiAoYXV0byogbm9uQW5vbnltb3VzQ2hpbGQgPSBkb3du Y2FzdDxSZW5kZXJCbG9jaz4oKmNoaWxkKS5maXJzdENoaWxkKCkpCiAgICAgICAgICAgICAgICAg ICAgIGNoaWxkID0gbm9uQW5vbnltb3VzQ2hpbGQ7CiAgICAgICAgICAgICAgICAgZWxzZSB7Ci0g ICAgICAgICAgICAgICAgICAgIGNoaWxkLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShidWls ZGVyKTsKKyAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQo KmNoaWxkKTsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQpAQCAtMTg0LDEwICsxODQsMTAgQEAgdm9pZCBSZW5kZXJGdWxsU2Ny ZWVuOjp1bndyYXBSZW5kZXJlcihib29sJiByZXF1aXJlc1JlbmRlclRyZWVSZWJ1aWxkKQogICAg ICAgICB9CiAgICAgfQogICAgIGlmIChwbGFjZWhvbGRlcigpKQotICAgICAgICBwbGFjZWhvbGRl cigpLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShidWlsZGVyKTsKKyAgICAgICAgYnVpbGRl ci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKnBsYWNlaG9sZGVyKCkpOwogICAgIEFTU0VSVCghcGxh Y2Vob2xkZXIoKSk7CiAKLSAgICByZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShidWlsZGVyKTsK KyAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqdGhpcyk7CiB9CiAKIHZvaWQgUmVu ZGVyRnVsbFNjcmVlbjo6Y3JlYXRlUGxhY2Vob2xkZXIoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0 eWxlPiBzdHlsZSwgY29uc3QgTGF5b3V0UmVjdCYgZnJhbWVSZWN0KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKaW5kZXggYmM1OTliNDNkZGVmMTY4Mzk3MDJj NzgwMTQzMGY2MDY1MjAzYjQyNC4uYmU2OTNjYjRhZWU5NmU2ODA3ZDk5YjlhZWI2MGRmNjE1Yjlk ZmE1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwCkBA IC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSFRNTFVMaXN0RWxlbWVudC5oIgogI2luY2x1ZGUg IklubGluZUVsZW1lbnRCb3guaCIKICNpbmNsdWRlICJQc2V1ZG9FbGVtZW50LmgiCisjaW5jbHVk ZSAiUmVuZGVyVHJlZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVk ZSAiU3R5bGVJbmhlcml0ZWREYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0lzb01hbGxvY0lubGluZXMu aD4KQEAgLTU3LDcgKzU4LDcgQEAgUmVuZGVyTGlzdEl0ZW06On5SZW5kZXJMaXN0SXRlbSgpCiB2 b2lkIFJlbmRlckxpc3RJdGVtOjp3aWxsQmVEZXN0cm95ZWQoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1 aWxkZXIpCiB7CiAgICAgaWYgKG1fbWFya2VyKQotICAgICAgICBtX21hcmtlci0+cmVtb3ZlRnJv bVBhcmVudEFuZERlc3Ryb3koYnVpbGRlcik7CisgICAgICAgIGJ1aWxkZXIucmVtb3ZlQW5kRGVz dHJveUNoaWxkKCptX21hcmtlcik7CiAgICAgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95 ZWQoYnVpbGRlcik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHAKaW5kZXggYTUwN2IyZTg3Y2ZmZDhlMGNhNmIwNjY0YjkxMjhmNmU0NWJhZDIwMS4uZjIwZGE3 NGMzN2MyYTIwMjZlNDVhNDQ3NzlhZDM5NDQ5YTVkM2NiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTI1NSwxMiArMjU1LDYgQEAgdm9pZCBSZW5kZXJP YmplY3Q6OnNldFBhcmVudChSZW5kZXJFbGVtZW50KiBwYXJlbnQpCiAgICAgbV9wYXJlbnQgPSBw YXJlbnQ7CiB9CiAKLXZvaWQgUmVuZGVyT2JqZWN0OjpyZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJv eShSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKLXsKLSAgICBBU1NFUlQobV9wYXJlbnQpOwot ICAgIGJ1aWxkZXIucmVtb3ZlQW5kRGVzdHJveUNoaWxkKCp0aGlzKTsKLX0KLQogUmVuZGVyT2Jq ZWN0KiBSZW5kZXJPYmplY3Q6Om5leHRJblByZU9yZGVyKCkgY29uc3QKIHsKICAgICBpZiAoUmVu ZGVyT2JqZWN0KiBvID0gZmlyc3RDaGlsZFNsb3coKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAppbmRleCA0NGVjMmFlNGU4NTQ1YTE3YTg0MmQ0YTMyZTA1YWI3NjVkYWVl MWI3Li42MWY3NmE3NTM3OGI1MTIwMzYwMzU4ZTk2ZDc4MWMzMzE0NjgzN2UxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC03NTMsOCArNzUzLDYgQEAgcHVibGlj OgogICAgIHZvaWQgaW1hZ2VDaGFuZ2VkKENhY2hlZEltYWdlKiwgY29uc3QgSW50UmVjdCogPSBu dWxscHRyKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgaW1hZ2VDaGFuZ2VkKFdyYXBwZWRJ bWFnZVB0ciwgY29uc3QgSW50UmVjdCogPSBudWxscHRyKSB7IH0KIAotICAgIHZvaWQgcmVtb3Zl RnJvbVBhcmVudEFuZERlc3Ryb3koUmVuZGVyVHJlZUJ1aWxkZXImKTsKLQogICAgIENTU0FuaW1h dGlvbkNvbnRyb2xsZXImIGFuaW1hdGlvbigpIGNvbnN0OwogCiAgICAgLy8gTWFwIHBvaW50cyBh bmQgcXVhZHMgdGhyb3VnaCBlbGVtZW50cywgcG90ZW50aWFsbHkgdmlhIDNkIHRyYW5zZm9ybXMu IFlvdSBzaG91bGQgbmV2ZXIgbmVlZCB0byBjYWxsIHRoZXNlIGRpcmVjdGx5OyB1c2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAKaW5kZXggMDE2 OWFkY2E1NWJkYmIxN2MzOTdlMDBiYTc0MmIzMjcyZDdmNzhhMC4uMTBkNTE1ZDJlNGYwZTI0Yjcx MzQ4M2MzOWYxZmZhNzkxYWUyZWMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHRGcmFnbWVudC5jcHAKQEAgLTc3LDcgKzc3LDcgQEAgdm9pZCBSZW5kZXJUZXh0 RnJhZ21lbnQ6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5k ZXJTdHlsZSoKIHZvaWQgUmVuZGVyVGV4dEZyYWdtZW50Ojp3aWxsQmVEZXN0cm95ZWQoUmVuZGVy VHJlZUJ1aWxkZXImIGJ1aWxkZXIpCiB7CiAgICAgaWYgKG1fZmlyc3RMZXR0ZXIpCi0gICAgICAg IG1fZmlyc3RMZXR0ZXItPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KGJ1aWxkZXIpOworICAg ICAgICBidWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqbV9maXJzdExldHRlcik7CiAgICAg UmVuZGVyVGV4dDo6d2lsbEJlRGVzdHJveWVkKGJ1aWxkZXIpOwogfQogCkBAIC04OSwxMSArODks OSBAQCB2b2lkIFJlbmRlclRleHRGcmFnbWVudDo6c2V0VGV4dChjb25zdCBTdHJpbmcmIG5ld1Rl eHQsIGJvb2wgZm9yY2UpCiAgICAgaWYgKCFtX2ZpcnN0TGV0dGVyKQogICAgICAgICByZXR1cm47 CiAgICAgaWYgKFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCkpCi0gICAgICAgIG1fZmlyc3RM ZXR0ZXItPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KCpSZW5kZXJUcmVlQnVpbGRlcjo6Y3Vy cmVudCgpKTsKLSAgICBlbHNlIHsKLSAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXIgYnVpbGRlcigq ZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkpOwotICAgICAgICBtX2ZpcnN0TGV0dGVyLT5yZW1vdmVG cm9tUGFyZW50QW5kRGVzdHJveShidWlsZGVyKTsKLSAgICB9CisgICAgICAgIFJlbmRlclRyZWVC dWlsZGVyOjpjdXJyZW50KCktPnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqbV9maXJzdExldHRlcik7 CisgICAgZWxzZQorICAgICAgICBSZW5kZXJUcmVlQnVpbGRlcigqZG9jdW1lbnQoKS5yZW5kZXJW aWV3KCkpLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqbV9maXJzdExldHRlcik7CiAgICAgQVNTRVJU KCFtX2ZpcnN0TGV0dGVyKTsKICAgICBBU1NFUlQoIXRleHROb2RlKCkgfHwgdGV4dE5vZGUoKS0+ cmVuZGVyZXIoKSA9PSB0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDdmZmU2MmIzNDExYzlh ZGYzMTM0YTQ4ZTAzYzhjMDZkYmY1NjIwYWUuLjVlNDhjMjJkMjFkZjQyNDBiNTU5ODZiMTk4YmM2 YjE1OWE0ZGQ5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcApAQCAtNjQ2LDcgKzY0Niw3IEBAIHZvaWQgUmVu ZGVyVHJlZUJ1aWxkZXI6OnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95Q2xlYW5pbmdVcEFub255 bW91c1dyYXBwZXJzKFJlCiB7CiAgICAgLy8gSWYgdGhlIHRyZWUgaXMgZGVzdHJveWVkLCB0aGVy ZSBpcyBubyBuZWVkIGZvciBhIGNsZWFuLXVwIHBoYXNlLgogICAgIGlmIChjaGlsZC5yZW5kZXJU cmVlQmVpbmdEZXN0cm95ZWQoKSkgewotICAgICAgICBjaGlsZC5yZW1vdmVGcm9tUGFyZW50QW5k RGVzdHJveSgqdGhpcyk7CisgICAgICAgIHJlbW92ZUFuZERlc3Ryb3lDaGlsZChjaGlsZCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNwcAppbmRleCBkYzAx N2ZkODRjNzczZDg5NzJmNmEzZDA0ZDA4MmMyOWQzNDE5MjgxLi43MGZjYWQxZTE0MmIxMzEzN2Qz YWU3ZTEzMTFlZWZkYzUzZTRlYzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwCkBAIC0zMTks NyArMzE5LDcgQEAgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OkJs b2NrOjp0YWtlQ2hpbGQoUmVuZGVyQmxvY2smIHBhcmVudCwKIAogICAgICAgICAgICAgLy8gRGVs ZXRlIHRoZSBub3ctZW1wdHkgYmxvY2sncyBsaW5lcyBhbmQgbnVrZSBpdC4KICAgICAgICAgICAg IG5leHRCbG9jay5kZWxldGVMaW5lcygpOwotICAgICAgICAgICAgbmV4dEJsb2NrLnJlbW92ZUZy b21QYXJlbnRBbmREZXN0cm95KG1fYnVpbGRlcik7CisgICAgICAgICAgICBtX2J1aWxkZXIucmVt b3ZlQW5kRGVzdHJveUNoaWxkKG5leHRCbG9jayk7CiAgICAgICAgICAgICBuZXh0ID0gbnVsbHB0 cjsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTGlzdC5jcHAKaW5kZXggMzE3YjIxNDBl MzcxMGY5MzgyMjdmMThjZDY5NGY2ODU1MzVkZWM0NC4uMDdiMzIzZjNkNjYyMWM5Nzk1NWU3Yzlj OTFjMTYwMzQzZTk1Mzc3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTGlzdC5jcHAKQEAgLTgwLDcgKzgwLDcg QEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6TGlzdDo6dXBkYXRlSXRlbU1hcmtlcihSZW5kZXJM aXN0SXRlbSYgbGlzdEl0ZW1SZW5kZXJlcikKIAogICAgIGlmIChzdHlsZS5saXN0U3R5bGVUeXBl KCkgPT0gTm9uZUxpc3RTdHlsZSAmJiAoIXN0eWxlLmxpc3RTdHlsZUltYWdlKCkgfHwgc3R5bGUu bGlzdFN0eWxlSW1hZ2UoKS0+ZXJyb3JPY2N1cnJlZCgpKSkgewogICAgICAgICBpZiAoYXV0byog bWFya2VyID0gbGlzdEl0ZW1SZW5kZXJlci5tYXJrZXJSZW5kZXJlcigpKQotICAgICAgICAgICAg bWFya2VyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShtX2J1aWxkZXIpOworICAgICAgICAg ICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqbWFya2VyKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtMTIxLDcgKzEyMSw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6 Okxpc3Q6OnVwZGF0ZUl0ZW1NYXJrZXIoUmVuZGVyTGlzdEl0ZW0mIGxpc3RJdGVtUmVuZGVyZXIp CiAKICAgICAvLyBJZiBjdXJyZW50IHBhcmVudCBpcyBhbiBhbm9ueW1vdXMgYmxvY2sgdGhhdCBo YXMgbG9zdCBhbGwgaXRzIGNoaWxkcmVuLCBkZXN0cm95IGl0LgogICAgIGlmIChjdXJyZW50UGFy ZW50ICYmIGN1cnJlbnRQYXJlbnQtPmlzQW5vbnltb3VzQmxvY2soKSAmJiAhY3VycmVudFBhcmVu dC0+Zmlyc3RDaGlsZCgpICYmICFkb3duY2FzdDxSZW5kZXJCbG9jaz4oKmN1cnJlbnRQYXJlbnQp LmNvbnRpbnVhdGlvbigpKQotICAgICAgICBjdXJyZW50UGFyZW50LT5yZW1vdmVGcm9tUGFyZW50 QW5kRGVzdHJveShtX2J1aWxkZXIpOworICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJv eUNoaWxkKCpjdXJyZW50UGFyZW50KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4uY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlD b2x1bW4uY3BwCmluZGV4IDJkMzgzZmYyMzFlZjkxMjZkZDljOTBjOTZlM2I1YTQ5ODFiNDI1YTQu LjZhODUxOTE5MjI5YzlmNzRiNzcxODIyYThiNWM5YTRkN2ViNTg5NDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11bHRpQ29s dW1uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHAKQEAgLTIxMiwxMSArMjEyLDExIEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpkZXN0cm95RnJhZ21lbnRlZEZsb3coUmVuZGVyQmxv Y2tGbG93JiBmbG93CiAgICAgICAgIHBhcmVudEFuZFNwYW5uZXJMaXN0LmFwcGVuZChzdGQ6Om1h a2VfcGFpcihzcGFubmVyT3JpZ2luYWxQYXJlbnQsIG1fYnVpbGRlci50YWtlQ2hpbGQoKnNwYW5u ZXItPnBhcmVudCgpLCAqc3Bhbm5lcikpKTsKICAgICB9CiAgICAgd2hpbGUgKGF1dG8qIGNvbHVt blNldCA9IG11bHRpQ29sdW1uRmxvdy5maXJzdE11bHRpQ29sdW1uU2V0KCkpCi0gICAgICAgIGNv bHVtblNldC0+cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3kobV9idWlsZGVyKTsKKyAgICAgICAg bV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCgqY29sdW1uU2V0KTsKIAogICAgIGZsb3cu Y2xlYXJNdWx0aUNvbHVtbkZsb3coKTsKICAgICBtX2J1aWxkZXIubW92ZUFsbENoaWxkcmVuVG8o bXVsdGlDb2x1bW5GbG93LCBmbG93LCBSZW5kZXJUcmVlQnVpbGRlcjo6Tm9ybWFsaXplQWZ0ZXJJ bnNlcnRpb246Olllcyk7Ci0gICAgbXVsdGlDb2x1bW5GbG93LnJlbW92ZUZyb21QYXJlbnRBbmRE ZXN0cm95KG1fYnVpbGRlcik7CisgICAgbV9idWlsZGVyLnJlbW92ZUFuZERlc3Ryb3lDaGlsZCht dWx0aUNvbHVtbkZsb3cpOwogICAgIGZvciAoYXV0byYgcGFyZW50QW5kU3Bhbm5lciA6IHBhcmVu dEFuZFNwYW5uZXJMaXN0KQogICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGQoKnBhcmVudEFu ZFNwYW5uZXIuZmlyc3QsIFdURk1vdmUocGFyZW50QW5kU3Bhbm5lci5zZWNvbmQpKTsKIH0KQEAg LTM3MiwxMyArMzcyLDEzIEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpo YW5kbGVTcGFubmVyUmVtb3ZhbChSZW5kZXJNdWx0aUNvbHVtbkZsb3cmCiB7CiAgICAgLy8gVGhl IHBsYWNlaG9sZGVyIG1heSBhbHJlYWR5IGhhdmUgYmVlbiByZW1vdmVkLCBidXQgaWYgaXQgaGFz bid0LCBkbyBzbyBub3cuCiAgICAgaWYgKGF1dG8gcGxhY2Vob2xkZXIgPSBmbG93LnNwYW5uZXJN YXAoKS50YWtlKCZkb3duY2FzdDxSZW5kZXJCb3g+KHNwYW5uZXIpKSkKLSAgICAgICAgcGxhY2Vo b2xkZXItPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KG1fYnVpbGRlcik7CisgICAgICAgIG1f YnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKnBsYWNlaG9sZGVyKTsKIAogICAgIGlmIChh dXRvKiBuZXh0ID0gc3Bhbm5lci5uZXh0U2libGluZygpKSB7CiAgICAgICAgIGlmIChhdXRvKiBw cmV2aW91cyA9IHNwYW5uZXIucHJldmlvdXNTaWJsaW5nKCkpIHsKICAgICAgICAgICAgIGlmIChw cmV2aW91cy0+aXNSZW5kZXJNdWx0aUNvbHVtblNldCgpICYmIG5leHQtPmlzUmVuZGVyTXVsdGlD b2x1bW5TZXQoKSkgewogICAgICAgICAgICAgICAgIC8vIE1lcmdlIHR3byBzZXRzIHRoYXQgbm8g bG9uZ2VyIHdpbGwgYmUgc2VwYXJhdGVkIGJ5IGEgc3Bhbm5lci4KLSAgICAgICAgICAgICAgICBu ZXh0LT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveShtX2J1aWxkZXIpOworICAgICAgICAgICAg ICAgIG1fYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQoKm5leHQpOwogICAgICAgICAgICAg ICAgIHByZXZpb3VzLT5zZXROZWVkc0xheW91dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJSdWJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlclJ1YnkuY3BwCmluZGV4IDI5MTZjMjg2MTUwNjQzM2U4YTc1YjliM2NiMWNh MzZiODc1MzE2ZGEuLmY5MWFjNjYxNWYyZTdlNDQ4NGFkYjAxYjQzNmI5Mzg4NTQ5ODEwOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlclJ1YnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlclJ1YnkuY3BwCkBAIC0xNjYsNyArMTY2LDcgQEAgdm9pZCBSZW5kZXJUcmVl QnVpbGRlcjo6UnVieTo6bW92ZUJsb2NrQ2hpbGRyZW4oUmVuZGVyUnVieUJhc2UmIGZyb20sIFJl bmRlclJ1YnkKICAgICAgICAgYXV0byogYW5vbkJsb2NrVGhlcmUgPSBkb3duY2FzdDxSZW5kZXJC bG9jaz4obGFzdENoaWxkVGhlcmUpOwogICAgICAgICBtX2J1aWxkZXIubW92ZUFsbENoaWxkcmVu VG8oKmFub25CbG9ja0hlcmUsICphbm9uQmxvY2tUaGVyZSwgUmVuZGVyVHJlZUJ1aWxkZXI6Ok5v cm1hbGl6ZUFmdGVySW5zZXJ0aW9uOjpZZXMpOwogICAgICAgICBhbm9uQmxvY2tIZXJlLT5kZWxl dGVMaW5lcygpOwotICAgICAgICBhbm9uQmxvY2tIZXJlLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVz dHJveShtX2J1aWxkZXIpOworICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJveUNoaWxk KCphbm9uQmxvY2tIZXJlKTsKICAgICB9CiAgICAgLy8gTW92ZSBhbGwgcmVtYWluaW5nIGNoaWxk cmVuIG5vcm1hbGx5LgogICAgIG1fYnVpbGRlci5tb3ZlQ2hpbGRyZW5Ubyhmcm9tLCB0bywgZnJv bS5maXJzdENoaWxkKCksIGJlZm9yZUNoaWxkLCBSZW5kZXJUcmVlQnVpbGRlcjo6Tm9ybWFsaXpl QWZ0ZXJJbnNlcnRpb246Ok5vKTsKQEAgLTM5Myw3ICszOTMsNyBAQCBSZW5kZXJQdHI8UmVuZGVy T2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6dGFrZUNoaWxkKFJlbmRlclJ1YnlBc0lu bGluZSYgcAogICAgICAgICBBU1NFUlQoY2hpbGQuaXNCZWZvcmVDb250ZW50KCkgfHwgY2hpbGQu aXNBZnRlckNvbnRlbnQoKSk7CiAgICAgICAgIGF1dG8mIHBhcmVudCA9ICpjaGlsZC5wYXJlbnQo KTsKICAgICAgICAgYXV0byB0YWtlbkNoaWxkID0gbV9idWlsZGVyLnRha2VDaGlsZChwYXJlbnQs IGNoaWxkKTsKLSAgICAgICAgcGFyZW50LnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KG1fYnVp bGRlcik7CisgICAgICAgIG1fYnVpbGRlci5yZW1vdmVBbmREZXN0cm95Q2hpbGQocGFyZW50KTsK ICAgICAgICAgcmV0dXJuIHRha2VuQ2hpbGQ7CiAgICAgfQogCkBAIC00MTcsNyArNDE3LDcgQEAg UmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OnRha2VDaGls ZChSZW5kZXJSdWJ5QXNCbG9jayYgcGEKICAgICAgICAgQVNTRVJUKGNoaWxkLmlzQmVmb3JlQ29u dGVudCgpIHx8IGNoaWxkLmlzQWZ0ZXJDb250ZW50KCkpOwogICAgICAgICBhdXRvJiBwYXJlbnQg PSAqY2hpbGQucGFyZW50KCk7CiAgICAgICAgIGF1dG8gdGFrZW5DaGlsZCA9IG1fYnVpbGRlci50 YWtlQ2hpbGQocGFyZW50LCBjaGlsZCk7Ci0gICAgICAgIHBhcmVudC5yZW1vdmVGcm9tUGFyZW50 QW5kRGVzdHJveShtX2J1aWxkZXIpOworICAgICAgICBtX2J1aWxkZXIucmVtb3ZlQW5kRGVzdHJv eUNoaWxkKHBhcmVudCk7CiAgICAgICAgIHJldHVybiB0YWtlbkNoaWxkOwogICAgIH0KIAo=