116734 2013-05-24 12:16:18 -0700 [CSS Shapes] Fix style issues in BasicShapes 2013-05-29 11:49:34 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn macpherson menard oldest_to_newest 893408 0 bjonesbe 2013-05-24 12:16:18 -0700 The following BasicShape files have a number of style issues that make it hard to edit the files and keep them consistent. I would like to fix them. Source/WebCore/rendering/style/BasicShapes.cpp: indentation is wrong for some of the lines, they're lined up with method/function calls, which causes the number of spaces to not be a multiple of 4 on those lines. Source/WebCore/css/CSSBasicShapes.h: the enum members are NAMED_LIKE_THIS but the style guide says they should be NamedLikeThis. Source/WebCore/rendering/style/BasicShapes.h: the enum members are NAMED_LIKE_THIS but the style guide says they should be NamedLikeThis. 895022 1 203216 bjonesbe 2013-05-29 10:48:02 -0700 Created attachment 203216 Patch Fix style issues. 895027 2 203216 achicu 2013-05-29 11:08:08 -0700 Comment on attachment 203216 Patch r=me 895111 3 203216 commit-queue 2013-05-29 11:49:33 -0700 Comment on attachment 203216 Patch Clearing flags on attachment: 203216 Committed r150917: <http://trac.webkit.org/changeset/150917> 895112 4 commit-queue 2013-05-29 11:49:34 -0700 All reviewed patches have been landed. Closing bug. 203216 2013-05-29 10:48:02 -0700 2013-05-29 11:49:33 -0700 Patch bug-116734-20130529104639.patch text/plain 24890 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwOTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y3NDQxNmQ0ZDBiMzQ3 MWZlZjkwNWRhMTg4ZGRlOThmYTliZmI5Yy4uY2EzYzUyNWJjMDNiOTNmNmI0ZjEwYzk4NmUwMmY0 MmVkMjFmM2FjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUyIEBACiAyMDEzLTA1LTI5ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIFtDU1MgU2hhcGVzXSBG aXggc3R5bGUgaXNzdWVzIGluIEJhc2ljU2hhcGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY3MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggaW5kZW50YXRpb24gaW4gQmFzaWNTaGFwZXMuY3Bw LCBhbmQgY2hhbmdlIGVudW1zIHRvIHJlc3BlY3QgdGhlCisgICAgICAgIHN0eWxlIHJ1bGVzIENh bWVsQ2FzZSBpbnN0ZWFkIG9mIEhBVklOR19VTkRFUlNDT1JFUy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIG9ubHkgc3R5bGUgY2hhbmdlcy4KKworICAgICAgICAqIGNzcy9CYXNpY1NoYXBlRnVu Y3Rpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZhbHVlRm9yQmFzaWNTaGFwZSk6CisgICAg ICAgIChXZWJDb3JlOjpiYXNpY1NoYXBlRm9yVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NCYXNp Y1NoYXBlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZFJlY3RhbmdsZVN0cmluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlOjplcXVhbHMpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTQmFzaWNTaGFwZUNpcmNsZTo6ZXF1YWxzKToKKyAgICAgICAgKFdlYkNv cmU6OkNTU0Jhc2ljU2hhcGVFbGxpcHNlOjplcXVhbHMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT QmFzaWNTaGFwZVBvbHlnb246OmVxdWFscyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1No YXBlSW5zZXRSZWN0YW5nbGU6OmVxdWFscyk6CisgICAgICAgICogY3NzL0NTU0Jhc2ljU2hhcGVz Lmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlOjp0eXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVJbnNldFJlY3RhbmdsZTo6dHlwZSk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlQ2lyY2xlOjp0eXBlKToKKyAgICAgICAgKFdlYkNv cmU6OkNTU0Jhc2ljU2hhcGVFbGxpcHNlOjp0eXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jh c2ljU2hhcGVQb2x5Z29uOjp0eXBlKToKKyAgICAgICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uU2hh cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXhjbHVzaW9uU2hhcGU6OmNyZWF0ZUV4Y2x1c2lv blNoYXBlKToKKyAgICAgICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6aXNFbmFibGVk Rm9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVPdXRzaWRlSW5mby5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFeGNsdXNpb25TaGFwZU91dHNpZGVJbmZvOjppc0VuYWJsZWRG b3IpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpCYXNpY1NoYXBlOjpjYW5CbGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpCYXNp Y1NoYXBlUmVjdGFuZ2xlOjpwYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2hhcGVDaXJj bGU6OnBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUVsbGlwc2U6OnBhdGgpOgor ICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlOjpwYXRoKToKKyAgICAg ICAgKiByZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkJh c2ljU2hhcGVSZWN0YW5nbGU6OnR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUNp cmNsZTo6dHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlRWxsaXBzZTo6dHlwZSk6 CisgICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlUG9seWdvbjo6dHlwZSk6CisgICAgICAgIChX ZWJDb3JlOjpCYXNpY1NoYXBlSW5zZXRSZWN0YW5nbGU6OnR5cGUpOgorCisyMDEzLTA1LTI5ICBC ZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCiAgICAgICAgIFtDU1MgU2hhcGVz XSBTdXBwb3J0IHBhcnNpbmcgaW5zZXQtcmVjdGFuZ2xlIHNoYXBlcwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NjM4CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRleCAwNmJhYzUzMzQzNjYwNTM4YWEwYjEz ZWNmNGE1MzMxM2E2MjE0MzY4Li41OWNhOWE3N2Q4NjQ2NWMyNzg5MGM5MzNkYjNiYjAxMjk4ZDdj MTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCkBAIC00 Miw3ICs0Miw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yQmFzaWNTaGFwZShjb25z dCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlKQogewogICAgIFJlZlB0cjxDU1NCYXNpY1NoYXBlPiBi YXNpY1NoYXBlVmFsdWU7CiAgICAgc3dpdGNoIChiYXNpY1NoYXBlLT50eXBlKCkpIHsKLSAgICBj YXNlIEJhc2ljU2hhcGU6OkJBU0lDX1NIQVBFX1JFQ1RBTkdMRTogeworICAgIGNhc2UgQmFzaWNT aGFwZTo6QmFzaWNTaGFwZVJlY3RhbmdsZVR5cGU6IHsKICAgICAgICAgY29uc3QgQmFzaWNTaGFw ZVJlY3RhbmdsZSogcmVjdGFuZ2xlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZVJlY3Rh bmdsZSo+KGJhc2ljU2hhcGUpOwogICAgICAgICBSZWZQdHI8Q1NTQmFzaWNTaGFwZVJlY3Rhbmds ZT4gcmVjdGFuZ2xlVmFsdWUgPSBDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlOjpjcmVhdGUoKTsKIApA QCAtNTksNyArNTksNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZUZvckJhc2ljU2hhcGUo Y29uc3QgQmFzaWNTaGFwZSogYmFzaWNTaGFwZSkKICAgICAgICAgYmFzaWNTaGFwZVZhbHVlID0g cmVjdGFuZ2xlVmFsdWUucmVsZWFzZSgpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2Fz ZSBCYXNpY1NoYXBlOjpCQVNJQ19TSEFQRV9DSVJDTEU6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6 OkJhc2ljU2hhcGVDaXJjbGVUeXBlOiB7CiAgICAgICAgIGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUq IGNpcmNsZSA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUqPihiYXNpY1NoYXBl KTsKICAgICAgICAgUmVmUHRyPENTU0Jhc2ljU2hhcGVDaXJjbGU+IGNpcmNsZVZhbHVlID0gQ1NT QmFzaWNTaGFwZUNpcmNsZTo6Y3JlYXRlKCk7CiAKQEAgLTcwLDcgKzcwLDcgQEAgUGFzc1JlZlB0 cjxDU1NWYWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IEJhc2ljU2hhcGUqIGJhc2ljU2hh cGUpCiAgICAgICAgIGJhc2ljU2hhcGVWYWx1ZSA9IGNpcmNsZVZhbHVlLnJlbGVhc2UoKTsKICAg ICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgQmFzaWNTaGFwZTo6QkFTSUNfU0hBUEVfRUxM SVBTRTogeworICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUVsbGlwc2VUeXBlOiB7CiAg ICAgICAgIGNvbnN0IEJhc2ljU2hhcGVFbGxpcHNlKiBlbGxpcHNlID0gc3RhdGljX2Nhc3Q8Y29u c3QgQmFzaWNTaGFwZUVsbGlwc2UqPihiYXNpY1NoYXBlKTsKICAgICAgICAgUmVmUHRyPENTU0Jh c2ljU2hhcGVFbGxpcHNlPiBlbGxpcHNlVmFsdWUgPSBDU1NCYXNpY1NoYXBlRWxsaXBzZTo6Y3Jl YXRlKCk7CiAKQEAgLTgyLDcgKzgyLDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gdmFsdWVGb3JC YXNpY1NoYXBlKGNvbnN0IEJhc2ljU2hhcGUqIGJhc2ljU2hhcGUpCiAgICAgICAgIGJhc2ljU2hh cGVWYWx1ZSA9IGVsbGlwc2VWYWx1ZS5yZWxlYXNlKCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0K LSAgICBjYXNlIEJhc2ljU2hhcGU6OkJBU0lDX1NIQVBFX1BPTFlHT046IHsKKyAgICBjYXNlIEJh c2ljU2hhcGU6OkJhc2ljU2hhcGVQb2x5Z29uVHlwZTogewogICAgICAgICBjb25zdCBCYXNpY1No YXBlUG9seWdvbiogcG9seWdvbiA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVQb2x5Z29u Kj4oYmFzaWNTaGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NCYXNpY1NoYXBlUG9seWdvbj4gcG9s eWdvblZhbHVlID0gQ1NTQmFzaWNTaGFwZVBvbHlnb246OmNyZWF0ZSgpOwogCkBAIC05NCw3ICs5 NCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yQmFzaWNTaGFwZShjb25zdCBCYXNp Y1NoYXBlKiBiYXNpY1NoYXBlKQogICAgICAgICBiYXNpY1NoYXBlVmFsdWUgPSBwb2x5Z29uVmFs dWUucmVsZWFzZSgpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2FzZSBCYXNpY1NoYXBl OjpCQVNJQ19TSEFQRV9JTlNFVF9SRUNUQU5HTEU6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6OkJh c2ljU2hhcGVJbnNldFJlY3RhbmdsZVR5cGU6IHsKICAgICAgICAgY29uc3QgQmFzaWNTaGFwZUlu c2V0UmVjdGFuZ2xlKiByZWN0YW5nbGUgPSBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY1NoYXBlSW5z ZXRSZWN0YW5nbGUqPihiYXNpY1NoYXBlKTsKICAgICAgICAgUmVmUHRyPENTU0Jhc2ljU2hhcGVJ bnNldFJlY3RhbmdsZT4gcmVjdGFuZ2xlVmFsdWUgPSBDU1NCYXNpY1NoYXBlSW5zZXRSZWN0YW5n bGU6OmNyZWF0ZSgpOwogCkBAIC0xMjcsNyArMTI3LDcgQEAgUGFzc1JlZlB0cjxCYXNpY1NoYXBl PiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBSZW5k ZXIKICAgICBSZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZTsKIAogICAgIHN3aXRjaCAoYmFz aWNTaGFwZVZhbHVlLT50eXBlKCkpIHsKLSAgICBjYXNlIENTU0Jhc2ljU2hhcGU6OkNTU19CQVNJ Q19TSEFQRV9SRUNUQU5HTEU6IHsKKyAgICBjYXNlIENTU0Jhc2ljU2hhcGU6OkNTU0Jhc2ljU2hh cGVSZWN0YW5nbGVUeXBlOiB7CiAgICAgICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVSZWN0YW5nbGUq IHJlY3RWYWx1ZSA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2ljU2hhcGVSZWN0YW5nbGUgKj4o YmFzaWNTaGFwZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVSZWN0YW5nbGU+IHJl Y3QgPSBCYXNpY1NoYXBlUmVjdGFuZ2xlOjpjcmVhdGUoKTsKIApAQCAtMTQzLDcgKzE0Myw3IEBA IFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IFJlbmRlclN0 eWxlKiBzdHlsZSwgY29uc3QgUmVuZGVyCiAgICAgICAgIGJhc2ljU2hhcGUgPSByZWN0LnJlbGVh c2UoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NT X0JBU0lDX1NIQVBFX0NJUkNMRTogeworICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NTQmFzaWNT aGFwZUNpcmNsZVR5cGU6IHsKICAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSogY2ly Y2xlVmFsdWUgPSBzdGF0aWNfY2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlQ2lyY2xlICo+KGJhc2lj U2hhcGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlQ2lyY2xlPiBjaXJjbGUgPSBC YXNpY1NoYXBlQ2lyY2xlOjpjcmVhdGUoKTsKIApAQCAtMTU0LDcgKzE1NCw3IEBAIFBhc3NSZWZQ dHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHls ZSwgY29uc3QgUmVuZGVyCiAgICAgICAgIGJhc2ljU2hhcGUgPSBjaXJjbGUucmVsZWFzZSgpOwog ICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2FzZSBDU1NCYXNpY1NoYXBlOjpDU1NfQkFTSUNf U0hBUEVfRUxMSVBTRTogeworICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NTQmFzaWNTaGFwZUVs bGlwc2VUeXBlOiB7CiAgICAgICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVFbGxpcHNlKiBlbGxpcHNl VmFsdWUgPSBzdGF0aWNfY2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlRWxsaXBzZSAqPihiYXNpY1No YXBlVmFsdWUpOwogICAgICAgICBSZWZQdHI8QmFzaWNTaGFwZUVsbGlwc2U+IGVsbGlwc2UgPSBC YXNpY1NoYXBlRWxsaXBzZTo6Y3JlYXRlKCk7CiAKQEAgLTE2Niw3ICsxNjYsNyBAQCBQYXNzUmVm UHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBSZW5kZXJTdHlsZSogc3R5 bGUsIGNvbnN0IFJlbmRlcgogICAgICAgICBiYXNpY1NoYXBlID0gZWxsaXBzZS5yZWxlYXNlKCk7 CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICBjYXNlIENTU0Jhc2ljU2hhcGU6OkNTU19CQVNJ Q19TSEFQRV9QT0xZR09OOiB7CisgICAgY2FzZSBDU1NCYXNpY1NoYXBlOjpDU1NCYXNpY1NoYXBl UG9seWdvblR5cGU6IHsKICAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24qIHBvbHln b25WYWx1ZSA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2ljU2hhcGVQb2x5Z29uICo+KGJhc2lj U2hhcGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlUG9seWdvbj4gcG9seWdvbiA9 IEJhc2ljU2hhcGVQb2x5Z29uOjpjcmVhdGUoKTsKIApAQCAtMTc4LDcgKzE3OCw3IEBAIFBhc3NS ZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBz dHlsZSwgY29uc3QgUmVuZGVyCiAgICAgICAgIGJhc2ljU2hhcGUgPSBwb2x5Z29uLnJlbGVhc2Uo KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NTX0JB U0lDX1NIQVBFX0lOU0VUX1JFQ1RBTkdMRTogeworICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NT QmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlVHlwZTogewogICAgICAgICBjb25zdCBDU1NCYXNpY1No YXBlSW5zZXRSZWN0YW5nbGUqIHJlY3RWYWx1ZSA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2lj U2hhcGVJbnNldFJlY3RhbmdsZSAqPihiYXNpY1NoYXBlVmFsdWUpOwogICAgICAgICBSZWZQdHI8 QmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlPiByZWN0ID0gQmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xl OjpjcmVhdGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hh cGVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5jcHAKaW5kZXggODhm NDRjZjc2NWNkMzk5NDVkZGQzZDljOWM1YTg0NjlmMmQ0YjhjZC4uZGRhOGNlOTY1ZDFmMmU2NWI2 ZmNjOWYxNjQ2NDU2MzBlNmNjMDA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U0Jhc2ljU2hhcGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFwZXMu Y3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNpbmNsdWRlICJD U1NCYXNpY1NoYXBlcy5oIgorCiAjaW5jbHVkZSAiQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5o IgogCiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgpAQCAtNDQsNyArNDUsNyBA QCBzdGF0aWMgU3RyaW5nIGJ1aWxkUmVjdGFuZ2xlU3RyaW5nKGNvbnN0IFN0cmluZyYgeCwgY29u c3QgU3RyaW5nJiB5LCBjb25zdCBTdHJpbgogICAgIGNoYXIgc2VwYXJhdG9yW10gPSAiLCAiOwog ICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OwogICAgIC8vIENvbXB1dGUgdGhlIHJlcXVpcmVkIGNh cGFjaXR5IGluIGFkdmFuY2UgdG8gcmVkdWNlIGFsbG9jYXRpb25zLgotICAgIHJlc3VsdC5yZXNl cnZlQ2FwYWNpdHkoKHNpemVvZihvcGVuaW5nKSAtIDEpICsgKDUgKiAoc2l6ZW9mKHNlcGFyYXRv cikgLTEgKSkgKyAxICsgeC5sZW5ndGgoKSArIHkubGVuZ3RoKCkgKyB3aWR0aC5sZW5ndGgoKSAr IGhlaWdodC5sZW5ndGgoKSArIHJhZGl1c1gubGVuZ3RoKCkgKyByYWRpdXNZLmxlbmd0aCgpKTsK KyAgICByZXN1bHQucmVzZXJ2ZUNhcGFjaXR5KChzaXplb2Yob3BlbmluZykgLSAxKSArICg1ICog KHNpemVvZihzZXBhcmF0b3IpIC0gMSkpICsgMSArIHgubGVuZ3RoKCkgKyB5Lmxlbmd0aCgpICsg d2lkdGgubGVuZ3RoKCkgKyBoZWlnaHQubGVuZ3RoKCkgKyByYWRpdXNYLmxlbmd0aCgpICsgcmFk aXVzWS5sZW5ndGgoKSk7CiAgICAgcmVzdWx0LmFwcGVuZExpdGVyYWwob3BlbmluZyk7CiAgICAg cmVzdWx0LmFwcGVuZCh4KTsKICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbChzZXBhcmF0b3IpOwpA QCAtNzcsNyArNzgsNyBAQCBTdHJpbmcgQ1NTQmFzaWNTaGFwZVJlY3RhbmdsZTo6Y3NzVGV4dCgp IGNvbnN0CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZVJlY3RhbmdsZTo6ZXF1YWxzKGNvbnN0IENTU0Jh c2ljU2hhcGUmIHNoYXBlKSBjb25zdAogewotICAgIGlmIChzaGFwZS50eXBlKCkgIT0gQ1NTX0JB U0lDX1NIQVBFX1JFQ1RBTkdMRSkKKyAgICBpZiAoc2hhcGUudHlwZSgpICE9IENTU0Jhc2ljU2hh cGVSZWN0YW5nbGVUeXBlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBjb25zdCBDU1NC YXNpY1NoYXBlUmVjdGFuZ2xlJiBvdGhlciA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2ljU2hh cGVSZWN0YW5nbGUmPihzaGFwZSk7CkBAIC0xMjMsNyArMTI0LDcgQEAgU3RyaW5nIENTU0Jhc2lj U2hhcGVDaXJjbGU6OmNzc1RleHQoKSBjb25zdAogCiBib29sIENTU0Jhc2ljU2hhcGVDaXJjbGU6 OmVxdWFscyhjb25zdCBDU1NCYXNpY1NoYXBlJiBzaGFwZSkgY29uc3QKIHsKLSAgICBpZiAoc2hh cGUudHlwZSgpICE9IENTU19CQVNJQ19TSEFQRV9DSVJDTEUpCisgICAgaWYgKHNoYXBlLnR5cGUo KSAhPSBDU1NCYXNpY1NoYXBlQ2lyY2xlVHlwZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSYgb3RoZXIgPSBzdGF0aWNfY2FzdDxjb25zdCBD U1NCYXNpY1NoYXBlQ2lyY2xlJj4oc2hhcGUpOwpAQCAtMTYwLDcgKzE2MSw3IEBAIFN0cmluZyBD U1NCYXNpY1NoYXBlRWxsaXBzZTo6Y3NzVGV4dCgpIGNvbnN0CiAKIGJvb2wgQ1NTQmFzaWNTaGFw ZUVsbGlwc2U6OmVxdWFscyhjb25zdCBDU1NCYXNpY1NoYXBlJiBzaGFwZSkgY29uc3QKIHsKLSAg ICBpZiAoc2hhcGUudHlwZSgpICE9IENTU19CQVNJQ19TSEFQRV9FTExJUFNFKQorICAgIGlmIChz aGFwZS50eXBlKCkgIT0gQ1NTQmFzaWNTaGFwZUVsbGlwc2VUeXBlKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBjb25zdCBDU1NCYXNpY1NoYXBlRWxsaXBzZSYgb3RoZXIgPSBzdGF0aWNf Y2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlRWxsaXBzZSY+KHNoYXBlKTsKQEAgLTIzOSw3ICsyNDAs NyBAQCBTdHJpbmcgQ1NTQmFzaWNTaGFwZVBvbHlnb246OmNzc1RleHQoKSBjb25zdAogCiBib29s IENTU0Jhc2ljU2hhcGVQb2x5Z29uOjplcXVhbHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYgc2hhcGUp IGNvbnN0CiB7Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAhPSBDU1NfQkFTSUNfU0hBUEVfUE9MWUdP TikKKyAgICBpZiAoc2hhcGUudHlwZSgpICE9IENTU0Jhc2ljU2hhcGVQb2x5Z29uVHlwZSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24mIHJo cyA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2ljU2hhcGVQb2x5Z29uJj4oc2hhcGUpOwpAQCAt MzA3LDcgKzMwOCw3IEBAIFN0cmluZyBDU1NCYXNpY1NoYXBlSW5zZXRSZWN0YW5nbGU6OmNzc1Rl eHQoKSBjb25zdAogCiBib29sIENTU0Jhc2ljU2hhcGVJbnNldFJlY3RhbmdsZTo6ZXF1YWxzKGNv bnN0IENTU0Jhc2ljU2hhcGUmIHNoYXBlKSBjb25zdAogewotICAgIGlmIChzaGFwZS50eXBlKCkg IT0gQ1NTX0JBU0lDX1NIQVBFX0lOU0VUX1JFQ1RBTkdMRSkKKyAgICBpZiAoc2hhcGUudHlwZSgp ICE9IENTU0Jhc2ljU2hhcGVJbnNldFJlY3RhbmdsZVR5cGUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVJbnNldFJlY3RhbmdsZSYgb3RoZXIgPSBzdGF0 aWNfY2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlSW5zZXRSZWN0YW5nbGUmPihzaGFwZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFwZXMuaCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5oCmluZGV4IGNkNTkyODMwM2YxOGVlZGEyOTA0MjUyNmIx YzUwNGZjMTg2YjQ4OWMuLjAwNmEwYzUzOGM4YzVmZTUwMjUxNmFmMzIzNzM3N2UxZmM0NTMzMDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5oCkBAIC00MSwxMSArNDEsMTEgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQ1NTQmFzaWNTaGFwZSA6IHB1YmxpYyBSZWZDb3VudGVk PENTU0Jhc2ljU2hhcGU+IHsKIHB1YmxpYzoKICAgICBlbnVtIFR5cGUgewotICAgICAgICBDU1Nf QkFTSUNfU0hBUEVfUkVDVEFOR0xFID0gMSwKLSAgICAgICAgQ1NTX0JBU0lDX1NIQVBFX0NJUkNM RSA9IDIsCi0gICAgICAgIENTU19CQVNJQ19TSEFQRV9FTExJUFNFID0gMywKLSAgICAgICAgQ1NT X0JBU0lDX1NIQVBFX1BPTFlHT04gPSA0LAotICAgICAgICBDU1NfQkFTSUNfU0hBUEVfSU5TRVRf UkVDVEFOR0xFID0gNQorICAgICAgICBDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlVHlwZSA9IDEsCisg ICAgICAgIENTU0Jhc2ljU2hhcGVDaXJjbGVUeXBlID0gMiwKKyAgICAgICAgQ1NTQmFzaWNTaGFw ZUVsbGlwc2VUeXBlID0gMywKKyAgICAgICAgQ1NTQmFzaWNTaGFwZVBvbHlnb25UeXBlID0gNCwK KyAgICAgICAgQ1NTQmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlVHlwZSA9IDUKICAgICB9OwogCiAg ICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCA9IDA7CkBAIC04Miw3ICs4Miw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldFJhZGl1c1goUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcmFk aXVzWCkgeyBtX3JhZGl1c1ggPSByYWRpdXNYOyB9CiAgICAgdm9pZCBzZXRSYWRpdXNZKFBhc3NS ZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHJhZGl1c1kpIHsgbV9yYWRpdXNZID0gcmFkaXVzWTsg fQogCi0gICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBDU1NfQkFTSUNfU0hB UEVfUkVDVEFOR0xFOyB9CisgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBD U1NCYXNpY1NoYXBlUmVjdGFuZ2xlVHlwZTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGNzc1RleHQo KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgZXF1YWxzKGNvbnN0IENTU0Jhc2ljU2hhcGUmKSBj b25zdDsKIApAQCAtMTIwLDcgKzEyMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFJhZGl1c1go UGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcmFkaXVzWCkgeyBtX3JhZGl1c1ggPSByYWRp dXNYOyB9CiAgICAgdm9pZCBzZXRSYWRpdXNZKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+ IHJhZGl1c1kpIHsgbV9yYWRpdXNZID0gcmFkaXVzWTsgfQogCi0gICAgdmlydHVhbCBUeXBlIHR5 cGUoKSBjb25zdCB7IHJldHVybiBDU1NfQkFTSUNfU0hBUEVfSU5TRVRfUkVDVEFOR0xFOyB9Cisg ICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBDU1NCYXNpY1NoYXBlSW5zZXRS ZWN0YW5nbGVUeXBlOyB9CiAgICAgdmlydHVhbCBTdHJpbmcgY3NzVGV4dCgpIGNvbnN0OwogICAg IHZpcnR1YWwgYm9vbCBlcXVhbHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYpIGNvbnN0OwogCkBAIC0x NTIsNyArMTUyLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q2VudGVyWShQYXNzUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBjZW50ZXJZKSB7IG1fY2VudGVyWSA9IGNlbnRlclk7IH0KICAgICB2 b2lkIHNldFJhZGl1cyhQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiByYWRpdXMpIHsgbV9y YWRpdXMgPSByYWRpdXM7IH0KIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1 cm4gQ1NTX0JBU0lDX1NIQVBFX0NJUkNMRTsgfQorICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29u c3QgeyByZXR1cm4gQ1NTQmFzaWNTaGFwZUNpcmNsZVR5cGU7IH0KICAgICB2aXJ0dWFsIFN0cmlu ZyBjc3NUZXh0KCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGVxdWFscyhjb25zdCBDU1NCYXNp Y1NoYXBlJikgY29uc3Q7CiAKQEAgLTE4Myw3ICsxODMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRSYWRpdXNYKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHJhZGl1c1gpIHsgbV9yYWRp dXNYID0gcmFkaXVzWDsgfQogICAgIHZvaWQgc2V0UmFkaXVzWShQYXNzUmVmUHRyPENTU1ByaW1p dGl2ZVZhbHVlPiByYWRpdXNZKSB7IG1fcmFkaXVzWSA9IHJhZGl1c1k7IH0KIAotICAgIHZpcnR1 YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQ1NTX0JBU0lDX1NIQVBFX0VMTElQU0U7IH0K KyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIENTU0Jhc2ljU2hhcGVFbGxp cHNlVHlwZTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGNzc1RleHQoKSBjb25zdDsKICAgICB2aXJ0 dWFsIGJvb2wgZXF1YWxzKGNvbnN0IENTU0Jhc2ljU2hhcGUmKSBjb25zdDsKIApAQCAtMjE4LDcg KzIxOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFdpbmRSdWxlKFdpbmRSdWxlIHcpIHsgbV93 aW5kUnVsZSA9IHc7IH0KICAgICBXaW5kUnVsZSB3aW5kUnVsZSgpIGNvbnN0IHsgcmV0dXJuIG1f d2luZFJ1bGU7IH0KIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQ1NT X0JBU0lDX1NIQVBFX1BPTFlHT047IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsg cmV0dXJuIENTU0Jhc2ljU2hhcGVQb2x5Z29uVHlwZTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGNz c1RleHQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgZXF1YWxzKGNvbnN0IENTU0Jhc2ljU2hh cGUmKSBjb25zdDsKICNpZiBFTkFCTEUoQ1NTX1ZBUklBQkxFUykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGUuY3BwCmluZGV4IGIwYWNkZWIxMWQ4NjZkN2VhOTIwZmFh MTJjODdhN2MyZTc2NThkNzguLmRkOGY3Yzc1OTJkYjU0OGI1OTk4YTU3OWM3MzI5YjU3ZmI1ZDNm ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlLmNwcApAQCAt MTAxLDcgKzEwMSw3IEBAIFBhc3NPd25QdHI8RXhjbHVzaW9uU2hhcGU+IEV4Y2x1c2lvblNoYXBl OjpjcmVhdGVFeGNsdXNpb25TaGFwZShjb25zdCBCYXNpY1NoYXBlCiAKICAgICBzd2l0Y2ggKGJh c2ljU2hhcGUtPnR5cGUoKSkgewogCi0gICAgY2FzZSBCYXNpY1NoYXBlOjpCQVNJQ19TSEFQRV9S RUNUQU5HTEU6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVSZWN0YW5nbGVUeXBl OiB7CiAgICAgICAgIGNvbnN0IEJhc2ljU2hhcGVSZWN0YW5nbGUqIHJlY3RhbmdsZSA9IHN0YXRp Y19jYXN0PGNvbnN0IEJhc2ljU2hhcGVSZWN0YW5nbGUqPihiYXNpY1NoYXBlKTsKICAgICAgICAg RmxvYXRSZWN0IGJvdW5kcygKICAgICAgICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgocmVjdGFu Z2xlLT54KCksIGJveFdpZHRoKSwKQEAgLTExOSw3ICsxMTksNyBAQCBQYXNzT3duUHRyPEV4Y2x1 c2lvblNoYXBlPiBFeGNsdXNpb25TaGFwZTo6Y3JlYXRlRXhjbHVzaW9uU2hhcGUoY29uc3QgQmFz aWNTaGFwZQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBjYXNlIEJhc2ljU2hhcGU6OkJB U0lDX1NIQVBFX0NJUkNMRTogeworICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUNpcmNs ZVR5cGU6IHsKICAgICAgICAgY29uc3QgQmFzaWNTaGFwZUNpcmNsZSogY2lyY2xlID0gc3RhdGlj X2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUNpcmNsZSo+KGJhc2ljU2hhcGUpOwogICAgICAgICBmbG9h dCBjZW50ZXJYID0gZmxvYXRWYWx1ZUZvckxlbmd0aChjaXJjbGUtPmNlbnRlclgoKSwgYm94V2lk dGgpOwogICAgICAgICBmbG9hdCBjZW50ZXJZID0gZmxvYXRWYWx1ZUZvckxlbmd0aChjaXJjbGUt PmNlbnRlclkoKSwgYm94SGVpZ2h0KTsKQEAgLTEzMCw3ICsxMzAsNyBAQCBQYXNzT3duUHRyPEV4 Y2x1c2lvblNoYXBlPiBFeGNsdXNpb25TaGFwZTo6Y3JlYXRlRXhjbHVzaW9uU2hhcGUoY29uc3Qg QmFzaWNTaGFwZQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBjYXNlIEJhc2ljU2hhcGU6 OkJBU0lDX1NIQVBFX0VMTElQU0U6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVF bGxpcHNlVHlwZTogewogICAgICAgICBjb25zdCBCYXNpY1NoYXBlRWxsaXBzZSogZWxsaXBzZSA9 IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVFbGxpcHNlKj4oYmFzaWNTaGFwZSk7CiAgICAg ICAgIGZsb2F0IGNlbnRlclggPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGVsbGlwc2UtPmNlbnRlclgo KSwgYm94V2lkdGgpOwogICAgICAgICBmbG9hdCBjZW50ZXJZID0gZmxvYXRWYWx1ZUZvckxlbmd0 aChlbGxpcHNlLT5jZW50ZXJZKCksIGJveEhlaWdodCk7CkBAIC0xNDMsNyArMTQzLDcgQEAgUGFz c093blB0cjxFeGNsdXNpb25TaGFwZT4gRXhjbHVzaW9uU2hhcGU6OmNyZWF0ZUV4Y2x1c2lvblNo YXBlKGNvbnN0IEJhc2ljU2hhcGUKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgY2FzZSBC YXNpY1NoYXBlOjpCQVNJQ19TSEFQRV9QT0xZR09OOiB7CisgICAgY2FzZSBCYXNpY1NoYXBlOjpC YXNpY1NoYXBlUG9seWdvblR5cGU6IHsKICAgICAgICAgY29uc3QgQmFzaWNTaGFwZVBvbHlnb24q IHBvbHlnb24gPSBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY1NoYXBlUG9seWdvbio+KGJhc2ljU2hh cGUpOwogICAgICAgICBjb25zdCBWZWN0b3I8TGVuZ3RoPiYgdmFsdWVzID0gcG9seWdvbi0+dmFs dWVzKCk7CiAgICAgICAgIHNpemVfdCB2YWx1ZXNTaXplID0gdmFsdWVzLnNpemUoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8u Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5j cHAKaW5kZXggYjVhZjY1Y2VhYmZkMjljNTVkYjZhZGY3MzI2ODNhM2QwYjUwMzY2Ny4uNWQxNTc0 MDZhYzM4YzA5N2QyZTM5MjdiMGQ5YzNjMDJhNmEwMWQ2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5jcHAKQEAgLTUwLDcg KzUwLDcgQEAgYm9vbCBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmlzRW5hYmxlZEZvcihjb25z dCBSZW5kZXJCbG9jayogcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEJh c2ljU2hhcGUqIHNoYXBlID0gc2hhcGVWYWx1ZS0+c2hhcGUoKTsKLSAgICByZXR1cm4gc2hhcGUg JiYgc2hhcGUtPnR5cGUoKSAhPSBCYXNpY1NoYXBlOjpCQVNJQ19TSEFQRV9JTlNFVF9SRUNUQU5H TEU7CisgICAgcmV0dXJuIHNoYXBlICYmIHNoYXBlLT50eXBlKCkgIT0gQmFzaWNTaGFwZTo6QmFz aWNTaGFwZUluc2V0UmVjdGFuZ2xlVHlwZTsKIH0KIAogYm9vbCBFeGNsdXNpb25TaGFwZUluc2lk ZUluZm86OmFkanVzdExvZ2ljYWxMaW5lVG9wKGZsb2F0IG1pblNlZ21lbnRXaWR0aCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZU91dHNpZGVJbmZv LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZU91dHNpZGVJbmZv LmNwcAppbmRleCA0ZDZlM2E3ZTExOWE4ZWViODE2YTY1MzdlNjFjYjBjYjMwMDM2MTNmLi4yMGQy YzM3MzY5MjU4MjVkNTMzNTEwYmM0MjdjMTM5MzA5MDZmNmJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVPdXRzaWRlSW5mby5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlT3V0c2lkZUluZm8uY3BwCkBAIC00 Myw3ICs0Myw3IEBAIGJvb2wgRXhjbHVzaW9uU2hhcGVPdXRzaWRlSW5mbzo6aXNFbmFibGVkRm9y KGNvbnN0IFJlbmRlckJveCogYm94KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBCYXNp Y1NoYXBlKiBzaGFwZSA9IHZhbHVlLT5zaGFwZSgpOwotICAgIHJldHVybiBzaGFwZSAmJiBzaGFw ZS0+dHlwZSgpICE9IEJhc2ljU2hhcGU6OkJBU0lDX1NIQVBFX0lOU0VUX1JFQ1RBTkdMRTsKKyAg ICByZXR1cm4gc2hhcGUgJiYgc2hhcGUtPnR5cGUoKSAhPSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBl SW5zZXRSZWN0YW5nbGVUeXBlOwogfQogCiBib29sIEV4Y2x1c2lvblNoYXBlT3V0c2lkZUluZm86 OmNvbXB1dGVTZWdtZW50c0ZvckxpbmUoTGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxp bmVIZWlnaHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFz aWNTaGFwZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVz LmNwcAppbmRleCAyMzY1YmNlZmU5NzBmN2ZlYWVhNzVjZDc2NGNhMTEzNTg1MTk1OGU4Li41YmIz ZjhkYTZlZTJlYWQ5OTEzYjExOTkxZjExM2EzNjdlZjU1NjYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNp bmNsdWRlICJjb25maWcuaCIKIAogI2luY2x1ZGUgIkJhc2ljU2hhcGVzLmgiCisKICNpbmNsdWRl ICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJMZW5ndGhGdW5jdGlvbnMuaCIKICNpbmNsdWRlICJQ YXRoLmgiCkBAIC00Myw3ICs0NCw3IEBAIGJvb2wgQmFzaWNTaGFwZTo6Y2FuQmxlbmQoY29uc3Qg QmFzaWNTaGFwZSogb3RoZXIpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8v IEp1c3QgcG9seWdvbnMgd2l0aCBzYW1lIG51bWJlciBvZiB2ZXJ0aWNlcyBjYW4gYmUgYW5pbWF0 ZWQuCi0gICAgaWYgKHR5cGUoKSA9PSBCYXNpY1NoYXBlOjpCQVNJQ19TSEFQRV9QT0xZR09OCisg ICAgaWYgKHR5cGUoKSA9PSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlUG9seWdvblR5cGUKICAgICAg ICAgJiYgc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZVBvbHlnb24qPih0aGlzKS0+dmFsdWVz KCkuc2l6ZSgpICE9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVQb2x5Z29uKj4ob3RoZXIp LT52YWx1ZXMoKS5zaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNTMsMTIgKzU0 LDE3IEBAIGJvb2wgQmFzaWNTaGFwZTo6Y2FuQmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIp IGNvbnN0CiB2b2lkIEJhc2ljU2hhcGVSZWN0YW5nbGU6OnBhdGgoUGF0aCYgcGF0aCwgY29uc3Qg RmxvYXRSZWN0JiBib3VuZGluZ0JveCkKIHsKICAgICBBU1NFUlQocGF0aC5pc0VtcHR5KCkpOwot ICAgIHBhdGguYWRkUm91bmRlZFJlY3QoRmxvYXRSZWN0KGZsb2F0VmFsdWVGb3JMZW5ndGgobV94 LCBib3VuZGluZ0JveC53aWR0aCgpKSArIGJvdW5kaW5nQm94LngoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1feSwgYm91bmRpbmdCb3gu aGVpZ2h0KCkpICsgYm91bmRpbmdCb3gueSgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgobV93aWR0aCwgYm91bmRpbmdCb3gud2lkdGgoKSks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXRWYWx1ZUZvckxlbmd0aCht X2hlaWdodCwgYm91bmRpbmdCb3guaGVpZ2h0KCkpKSwKLSAgICAgICAgICAgICAgICAgICAgICAg IEZsb2F0U2l6ZShtX2Nvcm5lclJhZGl1c1guaXNVbmRlZmluZWQoKSA/IDAgOiBmbG9hdFZhbHVl Rm9yTGVuZ3RoKG1fY29ybmVyUmFkaXVzWCwgYm91bmRpbmdCb3gud2lkdGgoKSksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jb3JuZXJSYWRpdXNZLmlzVW5kZWZpbmVkKCkg PyAwIDogZmxvYXRWYWx1ZUZvckxlbmd0aChtX2Nvcm5lclJhZGl1c1ksIGJvdW5kaW5nQm94Lmhl aWdodCgpKSkpOworICAgIHBhdGguYWRkUm91bmRlZFJlY3QoRmxvYXRSZWN0KGZsb2F0VmFsdWVG b3JMZW5ndGgoCisgICAgICAgIG1feCwKKyAgICAgICAgYm91bmRpbmdCb3gud2lkdGgoKSkgKyBi b3VuZGluZ0JveC54KCksCisgICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgobV95LCBib3VuZGlu Z0JveC5oZWlnaHQoKSkgKyBib3VuZGluZ0JveC55KCksCisgICAgICAgIGZsb2F0VmFsdWVGb3JM ZW5ndGgobV93aWR0aCwgYm91bmRpbmdCb3gud2lkdGgoKSksCisgICAgICAgIGZsb2F0VmFsdWVG b3JMZW5ndGgobV9oZWlnaHQsIGJvdW5kaW5nQm94LmhlaWdodCgpKSksCisgICAgICAgIEZsb2F0 U2l6ZSgKKyAgICAgICAgICAgIG1fY29ybmVyUmFkaXVzWC5pc1VuZGVmaW5lZCgpID8gMCA6IGZs b2F0VmFsdWVGb3JMZW5ndGgobV9jb3JuZXJSYWRpdXNYLCBib3VuZGluZ0JveC53aWR0aCgpKSwK KyAgICAgICAgICAgIG1fY29ybmVyUmFkaXVzWS5pc1VuZGVmaW5lZCgpID8gMCA6IGZsb2F0VmFs dWVGb3JMZW5ndGgobV9jb3JuZXJSYWRpdXNZLCBib3VuZGluZ0JveC5oZWlnaHQoKSkKKyAgICAg ICAgKQorICAgICk7CiB9CiAKIFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gQmFzaWNTaGFwZVJlY3Rh bmdsZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcykgY29u c3QKQEAgLTg1LDEwICs5MSwxMiBAQCB2b2lkIEJhc2ljU2hhcGVDaXJjbGU6OnBhdGgoUGF0aCYg cGF0aCwgY29uc3QgRmxvYXRSZWN0JiBib3VuZGluZ0JveCkKICAgICBmbG9hdCBjZW50ZXJYID0g ZmxvYXRWYWx1ZUZvckxlbmd0aChtX2NlbnRlclgsIGJvdW5kaW5nQm94LndpZHRoKCkpOwogICAg IGZsb2F0IGNlbnRlclkgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1fY2VudGVyWSwgYm91bmRpbmdC b3guaGVpZ2h0KCkpOwogICAgIGZsb2F0IHJhZGl1cyA9IGZsb2F0VmFsdWVGb3JMZW5ndGgobV9y YWRpdXMsIGRpYWdvbmFsKTsKLSAgICBwYXRoLmFkZEVsbGlwc2UoRmxvYXRSZWN0KGNlbnRlclgg LSByYWRpdXMgKyBib3VuZGluZ0JveC54KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjZW50ZXJZIC0gcmFkaXVzICsgYm91bmRpbmdCb3gueSgpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmFkaXVzICogMiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJh ZGl1cyAqIDIpKTsKKyAgICBwYXRoLmFkZEVsbGlwc2UoRmxvYXRSZWN0KAorICAgICAgICBjZW50 ZXJYIC0gcmFkaXVzICsgYm91bmRpbmdCb3gueCgpLAorICAgICAgICBjZW50ZXJZIC0gcmFkaXVz ICsgYm91bmRpbmdCb3gueSgpLAorICAgICAgICByYWRpdXMgKiAyLAorICAgICAgICByYWRpdXMg KiAyCisgICAgKSk7CiB9CiAKIFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gQmFzaWNTaGFwZUNpcmNs ZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcykgY29uc3QK QEAgLTExMCwxMCArMTE4LDEyIEBAIHZvaWQgQmFzaWNTaGFwZUVsbGlwc2U6OnBhdGgoUGF0aCYg cGF0aCwgY29uc3QgRmxvYXRSZWN0JiBib3VuZGluZ0JveCkKICAgICBmbG9hdCBjZW50ZXJZID0g ZmxvYXRWYWx1ZUZvckxlbmd0aChtX2NlbnRlclksIGJvdW5kaW5nQm94LmhlaWdodCgpKTsKICAg ICBmbG9hdCByYWRpdXNYID0gZmxvYXRWYWx1ZUZvckxlbmd0aChtX3JhZGl1c1gsIGJvdW5kaW5n Qm94LndpZHRoKCkpOwogICAgIGZsb2F0IHJhZGl1c1kgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1f cmFkaXVzWSwgYm91bmRpbmdCb3guaGVpZ2h0KCkpOwotICAgIHBhdGguYWRkRWxsaXBzZShGbG9h dFJlY3QoY2VudGVyWCAtIHJhZGl1c1ggKyBib3VuZGluZ0JveC54KCksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjZW50ZXJZIC0gcmFkaXVzWSArIGJvdW5kaW5nQm94LnkoKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhZGl1c1ggKiAyLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmFkaXVzWSAqIDIpKTsKKyAgICBwYXRoLmFkZEVsbGlwc2UoRmxvYXRS ZWN0KAorICAgICAgICBjZW50ZXJYIC0gcmFkaXVzWCArIGJvdW5kaW5nQm94LngoKSwKKyAgICAg ICAgY2VudGVyWSAtIHJhZGl1c1kgKyBib3VuZGluZ0JveC55KCksCisgICAgICAgIHJhZGl1c1gg KiAyLAorICAgICAgICByYWRpdXNZICogMgorICAgICkpOwogfQogCiBQYXNzUmVmUHRyPEJhc2lj U2hhcGU+IEJhc2ljU2hhcGVFbGxpcHNlOjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlciwg ZG91YmxlIHByb2dyZXNzKSBjb25zdApAQCAtMTc1LDExICsxODUsMTYgQEAgdm9pZCBCYXNpY1No YXBlSW5zZXRSZWN0YW5nbGU6OnBhdGgoUGF0aCYgcGF0aCwgY29uc3QgRmxvYXRSZWN0JiBib3Vu ZGluZ0JveCkKICAgICBBU1NFUlQocGF0aC5pc0VtcHR5KCkpOwogICAgIGZsb2F0IGxlZnQgPSBm bG9hdFZhbHVlRm9yTGVuZ3RoKG1fbGVmdCwgYm91bmRpbmdCb3gud2lkdGgoKSk7CiAgICAgZmxv YXQgdG9wID0gZmxvYXRWYWx1ZUZvckxlbmd0aChtX3RvcCwgYm91bmRpbmdCb3guaGVpZ2h0KCkp OwotICAgIHBhdGguYWRkUm91bmRlZFJlY3QoRmxvYXRSZWN0KGxlZnQgKyBib3VuZGluZ0JveC54 KCksIHRvcCArIGJvdW5kaW5nQm94LnkoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdGQ6Om1heDxmbG9hdD4oYm91bmRpbmdCb3gud2lkdGgoKSAtIGxlZnQgLSBmbG9hdFZh bHVlRm9yTGVuZ3RoKG1fcmlnaHQsIGJvdW5kaW5nQm94LndpZHRoKCkpLCAwKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdGQ6Om1heDxmbG9hdD4oYm91bmRpbmdCb3guaGVp Z2h0KCkgLSB0b3AgLSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1fYm90dG9tLCBib3VuZGluZ0JveC5o ZWlnaHQoKSksIDApKSwKLSAgICAgICAgICAgICAgICAgICAgICAgIEZsb2F0U2l6ZShtX2Nvcm5l clJhZGl1c1guaXNVbmRlZmluZWQoKSA/IDAgOiBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1fY29ybmVy UmFkaXVzWCwgYm91bmRpbmdCb3gud2lkdGgoKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV9jb3JuZXJSYWRpdXNZLmlzVW5kZWZpbmVkKCkgPyAwIDogZmxvYXRWYWx1ZUZv ckxlbmd0aChtX2Nvcm5lclJhZGl1c1ksIGJvdW5kaW5nQm94LmhlaWdodCgpKSkpOworICAgIHBh dGguYWRkUm91bmRlZFJlY3QoRmxvYXRSZWN0KAorICAgICAgICBsZWZ0ICsgYm91bmRpbmdCb3gu eCgpLAorICAgICAgICB0b3AgKyBib3VuZGluZ0JveC55KCksCisgICAgICAgIHN0ZDo6bWF4PGZs b2F0Pihib3VuZGluZ0JveC53aWR0aCgpIC0gbGVmdCAtIGZsb2F0VmFsdWVGb3JMZW5ndGgobV9y aWdodCwgYm91bmRpbmdCb3gud2lkdGgoKSksIDApLAorICAgICAgICBzdGQ6Om1heDxmbG9hdD4o Ym91bmRpbmdCb3guaGVpZ2h0KCkgLSB0b3AgLSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1fYm90dG9t LCBib3VuZGluZ0JveC5oZWlnaHQoKSksIDApKSwKKyAgICAgICAgRmxvYXRTaXplKAorICAgICAg ICAgICAgbV9jb3JuZXJSYWRpdXNYLmlzVW5kZWZpbmVkKCkgPyAwIDogZmxvYXRWYWx1ZUZvckxl bmd0aChtX2Nvcm5lclJhZGl1c1gsIGJvdW5kaW5nQm94LndpZHRoKCkpLAorICAgICAgICAgICAg bV9jb3JuZXJSYWRpdXNZLmlzVW5kZWZpbmVkKCkgPyAwIDogZmxvYXRWYWx1ZUZvckxlbmd0aCht X2Nvcm5lclJhZGl1c1ksIGJvdW5kaW5nQm94LmhlaWdodCgpKQorICAgICAgICApCisgICAgKTsK IH0KIAogUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBCYXNpY1NoYXBlSW5zZXRSZWN0YW5nbGU6OmJs ZW5kKGNvbnN0IEJhc2ljU2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MpIGNvbnN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5oCmluZGV4IDRkYzZkZjJi NzJmODQ3NjlkNTQ1NTk0OWMyZDAwNjk5NThlMjEyODcuLjg4NDE5ZTRlNzkzZmM1YWNlNGY5NWM2 NjE4OTkwMzA3ZTg1M2EwMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9CYXNpY1NoYXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9C YXNpY1NoYXBlcy5oCkBAIC00NiwxMSArNDYsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfkJh c2ljU2hhcGUoKSB7IH0KIAogICAgIGVudW0gVHlwZSB7Ci0gICAgICAgIEJBU0lDX1NIQVBFX1JF Q1RBTkdMRSA9IDEsCi0gICAgICAgIEJBU0lDX1NIQVBFX0NJUkNMRSA9IDIsCi0gICAgICAgIEJB U0lDX1NIQVBFX0VMTElQU0UgPSAzLAotICAgICAgICBCQVNJQ19TSEFQRV9QT0xZR09OID0gNCwK LSAgICAgICAgQkFTSUNfU0hBUEVfSU5TRVRfUkVDVEFOR0xFID0gNQorICAgICAgICBCYXNpY1No YXBlUmVjdGFuZ2xlVHlwZSA9IDEsCisgICAgICAgIEJhc2ljU2hhcGVDaXJjbGVUeXBlID0gMiwK KyAgICAgICAgQmFzaWNTaGFwZUVsbGlwc2VUeXBlID0gMywKKyAgICAgICAgQmFzaWNTaGFwZVBv bHlnb25UeXBlID0gNCwKKyAgICAgICAgQmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlVHlwZSA9IDUK ICAgICB9OwogCiAgICAgYm9vbCBjYW5CbGVuZChjb25zdCBCYXNpY1NoYXBlKikgY29uc3Q7CkBA IC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQYXRoJiwgY29u c3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEJhc2ljU2hh cGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUpIGNvbnN0IE9WRVJSSURFOwogCi0g ICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBCQVNJQ19TSEFQRV9SRUNUQU5H TEU7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEJhc2ljU2hhcGVS ZWN0YW5nbGVUeXBlOyB9CiBwcml2YXRlOgogICAgIEJhc2ljU2hhcGVSZWN0YW5nbGUoKQogICAg ICAgICA6IG1fY29ybmVyUmFkaXVzWChVbmRlZmluZWQpCkBAIC0xMTUsNyArMTE1LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBwYXRoKFBhdGgmLCBjb25zdCBGbG9hdFJlY3QmKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFz aWNTaGFwZSosIGRvdWJsZSkgY29uc3QgT1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIFR5cGUgdHlw ZSgpIGNvbnN0IHsgcmV0dXJuIEJBU0lDX1NIQVBFX0NJUkNMRTsgfQorICAgIHZpcnR1YWwgVHlw ZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQmFzaWNTaGFwZUNpcmNsZVR5cGU7IH0KIHByaXZhdGU6 CiAgICAgQmFzaWNTaGFwZUNpcmNsZSgpIHsgfQogCkBAIC0xNDEsNyArMTQxLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBwYXRoKFBhdGgmLCBjb25zdCBGbG9hdFJlY3QmKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNT aGFwZSosIGRvdWJsZSkgY29uc3QgT1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIFR5cGUgdHlwZSgp IGNvbnN0IHsgcmV0dXJuIEJBU0lDX1NIQVBFX0VMTElQU0U7IH0gCisgICAgdmlydHVhbCBUeXBl IHR5cGUoKSBjb25zdCB7IHJldHVybiBCYXNpY1NoYXBlRWxsaXBzZVR5cGU7IH0gCiBwcml2YXRl OgogICAgIEJhc2ljU2hhcGVFbGxpcHNlKCkgeyB9CiAKQEAgLTE2Nyw3ICsxNjcsNyBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIFdpbmRSdWxlIHdpbmRSdWxlKCkgY29uc3QgeyByZXR1cm4gbV93 aW5kUnVsZTsgfQogCi0gICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBCQVNJ Q19TSEFQRV9QT0xZR09OOyB9CisgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVy biBCYXNpY1NoYXBlUG9seWdvblR5cGU7IH0KIHByaXZhdGU6CiAgICAgQmFzaWNTaGFwZVBvbHln b24oKQogICAgICAgICA6IG1fd2luZFJ1bGUoUlVMRV9OT05aRVJPKQpAQCAtMTk4LDcgKzE5OCw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQYXRoJiwgY29uc3QgRmxvYXRSZWN0 JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJsZW5kKGNv bnN0IEJhc2ljU2hhcGUqLCBkb3VibGUpIGNvbnN0IE9WRVJSSURFOwogCi0gICAgdmlydHVhbCBU eXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBCQVNJQ19TSEFQRV9JTlNFVF9SRUNUQU5HTEU7IH0K KyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEJhc2ljU2hhcGVJbnNldFJl Y3RhbmdsZVR5cGU7IH0KIHByaXZhdGU6CiAgICAgQmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlKCkK ICAgICAgICAgOiBtX2Nvcm5lclJhZGl1c1goVW5kZWZpbmVkKQo=