182878 2018-02-16 09:53:37 -0800 [RenderTreeBuilder] Move RenderElement::addChild() to RenderTreeBuilder 2018-02-16 11:25:28 -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 1399917 0 zalan 2018-02-16 09:53:37 -0800 ssia 1399918 1 webkit-bug-importer 2018-02-16 09:53:56 -0800 <rdar://problem/37608349> 1399922 2 334049 zalan 2018-02-16 10:25:25 -0800 Created attachment 334049 Patch 1399923 3 334049 koivisto 2018-02-16 10:27:15 -0800 Comment on attachment 334049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334049&action=review > Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:325 > parent.RenderElement::insertChildInternal(WTFMove(child), beforeChild); > + parent.RenderElement::didInsertChild(newChild, beforeChild); RenderElement:: is probably not needed in either case. 1399924 4 334050 zalan 2018-02-16 10:29:23 -0800 Created attachment 334050 Patch 1399951 5 334050 commit-queue 2018-02-16 11:25:23 -0800 Comment on attachment 334050 Patch Clearing flags on attachment: 334050 Committed r228566: <https://trac.webkit.org/changeset/228566> 1399952 6 commit-queue 2018-02-16 11:25:28 -0800 All reviewed patches have been landed. Closing bug. 334049 2018-02-16 10:25:25 -0800 2018-02-16 10:29:22 -0800 Patch bug-182878-20180216102524.patch text/plain 12215 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU5YmQ1OTI3MWIzYTIz NTAzODNhYmJhYjBiNTViYjdiY2YxM2FlZC4uYzM2ZDE5ZmYxN2VmZTk0ZjU2M2E4ZWNjNTU4MTY5 NmIzNDBhYTlmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjg3OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzc2MDgzNDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIHRoZSBsYXN0IGFkZENo aWxkKCkgcmVsYXRlZCBtdXRhdGlvbiBsb2dpYyBmcm9tIHRoZSByZW5kZXJlcnMuCisKKyAgICAg ICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpkaWRJbnNl cnRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjphZGRDaGlsZCk6IERl bGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckVsZW1lbnQ6OmlzQ2hpbGRBbGxvd2VkIGNvbnN0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudCk6CisgICAgICAgICog cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmg6CisgICAgICAgICogcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OkJsb2NrOjppbnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0 aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxp bmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OklubGluZTo6aW5z ZXJ0Q2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRy ZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU cmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENoaWxkKToKKwogMjAxOC0wMi0xNiAgRnVqaWkgSGly b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBJbmRleGVkREI6IFNl dmVyYWwgdGVzdCBjcmFzaCBpbiB3aGVuIGRlc3Ryb3lpbmcgYSBJREJLZXlEYXRhCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggZDFkMzgzNWYyZGYwMzhk MWRlMDZjOWFjMzM5NzNmNmI5ZWU2MDNjNi4uYjRkMDExNGRjZGNmMjY0N2YzNmU5YmFkYjQ5NGFj NjlhNDQ3YmU1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNw cApAQCAtNDU2LDExICs0NTYsOCBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnNldFN0eWxlKFJlbmRl clN0eWxlJiYgc3R5bGUsIFN0eWxlRGlmZmVyZW5jZSBtaW5pbWFsU3R5bGVEaQogICAgIH0KIH0K IAotdm9pZCBSZW5kZXJFbGVtZW50OjphZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRl ciwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3Jl Q2hpbGQpCit2b2lkIFJlbmRlckVsZW1lbnQ6OmRpZEluc2VydENoaWxkKFJlbmRlck9iamVjdCYg Y2hpbGQsIFJlbmRlck9iamVjdCopCiB7Ci0gICAgYXV0byYgY2hpbGQgPSAqbmV3Q2hpbGQ7Ci0g ICAgYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudCgqdGhpcywgV1RGTW92ZShuZXdD aGlsZCksIGJlZm9yZUNoaWxkKTsKLQogICAgIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZCkpCiAg ICAgICAgIGRvd25jYXN0PFJlbmRlclRleHQ+KGNoaWxkKS5zdHlsZURpZENoYW5nZShTdHlsZURp ZmZlcmVuY2VFcXVhbCwgbnVsbHB0cik7CiAgICAgLy8gU1ZHIGNyZWF0ZXMgcmVuZGVyZXJzIGZv ciA8ZyBkaXNwbGF5PSJub25lIj4sIGFzIFNWRyByZXF1aXJlcyBjaGlsZHJlbiBvZiBoaWRkZW4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGNiOGM1OGI2M2Y5 NjVlZDkzMmFlZTExY2E5NjM5MDVmZmQ1NTEzMTIuLjBjMzMzNWQ5YjM4ZTM3ZTE1ZGNmYmZhODU3 N2Q2MDNkYWQyYmQ3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu aApAQCAtODcsOSArODcsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1JlbmRlcklubGluZSgpIGNv bnN0OwogCiAgICAgdmlydHVhbCBib29sIGlzQ2hpbGRBbGxvd2VkKGNvbnN0IFJlbmRlck9iamVj dCYsIGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZpcnR1 YWwgdm9pZCBhZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hp bGRJZ25vcmluZ0NvbnRpbnVhdGlvbihSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlclB0cjxSZW5k ZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7 CiAgICAgdm9pZCByZW1vdmVBbmREZXN0cm95Q2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5k ZXJPYmplY3QmKTsKKyAgICB2b2lkIGRpZEluc2VydENoaWxkKFJlbmRlck9iamVjdCYgY2hpbGQs IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOwogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBmdW5j dGlvbnMgYXJlIHVzZWQgd2hlbiB0aGUgcmVuZGVyIHRyZWUgaGllcmFyY2h5IGNoYW5nZXMgdG8g bWFrZSBzdXJlIGxheWVycyBnZXQKICAgICAvLyBwcm9wZXJseSBhZGRlZCBhbmQgcmVtb3ZlZC4g U2luY2UgY29udGFpbmVyc2hpcCBjYW4gYmUgaW1wbGVtZW50ZWQgYnkgYW55IHN1YmNsYXNzLCBh bmQgc2luY2UgYSBoaWVyYXJjaHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDY1M2M2NjVhYjI2NzFmOTBi Y2JjNGY5NmQ3NDA2YzFhZjQzM2VmYTguLjk3MjkwYmUzMWM5ZTE5NGY4MDFjZmE0MmNkMGNmZDIz NDUxOTUwN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcApAQCAtMTQyLDcgKzE0Miw3IEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKFJlbmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZGVyUHRy PFJlbmRlck9iamVjCiB7CiAgICAgYXV0byBpbnNlcnRSZWN1cnNpdmVJZk5lZWRlZCA9IFsmXShS ZW5kZXJFbGVtZW50JiBwYXJlbnRDYW5kaWRhdGUpIHsKICAgICAgICAgaWYgKCZwYXJlbnQgPT0g JnBhcmVudENhbmRpZGF0ZSkgewotICAgICAgICAgICAgcGFyZW50LmFkZENoaWxkKCp0aGlzLCBX VEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgaW5zZXJ0Q2hpbGRUb1Jl bmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGluc2VydENoaWxkKHBhcmVudENhbmRp ZGF0ZSwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKQEAgLTI1NSw3ICsyNTUsNyBAQCB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZChSZW5kZXJFbGVtZW50JiBwYXJlbnQs IFJlbmRlclB0cjxSZW5kZXJPYmplYwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcGFy ZW50LmFkZENoaWxkKCp0aGlzLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIGlu c2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNo aWxkKTsKIH0KIAogUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OnRh a2VDaGlsZChSZW5kZXJFbGVtZW50JiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQpCkBAIC0z MjAsNyArMzIwLDkgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRl ckVsZW1lbnQoUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXIKICAgICAgICAgaW5zZXJ0Q2hp bGQoKnRhYmxlLCBXVEZNb3ZlKGNoaWxkKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAg YXV0byYgbmV3Q2hpbGQgPSAqY2hpbGQuZ2V0KCk7CiAgICAgcGFyZW50LlJlbmRlckVsZW1lbnQ6 Omluc2VydENoaWxkSW50ZXJuYWwoV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBw YXJlbnQuUmVuZGVyRWxlbWVudDo6ZGlkSW5zZXJ0Q2hpbGQobmV3Q2hpbGQsIGJlZm9yZUNoaWxk KTsKIH0KIAogdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2Nr SWdub3JpbmdDb250aW51YXRpb24oUmVuZGVyQmxvY2smIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRl ck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCmluZGV4 IDI1NjJhYjc2ZDM3YTFmM2VhY2I4ODIyZTRjZWZkYjRjOWVmZjc5MDQuLjUxN2IyMWU3ZmM4YTFl ZmUwNjAyMGRjODgxYjA3ZjE2NWEyNTkwMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCkBAIC02Myw3ICs2Myw2IEBA IHB1YmxpYzoKICAgICBzdGF0aWMgUmVuZGVyVHJlZUJ1aWxkZXIqIGN1cnJlbnQoKSB7IHJldHVy biBzX2N1cnJlbnQ7IH0KIAogICAgIC8vIFRoZXNlIGZ1bmN0aW9ucyBhcmUgdGVtcG9yYXJ5IHVu dGlsIGFmdGVyIGFsbCBibG9jay9pbmxpbmUvY29udGludWF0aW9uIGNvZGUgaXMgbW92ZWQgb3Zl ci4KLSAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KFJlbmRlckVsZW1lbnQmIHBh cmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3Jl Q2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJCbG9ja0lnbm9y aW5nQ29udGludWF0aW9uKFJlbmRlckJsb2NrJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9pZCBpbnNl cnRDaGlsZFRvUmVuZGVySW5saW5lSWdub3JpbmdDb250aW51YXRpb24oUmVuZGVySW5saW5lJiBw YXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxk ID0gbnVsbHB0cik7CiAKQEAgLTk1LDYgKzk0LDcgQEAgcHJpdmF0ZToKICAgICBSZW5kZXJQdHI8 UmVuZGVyT2JqZWN0PiB0YWtlQ2hpbGRGcm9tUmVuZGVyR3JpZChSZW5kZXJHcmlkJiBwYXJlbnQs IFJlbmRlck9iamVjdCYgY2hpbGQpOwogCiAgICAgdm9pZCBpbnNlcnRDaGlsZFRvUmVuZGVyR3Jp ZChSZW5kZXJHcmlkJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CisgICAgdm9pZCBpbnNlcnRDaGlsZFRv UmVuZGVyRWxlbWVudChSZW5kZXJFbGVtZW50JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAKICAgICBG aXJzdExldHRlciYgZmlyc3RMZXR0ZXJCdWlsZGVyKCkgeyByZXR1cm4gKm1fZmlyc3RMZXR0ZXJC dWlsZGVyOyB9CiAgICAgTGlzdCYgbGlzdEJ1aWxkZXIoKSB7IHJldHVybiAqbV9saXN0QnVpbGRl cjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwCmluZGV4IDQzZTU3MDY0MDE4ZWRhM2NhMTcwMThj MThmOGYwM2NiYmEzM2NhNTQuLjI4Nzg3MzI1ZmI2MDc5MjE3ZTcxNjQyZmY1MzAyMDEyMTRhN2Vk ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHAKQEAgLTIyMyw3ICsyMjMsNyBAQCB2b2lkIFJl bmRlclRyZWVCdWlsZGVyOjpCbG9jazo6aW5zZXJ0Q2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbihS ZW5kZXJCbG9jayYgcGFyZQogICAgICAgICAgICAgLy8gTm8gc3VpdGFibGUgZXhpc3RpbmcgYW5v bnltb3VzIGJveCAtIGNyZWF0ZSBhIG5ldyBvbmUuCiAgICAgICAgICAgICBhdXRvIG5ld0JveCA9 IHBhcmVudC5jcmVhdGVBbm9ueW1vdXNCbG9jaygpOwogICAgICAgICAgICAgYXV0byYgYm94ID0g Km5ld0JveDsKLSAgICAgICAgICAgIHBhcmVudC5SZW5kZXJFbGVtZW50OjphZGRDaGlsZChtX2J1 aWxkZXIsIFdURk1vdmUobmV3Qm94KSwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgbV9idWls ZGVyLmluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShuZXdCb3gpLCBi ZWZvcmVDaGlsZCk7CiAgICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGQoYm94LCBXVEZN b3ZlKGNoaWxkKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTIzMSw3ICsy MzEsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpCbG9jazo6aW5zZXJ0Q2hpbGRJZ25vcmlu Z0NvbnRpbnVhdGlvbihSZW5kZXJCbG9jayYgcGFyZQogCiAgICAgcGFyZW50LmludmFsaWRhdGVM aW5lTGF5b3V0UGF0aCgpOwogCi0gICAgcGFyZW50LlJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKG1f YnVpbGRlciwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBtX2J1aWxkZXIuaW5z ZXJ0Q2hpbGRUb1JlbmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hp bGQpOwogCiAgICAgaWYgKG1hZGVCb3hlc05vbklubGluZSAmJiBpczxSZW5kZXJCbG9jaz4ocGFy ZW50LnBhcmVudCgpKSAmJiBwYXJlbnQuaXNBbm9ueW1vdXNCbG9jaygpKQogICAgICAgICByZW1v dmVMZWZ0b3ZlckFub255bW91c0Jsb2NrKHBhcmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVySW5saW5lLmNw cAppbmRleCA5MDRiY2RlZDcxMTM5YTc3YjI0NjBmY2E0ZDIyMTM5NTlkZTMxMjUyLi5iZTU1YWMx NmRmZmMwN2IwNDY5MmNmMjZjOTA4ODlmM2RkNmFiODkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlcklubGlu ZS5jcHAKQEAgLTE4OCw3ICsxODgsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpJbmxpbmU6 Omluc2VydENoaWxkSWdub3JpbmdDb250aW51YXRpb24oUmVuZGVySW5saW5lJiBwYQogICAgIH0K IAogICAgIGF1dG8mIGNoaWxkVG9BZGQgPSAqY2hpbGQ7Ci0gICAgcGFyZW50LlJlbmRlckVsZW1l bnQ6OmFkZENoaWxkKG1fYnVpbGRlciwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAg ICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNo aWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgIGNoaWxkVG9BZGQuc2V0TmVlZHNMYXlvdXRBbmRQcmVm V2lkdGhzUmVjYWxjKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclNWRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJTVkcuY3BwCmluZGV4IDdjZmIyZDU2NjE3 YzhhYWUyOTMwZTIwYzJmYTcwMTY2ZGY2MjYxZDcuLjZhMjIwZGFiNDlhMjM3MTI5MGQxY2E5MzMy NjAyMWU2MThkMzU4ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlQnVpbGRlclNWRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcApAQCAtNDMsNyArNDMsNyBAQCBS ZW5kZXJUcmVlQnVpbGRlcjo6U1ZHOjpTVkcoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIpCiB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKFJlbmRlclNWR0NvbnRhaW5l ciYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBi ZWZvcmVDaGlsZCkKIHsKICAgICBhdXRvJiBjaGlsZFRvQWRkID0gKmNoaWxkOwotICAgIHBhcmVu dC5SZW5kZXJFbGVtZW50OjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBiZWZv cmVDaGlsZCk7CisgICAgbV9idWlsZGVyLmluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVu dCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKICAgICBTVkdSZXNvdXJjZXNDYWNoZTo6 Y2xpZW50V2FzQWRkZWRUb1RyZWUoY2hpbGRUb0FkZCk7CiB9CiAKQEAgLTYwLDcgKzYwLDcgQEAg dm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6U1ZHOjppbnNlcnRDaGlsZChSZW5kZXJTVkdJbmxpbmUm IHBhcmVudCwgUmVuZGVyUHRyPFJlbmQKIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OlNWRzo6aW5z ZXJ0Q2hpbGQoUmVuZGVyU1ZHUm9vdCYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBj aGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICBhdXRvJiBjaGlsZFRvQWRk ID0gKmNoaWxkOwotICAgIHBhcmVudC5SZW5kZXJFbGVtZW50OjphZGRDaGlsZChtX2J1aWxkZXIs IFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgbV9idWlsZGVyLmluc2VydENoaWxk VG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKICAg ICBTVkdSZXNvdXJjZXNDYWNoZTo6Y2xpZW50V2FzQWRkZWRUb1RyZWUoY2hpbGRUb0FkZCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlclRhYmxlLmNwcAppbmRleCAyOTRhMWZjN2I5OWFmYTFlY2I0MjljOTI5 ZTZjOWQ0MjIyMmUxYTEzLi40OTc1YzMwNWM3ODkxYTY5NzYzMWE0NjAyODI4NjA5ZDIwYWQ4YmQw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyVGFibGUuY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBSZW5k ZXJUcmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENoaWxkKFJlbmRlclRhYmxlUm93JiBwYXJlbnQs IFJlbmRlclB0cjxSZW4KIAogICAgIGF1dG8mIG5ld0NoaWxkID0gKmNoaWxkLmdldCgpOwogICAg IEFTU0VSVCghYmVmb3JlQ2hpbGQgfHwgaXM8UmVuZGVyVGFibGVDZWxsPigqYmVmb3JlQ2hpbGQp KTsKLSAgICBwYXJlbnQuUmVuZGVyRWxlbWVudDo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3Zl KGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVy RWxlbWVudChwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CiAgICAgLy8gRklY TUU6IGNoaWxkIHNob3VsZCBhbHdheXMgYmUgYSBSZW5kZXJUYWJsZUNlbGwgYXQgdGhpcyBwb2lu dC4KICAgICBpZiAoaXM8UmVuZGVyVGFibGVDZWxsPihuZXdDaGlsZCkpCiAgICAgICAgIHBhcmVu dC5kaWRJbnNlcnRUYWJsZUNlbGwoZG93bmNhc3Q8UmVuZGVyVGFibGVDZWxsPihuZXdDaGlsZCks IGJlZm9yZUNoaWxkKTsKQEAgLTE4Myw3ICsxODMsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVy OjpUYWJsZTo6aW5zZXJ0Q2hpbGQoUmVuZGVyVGFibGVTZWN0aW9uJiBwYXJlbnQsIFJlbmRlclB0 cgogICAgIGlmIChpczxSZW5kZXJUYWJsZVJvdz4oKmNoaWxkLmdldCgpKSkKICAgICAgICAgcGFy ZW50LndpbGxJbnNlcnRUYWJsZVJvdyhkb3duY2FzdDxSZW5kZXJUYWJsZVJvdz4oKmNoaWxkLmdl dCgpKSwgYmVmb3JlQ2hpbGQpOwogICAgIEFTU0VSVCghYmVmb3JlQ2hpbGQgfHwgaXM8UmVuZGVy VGFibGVSb3c+KCpiZWZvcmVDaGlsZCkpOwotICAgIHBhcmVudC5SZW5kZXJFbGVtZW50OjphZGRD aGlsZChtX2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgbV9idWls ZGVyLmluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJl Zm9yZUNoaWxkKTsKIH0KIAogdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENo aWxkKFJlbmRlclRhYmxlJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQpAQCAtMTk3LDcgKzE5Nyw3IEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6OlRhYmxlOjppbnNlcnRDaGlsZChSZW5kZXJUYWJsZSYgcGFyZW50LCBSZW5k ZXJQdHI8UmVuZGVyCiAgICAgZWxzZSBpZiAoaXM8UmVuZGVyVGFibGVDb2w+KG5ld0NoaWxkKSkK ICAgICAgICAgcGFyZW50LndpbGxJbnNlcnRUYWJsZUNvbHVtbihkb3duY2FzdDxSZW5kZXJUYWJs ZUNvbD4obmV3Q2hpbGQpLCBiZWZvcmVDaGlsZCk7CiAKLSAgICBwYXJlbnQuUmVuZGVyRWxlbWVu dDo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAg IG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudChwYXJlbnQsIFdURk1vdmUoY2hp bGQpLCBiZWZvcmVDaGlsZCk7CiB9CiAKIGJvb2wgUmVuZGVyVHJlZUJ1aWxkZXI6OlRhYmxlOjpj aGlsZFJlcXVpcmVzVGFibGUoY29uc3QgUmVuZGVyRWxlbWVudCYgcGFyZW50LCBjb25zdCBSZW5k ZXJPYmplY3QmIGNoaWxkKQo= 334050 2018-02-16 10:29:23 -0800 2018-02-16 11:25:23 -0800 Patch bug-182878-20180216102922.patch text/plain 12262 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU5YmQ1OTI3MWIzYTIz NTAzODNhYmJhYjBiNTViYjdiY2YxM2FlZC4uNzYyODA4NTk1NzM4Y2M2MzQyMWZlMmY0NDcxZTdl YzI2MTVlYjQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjg3OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzc2MDgzNDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIHRoZSBsYXN0IGFkZENo aWxkKCkgcmVsYXRlZCBtdXRhdGlvbiBsb2dpYyBmcm9tIHRoZSByZW5kZXJlcnMuCisKKyAgICAg ICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpkaWRJbnNl cnRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjphZGRDaGlsZCk6IERl bGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckVsZW1lbnQ6OmlzQ2hpbGRBbGxvd2VkIGNvbnN0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudCk6CisgICAgICAgICog cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmg6CisgICAgICAgICogcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OkJsb2NrOjppbnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0 aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxp bmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OklubGluZTo6aW5z ZXJ0Q2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRy ZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU cmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENoaWxkKToKKwogMjAxOC0wMi0xNiAgRnVqaWkgSGly b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBJbmRleGVkREI6IFNl dmVyYWwgdGVzdCBjcmFzaCBpbiB3aGVuIGRlc3Ryb3lpbmcgYSBJREJLZXlEYXRhCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggZDFkMzgzNWYyZGYwMzhk MWRlMDZjOWFjMzM5NzNmNmI5ZWU2MDNjNi4uYjRkMDExNGRjZGNmMjY0N2YzNmU5YmFkYjQ5NGFj NjlhNDQ3YmU1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNw cApAQCAtNDU2LDExICs0NTYsOCBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnNldFN0eWxlKFJlbmRl clN0eWxlJiYgc3R5bGUsIFN0eWxlRGlmZmVyZW5jZSBtaW5pbWFsU3R5bGVEaQogICAgIH0KIH0K IAotdm9pZCBSZW5kZXJFbGVtZW50OjphZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRl ciwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3Jl Q2hpbGQpCit2b2lkIFJlbmRlckVsZW1lbnQ6OmRpZEluc2VydENoaWxkKFJlbmRlck9iamVjdCYg Y2hpbGQsIFJlbmRlck9iamVjdCopCiB7Ci0gICAgYXV0byYgY2hpbGQgPSAqbmV3Q2hpbGQ7Ci0g ICAgYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudCgqdGhpcywgV1RGTW92ZShuZXdD aGlsZCksIGJlZm9yZUNoaWxkKTsKLQogICAgIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZCkpCiAg ICAgICAgIGRvd25jYXN0PFJlbmRlclRleHQ+KGNoaWxkKS5zdHlsZURpZENoYW5nZShTdHlsZURp ZmZlcmVuY2VFcXVhbCwgbnVsbHB0cik7CiAgICAgLy8gU1ZHIGNyZWF0ZXMgcmVuZGVyZXJzIGZv ciA8ZyBkaXNwbGF5PSJub25lIj4sIGFzIFNWRyByZXF1aXJlcyBjaGlsZHJlbiBvZiBoaWRkZW4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGNiOGM1OGI2M2Y5 NjVlZDkzMmFlZTExY2E5NjM5MDVmZmQ1NTEzMTIuLjBjMzMzNWQ5YjM4ZTM3ZTE1ZGNmYmZhODU3 N2Q2MDNkYWQyYmQ3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu aApAQCAtODcsOSArODcsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1JlbmRlcklubGluZSgpIGNv bnN0OwogCiAgICAgdmlydHVhbCBib29sIGlzQ2hpbGRBbGxvd2VkKGNvbnN0IFJlbmRlck9iamVj dCYsIGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZpcnR1 YWwgdm9pZCBhZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hp bGRJZ25vcmluZ0NvbnRpbnVhdGlvbihSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlclB0cjxSZW5k ZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7 CiAgICAgdm9pZCByZW1vdmVBbmREZXN0cm95Q2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5k ZXJPYmplY3QmKTsKKyAgICB2b2lkIGRpZEluc2VydENoaWxkKFJlbmRlck9iamVjdCYgY2hpbGQs IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOwogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBmdW5j dGlvbnMgYXJlIHVzZWQgd2hlbiB0aGUgcmVuZGVyIHRyZWUgaGllcmFyY2h5IGNoYW5nZXMgdG8g bWFrZSBzdXJlIGxheWVycyBnZXQKICAgICAvLyBwcm9wZXJseSBhZGRlZCBhbmQgcmVtb3ZlZC4g U2luY2UgY29udGFpbmVyc2hpcCBjYW4gYmUgaW1wbGVtZW50ZWQgYnkgYW55IHN1YmNsYXNzLCBh bmQgc2luY2UgYSBoaWVyYXJjaHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDY1M2M2NjVhYjI2NzFmOTBi Y2JjNGY5NmQ3NDA2YzFhZjQzM2VmYTguLmFkYjRkNzdiMWEyNDdlOWU0YmQ1MzdlMTgxMDVhZDZi ZDgyNzZmZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcApAQCAtMTQyLDcgKzE0Miw3IEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKFJlbmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZGVyUHRy PFJlbmRlck9iamVjCiB7CiAgICAgYXV0byBpbnNlcnRSZWN1cnNpdmVJZk5lZWRlZCA9IFsmXShS ZW5kZXJFbGVtZW50JiBwYXJlbnRDYW5kaWRhdGUpIHsKICAgICAgICAgaWYgKCZwYXJlbnQgPT0g JnBhcmVudENhbmRpZGF0ZSkgewotICAgICAgICAgICAgcGFyZW50LmFkZENoaWxkKCp0aGlzLCBX VEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgaW5zZXJ0Q2hpbGRUb1Jl bmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGluc2VydENoaWxkKHBhcmVudENhbmRp ZGF0ZSwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKQEAgLTI1NSw3ICsyNTUsNyBAQCB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZChSZW5kZXJFbGVtZW50JiBwYXJlbnQs IFJlbmRlclB0cjxSZW5kZXJPYmplYwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcGFy ZW50LmFkZENoaWxkKCp0aGlzLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIGlu c2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNo aWxkKTsKIH0KIAogUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OnRh a2VDaGlsZChSZW5kZXJFbGVtZW50JiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQpCkBAIC0z MjAsNyArMzIwLDkgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRl ckVsZW1lbnQoUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXIKICAgICAgICAgaW5zZXJ0Q2hp bGQoKnRhYmxlLCBXVEZNb3ZlKGNoaWxkKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAg cGFyZW50LlJlbmRlckVsZW1lbnQ6Omluc2VydENoaWxkSW50ZXJuYWwoV1RGTW92ZShjaGlsZCks IGJlZm9yZUNoaWxkKTsKKyAgICBhdXRvJiBuZXdDaGlsZCA9ICpjaGlsZC5nZXQoKTsKKyAgICBw YXJlbnQuaW5zZXJ0Q2hpbGRJbnRlcm5hbChXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwor ICAgIHBhcmVudC5kaWRJbnNlcnRDaGlsZChuZXdDaGlsZCwgYmVmb3JlQ2hpbGQpOwogfQogCiB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVyQmxvY2tJZ25vcmluZ0Nv bnRpbnVhdGlvbihSZW5kZXJCbG9jayYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBj aGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKaW5kZXggMjU2MmFiNzZk MzdhMWYzZWFjYjg4MjJlNGNlZmRiNGM5ZWZmNzkwNC4uNTE3YjIxZTdmYzhhMWVmZTA2MDIwZGM4 ODFiMDdmMTY1YTI1OTAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKQEAgLTYzLDcgKzYzLDYgQEAgcHVibGljOgog ICAgIHN0YXRpYyBSZW5kZXJUcmVlQnVpbGRlciogY3VycmVudCgpIHsgcmV0dXJuIHNfY3VycmVu dDsgfQogCiAgICAgLy8gVGhlc2UgZnVuY3Rpb25zIGFyZSB0ZW1wb3JhcnkgdW50aWwgYWZ0ZXIg YWxsIGJsb2NrL2lubGluZS9jb250aW51YXRpb24gY29kZSBpcyBtb3ZlZCBvdmVyLgotICAgIHZv aWQgaW5zZXJ0Q2hpbGRUb1JlbmRlckVsZW1lbnQoUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5k ZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51 bGxwdHIpOwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrSWdub3JpbmdDb250aW51 YXRpb24oUmVuZGVyQmxvY2smIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4sIFJlbmRl ck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2VydENoaWxkVG9S ZW5kZXJJbmxpbmVJZ25vcmluZ0NvbnRpbnVhdGlvbihSZW5kZXJJbmxpbmUmIHBhcmVudCwgUmVu ZGVyUHRyPFJlbmRlck9iamVjdD4sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRy KTsKIApAQCAtOTUsNiArOTQsNyBAQCBwcml2YXRlOgogICAgIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IHRha2VDaGlsZEZyb21SZW5kZXJHcmlkKFJlbmRlckdyaWQmIHBhcmVudCwgUmVuZGVyT2Jq ZWN0JiBjaGlsZCk7CiAKICAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJHcmlkKFJlbmRlckdy aWQmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCog YmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKKyAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJFbGVt ZW50KFJlbmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQs IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKIAogICAgIEZpcnN0TGV0dGVy JiBmaXJzdExldHRlckJ1aWxkZXIoKSB7IHJldHVybiAqbV9maXJzdExldHRlckJ1aWxkZXI7IH0K ICAgICBMaXN0JiBsaXN0QnVpbGRlcigpIHsgcmV0dXJuICptX2xpc3RCdWlsZGVyOyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJCbG9jay5jcHAKaW5kZXggNDNlNTcwNjQwMThlZGEzY2ExNzAxOGMxOGY4ZjAzY2Ji YTMzY2E1NC4uMjg3ODczMjVmYjYwNzkyMTdlNzE2NDJmZjUzMDIwMTIxNGE3ZWRlZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy QmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlckJsb2NrLmNwcApAQCAtMjIzLDcgKzIyMyw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1 aWxkZXI6OkJsb2NrOjppbnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0aW9uKFJlbmRlckJsb2Nr JiBwYXJlCiAgICAgICAgICAgICAvLyBObyBzdWl0YWJsZSBleGlzdGluZyBhbm9ueW1vdXMgYm94 IC0gY3JlYXRlIGEgbmV3IG9uZS4KICAgICAgICAgICAgIGF1dG8gbmV3Qm94ID0gcGFyZW50LmNy ZWF0ZUFub255bW91c0Jsb2NrKCk7CiAgICAgICAgICAgICBhdXRvJiBib3ggPSAqbmV3Qm94Owot ICAgICAgICAgICAgcGFyZW50LlJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKG1fYnVpbGRlciwgV1RG TW92ZShuZXdCb3gpLCBiZWZvcmVDaGlsZCk7CisgICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0 Q2hpbGRUb1JlbmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKG5ld0JveCksIGJlZm9yZUNoaWxk KTsKICAgICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZChib3gsIFdURk1vdmUoY2hpbGQp KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMjMxLDcgKzIzMSw3IEBAIHZv aWQgUmVuZGVyVHJlZUJ1aWxkZXI6OkJsb2NrOjppbnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0 aW9uKFJlbmRlckJsb2NrJiBwYXJlCiAKICAgICBwYXJlbnQuaW52YWxpZGF0ZUxpbmVMYXlvdXRQ YXRoKCk7CiAKLSAgICBwYXJlbnQuUmVuZGVyRWxlbWVudDo6YWRkQ2hpbGQobV9idWlsZGVyLCBX VEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRv UmVuZGVyRWxlbWVudChwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CiAKICAg ICBpZiAobWFkZUJveGVzTm9uSW5saW5lICYmIGlzPFJlbmRlckJsb2NrPihwYXJlbnQucGFyZW50 KCkpICYmIHBhcmVudC5pc0Fub255bW91c0Jsb2NrKCkpCiAgICAgICAgIHJlbW92ZUxlZnRvdmVy QW5vbnltb3VzQmxvY2socGFyZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuY3BwCmluZGV4IDkw NGJjZGVkNzExMzlhNzdiMjQ2MGZjYTRkMjIxMzk1OWRlMzEyNTIuLmJlNTVhYzE2ZGZmYzA3YjA0 NjkyY2YyNmM5MDg4OWYzZGQ2YWI4OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVySW5saW5lLmNwcApAQCAt MTg4LDcgKzE4OCw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OklubGluZTo6aW5zZXJ0Q2hp bGRJZ25vcmluZ0NvbnRpbnVhdGlvbihSZW5kZXJJbmxpbmUmIHBhCiAgICAgfQogCiAgICAgYXV0 byYgY2hpbGRUb0FkZCA9ICpjaGlsZDsKLSAgICBwYXJlbnQuUmVuZGVyRWxlbWVudDo6YWRkQ2hp bGQobV9idWlsZGVyLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIG1fYnVpbGRl ci5pbnNlcnRDaGlsZFRvUmVuZGVyRWxlbWVudChwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZv cmVDaGlsZCk7CiAgICAgY2hpbGRUb0FkZC5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNh bGMoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlQnVpbGRlclNWRy5jcHAKaW5kZXggN2NmYjJkNTY2MTdjOGFhZTI5MzBl MjBjMmZhNzAxNjZkZjYyNjFkNy4uNmEyMjBkYWI0OWEyMzcxMjkwZDFjYTkzMzI2MDIxZTYxOGQz NThlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyU1ZHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJTVkcuY3BwCkBAIC00Myw3ICs0Myw3IEBAIFJlbmRlclRyZWVC dWlsZGVyOjpTVkc6OlNWRyhSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6OlNWRzo6aW5zZXJ0Q2hpbGQoUmVuZGVyU1ZHQ29udGFpbmVyJiBwYXJlbnQs IFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxk KQogewogICAgIGF1dG8mIGNoaWxkVG9BZGQgPSAqY2hpbGQ7Ci0gICAgcGFyZW50LlJlbmRlckVs ZW1lbnQ6OmFkZENoaWxkKG1fYnVpbGRlciwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsK KyAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3Zl KGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgIFNWR1Jlc291cmNlc0NhY2hlOjpjbGllbnRXYXNB ZGRlZFRvVHJlZShjaGlsZFRvQWRkKTsKIH0KIApAQCAtNjAsNyArNjAsNyBAQCB2b2lkIFJlbmRl clRyZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKFJlbmRlclNWR0lubGluZSYgcGFyZW50LCBS ZW5kZXJQdHI8UmVuZAogdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6U1ZHOjppbnNlcnRDaGlsZChS ZW5kZXJTVkdSb290JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIGF1dG8mIGNoaWxkVG9BZGQgPSAqY2hpbGQ7 Ci0gICAgcGFyZW50LlJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKG1fYnVpbGRlciwgV1RGTW92ZShj aGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckVs ZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgIFNWR1Jlc291 cmNlc0NhY2hlOjpjbGllbnRXYXNBZGRlZFRvVHJlZShjaGlsZFRvQWRkKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy VGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVC dWlsZGVyVGFibGUuY3BwCmluZGV4IDI5NGExZmM3Yjk5YWZhMWVjYjQyOWM5MjllNmM5ZDQyMjIy ZTFhMTMuLjQ5NzVjMzA1Yzc4OTFhNjk3NjMxYTQ2MDI4Mjg2MDlkMjBhZDhiZDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclRh YmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJUYWJsZS5jcHAKQEAgLTE2OCw3ICsxNjgsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWls ZGVyOjpUYWJsZTo6aW5zZXJ0Q2hpbGQoUmVuZGVyVGFibGVSb3cmIHBhcmVudCwgUmVuZGVyUHRy PFJlbgogCiAgICAgYXV0byYgbmV3Q2hpbGQgPSAqY2hpbGQuZ2V0KCk7CiAgICAgQVNTRVJUKCFi ZWZvcmVDaGlsZCB8fCBpczxSZW5kZXJUYWJsZUNlbGw+KCpiZWZvcmVDaGlsZCkpOwotICAgIHBh cmVudC5SZW5kZXJFbGVtZW50OjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBi ZWZvcmVDaGlsZCk7CisgICAgbV9idWlsZGVyLmluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBh cmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKICAgICAvLyBGSVhNRTogY2hpbGQg c2hvdWxkIGFsd2F5cyBiZSBhIFJlbmRlclRhYmxlQ2VsbCBhdCB0aGlzIHBvaW50LgogICAgIGlm IChpczxSZW5kZXJUYWJsZUNlbGw+KG5ld0NoaWxkKSkKICAgICAgICAgcGFyZW50LmRpZEluc2Vy dFRhYmxlQ2VsbChkb3duY2FzdDxSZW5kZXJUYWJsZUNlbGw+KG5ld0NoaWxkKSwgYmVmb3JlQ2hp bGQpOwpAQCAtMTgzLDcgKzE4Myw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OlRhYmxlOjpp bnNlcnRDaGlsZChSZW5kZXJUYWJsZVNlY3Rpb24mIHBhcmVudCwgUmVuZGVyUHRyCiAgICAgaWYg KGlzPFJlbmRlclRhYmxlUm93PigqY2hpbGQuZ2V0KCkpKQogICAgICAgICBwYXJlbnQud2lsbElu c2VydFRhYmxlUm93KGRvd25jYXN0PFJlbmRlclRhYmxlUm93PigqY2hpbGQuZ2V0KCkpLCBiZWZv cmVDaGlsZCk7CiAgICAgQVNTRVJUKCFiZWZvcmVDaGlsZCB8fCBpczxSZW5kZXJUYWJsZVJvdz4o KmJlZm9yZUNoaWxkKSk7Ci0gICAgcGFyZW50LlJlbmRlckVsZW1lbnQ6OmFkZENoaWxkKG1fYnVp bGRlciwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBtX2J1aWxkZXIuaW5zZXJ0 Q2hpbGRUb1JlbmRlckVsZW1lbnQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQp OwogfQogCiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpUYWJsZTo6aW5zZXJ0Q2hpbGQoUmVuZGVy VGFibGUmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVj dCogYmVmb3JlQ2hpbGQpCkBAIC0xOTcsNyArMTk3LDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRl cjo6VGFibGU6Omluc2VydENoaWxkKFJlbmRlclRhYmxlJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5k ZXIKICAgICBlbHNlIGlmIChpczxSZW5kZXJUYWJsZUNvbD4obmV3Q2hpbGQpKQogICAgICAgICBw YXJlbnQud2lsbEluc2VydFRhYmxlQ29sdW1uKGRvd25jYXN0PFJlbmRlclRhYmxlQ29sPihuZXdD aGlsZCksIGJlZm9yZUNoaWxkKTsKIAotICAgIHBhcmVudC5SZW5kZXJFbGVtZW50OjphZGRDaGls ZChtX2J1aWxkZXIsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgbV9idWlsZGVy Lmluc2VydENoaWxkVG9SZW5kZXJFbGVtZW50KHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9y ZUNoaWxkKTsKIH0KIAogYm9vbCBSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6OmNoaWxkUmVxdWly ZXNUYWJsZShjb25zdCBSZW5kZXJFbGVtZW50JiBwYXJlbnQsIGNvbnN0IFJlbmRlck9iamVjdCYg Y2hpbGQpCg==