127596 2014-01-24 17:43:32 -0800 Remove back/forward list related functions from Page 2014-01-24 18:04:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bunhere cdumez commit-queue gyuyoung.kim oldest_to_newest 971827 0 andersca 2014-01-24 17:43:32 -0800 Remove back/forward list related functions from Page 971829 1 222175 andersca 2014-01-24 17:46:12 -0800 Created attachment 222175 Patch 971831 2 commit-queue 2014-01-24 17:48:57 -0800 Attachment 222175 did not pass style-queue: ERROR: Source/WebKit/win/WebView.cpp:2071: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebKit/win/WebView.cpp:2073: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 971833 3 222175 kling 2014-01-24 17:57:31 -0800 Comment on attachment 222175 Patch Ooh nice!! I wanted to do this a while ago but then I didn't because lazy. r=me but you should probably wait for EWS. 971842 4 andersca 2014-01-24 18:04:26 -0800 Committed r162745: <http://trac.webkit.org/changeset/162745> 222175 2014-01-24 17:46:12 -0800 2014-01-24 17:57:31 -0800 Patch bug-127596-20140124174612.patch text/plain 26348 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM1ZWM0ZmRjNTI3ZTMw OWRhMjcxYjFkZWQ4ODI2ZjdhMWVhNzAxYy4uMmE0NjViMDc3NzhjMmM0MjE2Yzg3YTdhNWQ1YTI5 OWZkMjRiMzg5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAxLTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGJhY2sv Zm9yd2FyZCBsaXN0IHJlbGF0ZWQgZnVuY3Rpb25zIGZyb20gUGFnZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTk2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAg ICAgKiBoaXN0b3J5L0JhY2tGb3J3YXJkQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmNhbkdvQmFja09yRm9yd2FyZCk6CisgICAgICAgIChX ZWJDb3JlOjpCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmdvQmFja09yRm9yd2FyZCk6CisgICAgICAg IChXZWJDb3JlOjpCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmdvQmFjayk6CisgICAgICAgIChXZWJD b3JlOjpCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmdvRm9yd2FyZCk6CisgICAgICAgIChXZWJDb3Jl OjpCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmNvdW50KToKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFu ZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRCYWNrc3Bh Y2VFdmVudEhhbmRsZXIpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgICogcGFn ZS9QYWdlLmg6CisKIDIwMTQtMDEtMjQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgog CiAgICAgICAgIFtOZXcgTXVsdGljb2x1bW5dIERvbid0IGRlc3Ryb3kgYWxsIHRoZSByZW5kZXJl cnMgd2hlbiBhIG11bHRpLWNvbHVtbiBibG9jayBzdG9wcyBiZWluZyBtdWx0aS1jb2x1bW4gKGFu ZCB2aWNlIHZlcnNhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IGUwNzdkNGJmYTFmZjcyNDYwOWI4NWM2 YjcyYTM4OGMyZjU0M2IzYjEuLmI5NDQ0MGEzNjYxYzFlOTcyYjU2YmFlMjM5NWI1NTUwMzFiN2Qy ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0wMS0yNCAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBiYWNrL2Zv cndhcmQgbGlzdCByZWxhdGVkIGZ1bmN0aW9ucyBmcm9tIFBhZ2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzU5NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAg ICAgIChld2tfZnJhbWVfbmF2aWdhdGUpOgorICAgICAgICAoZXdrX2ZyYW1lX25hdmlnYXRlX3Bv c3NpYmxlKToKKwogMjAxNC0wMS0yMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSByZWNvbXBpbGVBbGxKU0Z1bmN0 aW9ucyB0aW1lciBpbiBTY3JpcHREZWJ1Z1NlcnZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDYxYzRj YWFkNDFjNzBmZjYxNmNhYjg2Y2Q0MDIwZTBmYTBjYjA5OTEuLmJhYWY2OWJlMTIzOTJiM2QzODll Njc4NjNkNWEzMzc0YWY5ODYzMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxNC0wMS0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbW92ZSBiYWNrL2ZvcndhcmQgbGlzdCByZWxhdGVkIGZ1bmN0aW9ucyBmcm9tIFBhZ2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzU5Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF9tYWludGFp bnNfYmFja19mb3J3YXJkX2xpc3QpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2dldF9iYWNr X2ZvcndhcmRfbGlzdCk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjayk6CisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfZ29fYmFja19vcl9mb3J3YXJkKToKKyAgICAgICAgKHdlYmtp dF93ZWJfdmlld19nb19mb3J3YXJkKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19jYW5fZ29f YmFja19vcl9mb3J3YXJkKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19jYW5fZ29fZm9yd2Fy ZCk6CisKIDIwMTQtMDEtMjQgIEVucmlxdWUgT2Nhw7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBQdXQgY2FjaGUgZmlsZXMgaW4gWERHX0NBQ0hFX0hP TUUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwppbmRleCA0YWY3MmMyMGU1ZTk3NDg5ODVmMGY1N2FjN2RkMWVjZWNk Yzg4ZTRmLi4yZWRkYjNlNDE2MjgxNWJkMzU5M2QxZTFiMjVjMDI4NDI0ZTgwMzk0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTQtMDEtMjQgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgYmFjay9mb3J3YXJkIGxpc3Qg cmVsYXRlZCBmdW5jdGlvbnMgZnJvbSBQYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc1OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tOgorICAgICAgICAo LVtXZWJGcmFtZVZpZXcga2V5RG93bjprZXlEb3duOl0pOgorICAgICAgICAqIFdlYlZpZXcvV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfbG9hZEJhY2tGb3J3YXJkTGlzdEZyb21PdGhl clZpZXc6XSk6CisgICAgICAgICgtW1dlYlZpZXcgaW5pdFdpdGhDb2RlcjpdKToKKyAgICAgICAg KC1bV2ViVmlldyBlbmNvZGVXaXRoQ29kZXI6XSk6CisgICAgICAgICgtW1dlYlZpZXcgYmFja0Zv cndhcmRMaXN0XSk6CisgICAgICAgICgtW1dlYlZpZXcgc2V0TWFpbnRhaW5zQmFja0ZvcndhcmRM aXN0Ol0pOgorICAgICAgICAoLVtXZWJWaWV3IGdvQmFja10pOgorICAgICAgICAoLVtXZWJWaWV3 IGdvRm9yd2FyZF0pOgorICAgICAgICAoLVtXZWJWaWV3IGNhbkdvQmFja10pOgorICAgICAgICAo LVtXZWJWaWV3IGNhbkdvRm9yd2FyZF0pOgorCisyMDE0LTAxLTI0ICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgR2V0IHJpZCBvZiBtb25vdG9uaWNhbGx5 SW5jcmVhc2luZ1RpbWVNUyBhbmQgc3RhcnQgdXNpbmcgc3RkOjpjaHJvbm8gaW5zdGVhZAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTcxCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwppbmRleCA2NmMxNDVhMmYzYjQ1OTUxMzcxOWQ3N2QwZjJhYzkwYzEzMzY0NWI1 Li5iYjQ5ZmFmZDM2ZjMzOTFhZjAzYzJiN2EyNzFlNmY1ODExN2MwYzlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDEtMjQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgYmFjay9mb3J3YXJkIGxpc3QgcmVsYXRl ZCBmdW5jdGlvbnMgZnJvbSBQYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjc1OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6a2V5RG93bik6 CisgICAgICAgIChXZWJWaWV3Ojpnb0JhY2spOgorICAgICAgICAoV2ViVmlldzo6Z29Gb3J3YXJk KToKKwogMjAxNC0wMS0yNCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAK ICAgICAgICAgTW92ZSBIaXN0b3J5SXRlbSB0byBzdGQ6OnVuaXF1ZV9wdHIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCA5NDMzOWNhNDkxODEyYjQzNTdmYWJjNzAxOGUzNjk4M2I1NWI4MTFjLi5hMTgwMGM5MGNjMWFm NTA4ZGI0OWY3Y2IxMTQzNTE1Y2Y5NmU4MmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAK IDIwMTQtMDEtMjQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAg ICAgICBSZW1vdmUgYmFjay9mb3J3YXJkIGxpc3QgcmVsYXRlZCBmdW5jdGlvbnMgZnJvbSBQYWdl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc1OTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6cGVyZm9ybU5vbkVkaXRpbmdCZWhhdmlvckZvclNlbGVjdG9yKToKKworMjAxNC0wMS0yNCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEdldCByaWQg b2YgV2ViTG9hZGVyQ2xpZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjc1ODcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA4YjRhOTJhYjAzZDAx OWM3YzIxZGQ5YjU1MzBhMDU4MjMwYjJiMzU5Li5lOTNiNzc0NWVjZDc4YzhjNTE3M2NhMmRjZmU0 YzdiYzk3ZjM4ZjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgor KysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtODE2LDYgKzgxNiw4IEBAIF9f Wk43V2ViQ29yZTIwcHJldmlvdXNMaW5lUG9zaXRpb25FUktOU18xNVZpc2libGVQb3NpdGlvbkVp TlNfMTJFZGl0YWJsZVR5cGVFCiBfX1pON1dlYkNvcmUyMHByb3RvY29sSXNKYXZhU2NyaXB0RVJL TjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMjB0b1VJbnQzMkVuZm9yY2VSYW5nZUVQTjNKU0M5 RXhlY1N0YXRlRU5TMF83SlNWYWx1ZUUKIF9fWk43V2ViQ29yZTIxQmFja0ZvcndhcmRDb250cm9s bGVyMTFpdGVtQXRJbmRleEVpCitfX1pON1dlYkNvcmUyMUJhY2tGb3J3YXJkQ29udHJvbGxlcjZn b0JhY2tFdgorX19aTjdXZWJDb3JlMjFCYWNrRm9yd2FyZENvbnRyb2xsZXI5Z29Gb3J3YXJkRXYK IF9fWk43V2ViQ29yZTIxQ3Jvc3NUaHJlYWRDb3BpZXJCYXNlSUxiMEVMYjBFTjNXVEY2U3RyaW5n RUU0Y29weUVSS1MyXwogX19aTjdXZWJDb3JlMjFDcm9zc1RocmVhZENvcGllckJhc2VJTGIwRUxi MEVOU18xOUlEQkRhdGFiYXNlTWV0YWRhdGFFRTRjb3B5RVJLUzFfCiBfX1pON1dlYkNvcmUyMU1l bW9yeVByZXNzdXJlSGFuZGxlcjdpbnN0YWxsRXYKQEAgLTEwMTQsOSArMTAxNiw3IEBAIF9fWk43 V2ViQ29yZTRQYWdlMjBzY3JvbGxpbmdDb29yZGluYXRvckV2CiBfX1pON1dlYkNvcmU0UGFnZTM2 c2V0U2hvdWxkU3VwcHJlc3NTY3JvbGxiYXJBbmltYXRpb25zRWIKIF9fWk43V2ViQ29yZTRQYWdl MzZzdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnNFdgogX19aTjdXZWJDb3JlNFBh Z2UzN3NldEluTG93UXVhbGl0eUltYWdlSW50ZXJwb2xhdGlvbk1vZGVFYgotX19aTjdXZWJDb3Jl NFBhZ2U2Z29CYWNrRXYKIF9fWk43V2ViQ29yZTRQYWdlOGdvVG9JdGVtRVBOU18xMUhpc3RvcnlJ dGVtRU5TXzEzRnJhbWVMb2FkVHlwZUUKLV9fWk43V2ViQ29yZTRQYWdlOWdvRm9yd2FyZEV2CiBf X1pON1dlYkNvcmU0UGFnZTlpbml0R3JvdXBFdgogX19aTjdXZWJDb3JlNFBhZ2VDMUVSTlMwXzEx UGFnZUNsaWVudHNFCiBfX1pON1dlYkNvcmU0UGFnZUQxRXYKQEAgLTE2NTEsNiArMTY1MSw3IEBA IF9fWk5LN1dlYkNvcmUyMFJlc291cmNlUmVzcG9uc2VCYXNlNmlzSFRUUEV2CiBfX1pOSzdXZWJD b3JlMjBSZXNvdXJjZVJlc3BvbnNlQmFzZThtaW1lVHlwZUV2CiBfX1pOSzdXZWJDb3JlMjBUcmFu c2Zvcm1hdGlvbk1hdHJpeGN2MTNDQVRyYW5zZm9ybTNERXYKIF9fWk5LN1dlYkNvcmUyMUJhY2tG b3J3YXJkQ29udHJvbGxlcjEyZm9yd2FyZENvdW50RXYKK19fWk5LN1dlYkNvcmUyMUJhY2tGb3J3 YXJkQ29udHJvbGxlcjE4Y2FuR29CYWNrT3JGb3J3YXJkRWkKIF9fWk5LN1dlYkNvcmUyMUJhY2tG b3J3YXJkQ29udHJvbGxlcjliYWNrQ291bnRFdgogX19aTks3V2ViQ29yZTIxTmV0d29ya1N0b3Jh Z2VTZXNzaW9uMTNjb29raWVTdG9yYWdlRXYKIF9fWk5LN1dlYkNvcmUyMVJlbmRlckxheWVyQ29t cG9zaXRvcjExc2Nyb2xsTGF5ZXJFdgpAQCAtMTY5OCw3ICsxNjk5LDYgQEAgX19aTks3V2ViQ29y ZTRQYWdlMTBwbHVnaW5EYXRhRXYKIF9fWk5LN1dlYkNvcmU0UGFnZTE0cmVuZGVyVHJlZVNpemVF dgogX19aTks3V2ViQ29yZTRQYWdlMTV2aXNpYmlsaXR5U3RhdGVFdgogX19aTks3V2ViQ29yZTRQ YWdlMTZoYXNTZWVuQW55UGx1Z2luRXYKLV9fWk5LN1dlYkNvcmU0UGFnZTE3YmFja0ZvcndhcmRD bGllbnRFdgogX19aTks3V2ViQ29yZTRQYWdlMTd2aWV3cG9ydEFyZ3VtZW50c0V2CiBfX1pOSzdX ZWJDb3JlNFBhZ2UzNGluTG93UXVhbGl0eUltYWdlSW50ZXJwb2xhdGlvbk1vZGVFdgogX19aTks3 V2ViQ29yZTRQYWdlOWdyb3VwTmFtZUV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0 b3J5L0JhY2tGb3J3YXJkQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0Jh Y2tGb3J3YXJkQ29udHJvbGxlci5jcHAKaW5kZXggMDQxOTcwMGVlN2RlZTBmYmIxMzFiMjdhMDcy NjdiMjRlNTA1ZDM5Ni4uZDJlZjM5Y2RiYzg1ZTIwYTdiMzMxNzU5MWM1OGY5MDRlYWM0MTRmNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZENvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRDb250cm9sbGVyLmNw cApAQCAtNDYsMjIgKzQ2LDU1IEBAIEJhY2tGb3J3YXJkQ29udHJvbGxlcjo6fkJhY2tGb3J3YXJk Q29udHJvbGxlcigpCiAKIGJvb2wgQmFja0ZvcndhcmRDb250cm9sbGVyOjpjYW5Hb0JhY2tPckZv cndhcmQoaW50IGRpc3RhbmNlKSBjb25zdAogewotICAgIHJldHVybiBtX3BhZ2UuY2FuR29CYWNr T3JGb3J3YXJkKGRpc3RhbmNlKTsKKyAgICBpZiAoIWRpc3RhbmNlKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICBpZiAoZGlzdGFuY2UgPiAwICYmIGRpc3RhbmNlIDw9IGZvcndhcmRDb3VudCgp KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAoZGlzdGFuY2UgPCAwICYmIC1kaXN0YW5j ZSA8PSBiYWNrQ291bnQoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGZhbHNl OwogfQogCiB2b2lkIEJhY2tGb3J3YXJkQ29udHJvbGxlcjo6Z29CYWNrT3JGb3J3YXJkKGludCBk aXN0YW5jZSkKIHsKLSAgICBtX3BhZ2UuZ29CYWNrT3JGb3J3YXJkKGRpc3RhbmNlKTsKKyAgICBp ZiAoIWRpc3RhbmNlKQorICAgICAgICByZXR1cm47CisKKyAgICBIaXN0b3J5SXRlbSogaXRlbSA9 IGl0ZW1BdEluZGV4KGRpc3RhbmNlKTsKKyAgICBpZiAoIWl0ZW0pIHsKKyAgICAgICAgaWYgKGRp c3RhbmNlID4gMCkgeworICAgICAgICAgICAgaWYgKGludCBmb3J3YXJkQ291bnQgPSB0aGlzLT5m b3J3YXJkQ291bnQoKSkKKyAgICAgICAgICAgICAgICBpdGVtID0gaXRlbUF0SW5kZXgoZm9yd2Fy ZENvdW50KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChpbnQgYmFja0NvdW50 ID0gdGhpcy0+YmFja0NvdW50KCkpCisgICAgICAgICAgICAgICAgaXRlbSA9IGl0ZW1BdEluZGV4 KC1iYWNrQ291bnQpOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCFpdGVtKQorICAgICAg ICByZXR1cm47CisKKyAgICBtX3BhZ2UuZ29Ub0l0ZW0oaXRlbSwgRnJhbWVMb2FkVHlwZUluZGV4 ZWRCYWNrRm9yd2FyZCk7CiB9CiAKIGJvb2wgQmFja0ZvcndhcmRDb250cm9sbGVyOjpnb0JhY2so KQogewotICAgIHJldHVybiBtX3BhZ2UuZ29CYWNrKCk7CisgICAgSGlzdG9yeUl0ZW0qIGl0ZW0g PSBiYWNrSXRlbSgpOworICAgIGlmICghaXRlbSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgbV9wYWdlLmdvVG9JdGVtKGl0ZW0sIEZyYW1lTG9hZFR5cGVCYWNrKTsKKyAgICByZXR1cm4g dHJ1ZTsKIH0KIAogYm9vbCBCYWNrRm9yd2FyZENvbnRyb2xsZXI6OmdvRm9yd2FyZCgpCiB7Ci0g ICAgcmV0dXJuIG1fcGFnZS5nb0ZvcndhcmQoKTsKKyAgICBIaXN0b3J5SXRlbSogaXRlbSA9IGZv cndhcmRJdGVtKCk7CisgICAgaWYgKCFpdGVtKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBtX3BhZ2UuZ29Ub0l0ZW0oaXRlbSwgRnJhbWVMb2FkVHlwZUZvcndhcmQpOworICAgIHJldHVy biB0cnVlOwogfQogCiB2b2lkIEJhY2tGb3J3YXJkQ29udHJvbGxlcjo6YWRkSXRlbShQYXNzUmVm UHRyPEhpc3RvcnlJdGVtPiBpdGVtKQpAQCAtNzYsNyArMTA5LDcgQEAgdm9pZCBCYWNrRm9yd2Fy ZENvbnRyb2xsZXI6OnNldEN1cnJlbnRJdGVtKEhpc3RvcnlJdGVtKiBpdGVtKQogCiBpbnQgQmFj a0ZvcndhcmRDb250cm9sbGVyOjpjb3VudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fcGFnZS5n ZXRIaXN0b3J5TGVuZ3RoKCk7CisgICAgcmV0dXJuIG1fY2xpZW50LT5iYWNrTGlzdENvdW50KCkg KyAxICsgbV9jbGllbnQtPmZvcndhcmRMaXN0Q291bnQoKTsKIH0KIAogaW50IEJhY2tGb3J3YXJk Q29udHJvbGxlcjo6YmFja0NvdW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVy LmNwcAppbmRleCBkODhkMmJjNzgzOTgwYmNhMjZlOTU0N2QzNzg5NzU5MTYwNTdiMjFiLi4zMzhj M2U4NjVjMDE4ODhmMjIwOGJlMDY0NzM5MTVjYjVhNjkwZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJBWE9iamVjdENh Y2hlLmgiCiAjaW5jbHVkZSAiQXV0b3Njcm9sbENvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJCYWNr Rm9yd2FyZENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgogI2luY2x1ZGUg IkNocm9tZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgpAQCAtMzQyMiw5ICszNDIzLDkg QEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRCYWNrc3BhY2VFdmVudEhhbmRsZXIoS2V5Ym9h cmRFdmVudCogZXZlbnQpCiAgICAgYm9vbCBoYW5kbGVkRXZlbnQgPSBmYWxzZTsKIAogICAgIGlm IChldmVudC0+c2hpZnRLZXkoKSkKLSAgICAgICAgaGFuZGxlZEV2ZW50ID0gcGFnZS0+Z29Gb3J3 YXJkKCk7CisgICAgICAgIGhhbmRsZWRFdmVudCA9IHBhZ2UtPmJhY2tGb3J3YXJkKCkuZ29Gb3J3 YXJkKCk7CiAgICAgZWxzZQotICAgICAgICBoYW5kbGVkRXZlbnQgPSBwYWdlLT5nb0JhY2soKTsK KyAgICAgICAgaGFuZGxlZEV2ZW50ID0gcGFnZS0+YmFja0ZvcndhcmQoKS5nb0JhY2soKTsKIAog ICAgIGlmIChoYW5kbGVkRXZlbnQpCiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggNGRiMzc3YTgzYjQyNGI0YjIxYjI3OThhNmEyYWQyNWUw MzYxOGM4ZC4uZDQ2MzhlOWQwY2UzNTczNmRmMzcyYzM0ODIxNzFlNzZhOWI4Y2YyNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuY3BwCkBAIC0zNjEsNjYgKzM2MSw2IEBAIHZvaWQgUGFnZTo6c2V0T3BlbmVkQnlE T00oKQogICAgIG1fb3BlbmVkQnlET00gPSB0cnVlOwogfQogCi1CYWNrRm9yd2FyZENsaWVudCog UGFnZTo6YmFja0ZvcndhcmRDbGllbnQoKSBjb25zdAotewotICAgIHJldHVybiBiYWNrRm9yd2Fy ZCgpLmNsaWVudCgpOwotfQotCi1ib29sIFBhZ2U6OmdvQmFjaygpCi17Ci0gICAgSGlzdG9yeUl0 ZW0qIGl0ZW0gPSBiYWNrRm9yd2FyZCgpLmJhY2tJdGVtKCk7Ci0gICAgCi0gICAgaWYgKGl0ZW0p IHsKLSAgICAgICAgZ29Ub0l0ZW0oaXRlbSwgRnJhbWVMb2FkVHlwZUJhY2spOwotICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1ib29sIFBhZ2U6Omdv Rm9yd2FyZCgpCi17Ci0gICAgSGlzdG9yeUl0ZW0qIGl0ZW0gPSBiYWNrRm9yd2FyZCgpLmZvcndh cmRJdGVtKCk7Ci0gICAgCi0gICAgaWYgKGl0ZW0pIHsKLSAgICAgICAgZ29Ub0l0ZW0oaXRlbSwg RnJhbWVMb2FkVHlwZUZvcndhcmQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAg cmV0dXJuIGZhbHNlOwotfQotCi1ib29sIFBhZ2U6OmNhbkdvQmFja09yRm9yd2FyZChpbnQgZGlz dGFuY2UpIGNvbnN0Ci17Ci0gICAgaWYgKGRpc3RhbmNlID09IDApCi0gICAgICAgIHJldHVybiB0 cnVlOwotICAgIGlmIChkaXN0YW5jZSA+IDAgJiYgZGlzdGFuY2UgPD0gYmFja0ZvcndhcmQoKS5m b3J3YXJkQ291bnQoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgaWYgKGRpc3RhbmNlIDwg MCAmJiAtZGlzdGFuY2UgPD0gYmFja0ZvcndhcmQoKS5iYWNrQ291bnQoKSkKLSAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi12b2lkIFBhZ2U6OmdvQmFja09yRm9y d2FyZChpbnQgZGlzdGFuY2UpCi17Ci0gICAgaWYgKGRpc3RhbmNlID09IDApCi0gICAgICAgIHJl dHVybjsKLQotICAgIEhpc3RvcnlJdGVtKiBpdGVtID0gYmFja0ZvcndhcmQoKS5pdGVtQXRJbmRl eChkaXN0YW5jZSk7Ci0gICAgaWYgKCFpdGVtKSB7Ci0gICAgICAgIGlmIChkaXN0YW5jZSA+IDAp IHsKLSAgICAgICAgICAgIGlmIChpbnQgZm9yd2FyZENvdW50ID0gYmFja0ZvcndhcmQoKS5mb3J3 YXJkQ291bnQoKSkKLSAgICAgICAgICAgICAgICBpdGVtID0gYmFja0ZvcndhcmQoKS5pdGVtQXRJ bmRleChmb3J3YXJkQ291bnQpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKGlu dCBiYWNrQ291bnQgPSBiYWNrRm9yd2FyZCgpLmJhY2tDb3VudCgpKQotICAgICAgICAgICAgICAg IGl0ZW0gPSBiYWNrRm9yd2FyZCgpLml0ZW1BdEluZGV4KC1iYWNrQ291bnQpOwotICAgICAgICB9 Ci0gICAgfQotCi0gICAgaWYgKCFpdGVtKQotICAgICAgICByZXR1cm47Ci0KLSAgICBnb1RvSXRl bShpdGVtLCBGcmFtZUxvYWRUeXBlSW5kZXhlZEJhY2tGb3J3YXJkKTsKLX0KLQogdm9pZCBQYWdl Ojpnb1RvSXRlbShIaXN0b3J5SXRlbSogaXRlbSwgRnJhbWVMb2FkVHlwZSB0eXBlKQogewogICAg IC8vIHN0b3BBbGxMb2FkZXJzIG1heSBlbmQgdXAgcnVubmluZyBvbmxvYWQgaGFuZGxlcnMsIHdo aWNoIGNvdWxkIGNhdXNlIGZ1cnRoZXIgaGlzdG9yeSB0cmF2ZXJzYWxzIHRoYXQgbWF5IGxlYWQg dG8gdGhlIHBhc3NlZCBpbiBIaXN0b3J5SXRlbQpAQCAtNDMzLDExICszNzMsNiBAQCB2b2lkIFBh Z2U6OmdvVG9JdGVtKEhpc3RvcnlJdGVtKiBpdGVtLCBGcmFtZUxvYWRUeXBlIHR5cGUpCiAgICAg bV9tYWluRnJhbWUtPmxvYWRlcigpLmhpc3RvcnkoKS5nb1RvSXRlbShpdGVtLCB0eXBlKTsKIH0K IAotaW50IFBhZ2U6OmdldEhpc3RvcnlMZW5ndGgoKQotewotICAgIHJldHVybiBiYWNrRm9yd2Fy ZCgpLmJhY2tDb3VudCgpICsgMSArIGJhY2tGb3J3YXJkKCkuZm9yd2FyZENvdW50KCk7Ci19Ci0K IHZvaWQgUGFnZTo6c2V0R3JvdXBOYW1lKGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKICAgICBpZiAo bV9ncm91cCAmJiAhbV9ncm91cC0+bmFtZSgpLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRl eCBiMjA4MGQ2ZTE0YWQ1MDVkZWRhOWM0NmIwYWY0OWRlNjg3Y2NlYWQ2Li5mMGIzMzE3Mzc2NzU4 MDY3OTVhZGJiZDU3NDdhYTQzMmZlNDNmNjE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMTY3LDE0ICsx NjcsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBvcGVuZWRCeURPTSgpIGNvbnN0OwogICAgIHZvaWQg c2V0T3BlbmVkQnlET00oKTsKIAotICAgIC8vIERFUFJFQ0FURUQuIFVzZSBiYWNrRm9yd2FyZCgp IGluc3RlYWQgb2YgdGhlIGZvbGxvd2luZyA2IGZ1bmN0aW9ucy4KLSAgICBCYWNrRm9yd2FyZENs aWVudCogYmFja0ZvcndhcmRDbGllbnQoKSBjb25zdDsKLSAgICBib29sIGdvQmFjaygpOwotICAg IGJvb2wgZ29Gb3J3YXJkKCk7Ci0gICAgYm9vbCBjYW5Hb0JhY2tPckZvcndhcmQoaW50IGRpc3Rh bmNlKSBjb25zdDsKLSAgICB2b2lkIGdvQmFja09yRm9yd2FyZChpbnQgZGlzdGFuY2UpOwotICAg IGludCBnZXRIaXN0b3J5TGVuZ3RoKCk7Ci0KICAgICB2b2lkIGdvVG9JdGVtKEhpc3RvcnlJdGVt KiwgRnJhbWVMb2FkVHlwZSk7CiAKICAgICB2b2lkIHNldEdyb3VwTmFtZShjb25zdCBTdHJpbmcm KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXggYzdhZTRmYzBjZWRmODhjZTVh YTI4NjYzNTI5MTdmYzdhZjljMDVjNC4uNThlNjhlNTU1Zjk5ZGJiNTdjYWY4NGY5MGY4MDVkZWE1 NDFjM2ExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTI0LDYgKzI0LDcg QEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJld2tfZnJhbWUuaCIKIAorI2luY2x1 ZGUgIkJhY2tGb3J3YXJkQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgi CiAjaW5jbHVkZSAiRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRWRpdG9y LmgiCkBAIC02MTMsOSArNjE0LDkgQEAgRWluYV9Cb29sIGV3a19mcmFtZV9uYXZpZ2F0ZShFdmFz X09iamVjdCogZXdrRnJhbWUsIGludCBzdGVwcykKICAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JF VFVSTihld2tGcmFtZSwgc21hcnREYXRhLCBmYWxzZSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk5fVkFMKHNtYXJ0RGF0YS0+ZnJhbWUsIGZhbHNlKTsKICAgICBXZWJDb3JlOjpQYWdl KiBwYWdlID0gc21hcnREYXRhLT5mcmFtZS0+cGFnZSgpOwotICAgIGlmICghcGFnZS0+Y2FuR29C YWNrT3JGb3J3YXJkKHN0ZXBzKSkKKyAgICBpZiAoIXBhZ2UtPmJhY2tGb3J3YXJkKCkuY2FuR29C YWNrT3JGb3J3YXJkKHN0ZXBzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhZ2UtPmdv QmFja09yRm9yd2FyZChzdGVwcyk7CisgICAgcGFnZS0+YmFja0ZvcndhcmQoKS5nb0JhY2tPckZv cndhcmQoc3RlcHMpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC02MzQsNyArNjM1LDcgQEAg RWluYV9Cb29sIGV3a19mcmFtZV9uYXZpZ2F0ZV9wb3NzaWJsZShFdmFzX09iamVjdCogZXdrRnJh bWUsIGludCBzdGVwcykKICAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihld2tGcmFtZSwg c21hcnREYXRhLCBmYWxzZSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNt YXJ0RGF0YS0+ZnJhbWUsIGZhbHNlKTsKICAgICBXZWJDb3JlOjpQYWdlKiBwYWdlID0gc21hcnRE YXRhLT5mcmFtZS0+cGFnZSgpOwotICAgIHJldHVybiBwYWdlLT5jYW5Hb0JhY2tPckZvcndhcmQo c3RlcHMpOworICAgIHJldHVybiBwYWdlLT5iYWNrRm9yd2FyZCgpLmNhbkdvQmFja09yRm9yd2Fy ZChzdGVwcyk7CiB9CiAKIGZsb2F0IGV3a19mcmFtZV9wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNf T2JqZWN0KiBld2tGcmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAppbmRleCBlYWRhYjA1NGE5ZmNlODZjNzI2ODEzY2RlMjAyMzcyMGE4MjI1NzBiLi44ZTJj NDViMWY3NmRkMTMyMGIzNTk4MjQyMDZiMTYxNTQ3MGZiNTlmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0zNCw2ICszNCw3IEBACiAKICNpbmNsdWRl ICJBWE9iamVjdENhY2hlLmgiCiAjaW5jbHVkZSAiQXJjaGl2ZVJlc291cmNlLmgiCisjaW5jbHVk ZSAiQmFja0ZvcndhcmRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiQmFja0ZvcndhcmRMaXN0Lmgi CiAjaW5jbHVkZSAiQmF0dGVyeUNsaWVudEd0ay5oIgogI2luY2x1ZGUgIkNhaXJvVXRpbGl0aWVz LmgiCkBAIC00MTAwLDcgKzQxMDEsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfbWFpbnRh aW5zX2JhY2tfZm9yd2FyZF9saXN0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdibwogewogICAg IGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKIAotICAgIHN0 YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlzdCo+KGNvcmUod2ViVmlldyktPmJhY2tGb3J3YXJkQ2xp ZW50KCkpLT5zZXRFbmFibGVkKGZsYWcpOworICAgIHN0YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlz dCo+KGNvcmUod2ViVmlldyktPmJhY2tGb3J3YXJkKCkuY2xpZW50KCkpLT5zZXRFbmFibGVkKGZs YWcpOwogfQogCiAvKioKQEAgLTQxMTUsNyArNDExNiw3IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3 X3NldF9tYWludGFpbnNfYmFja19mb3J3YXJkX2xpc3QoV2ViS2l0V2ViVmlldyogd2ViVmlldywg Z2JvCiBXZWJLaXRXZWJCYWNrRm9yd2FyZExpc3QqIHdlYmtpdF93ZWJfdmlld19nZXRfYmFja19m b3J3YXJkX2xpc3QoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKICAgICBnX3JldHVybl92YWxf aWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIDApOwotICAgIGlmICghY29yZSh3 ZWJWaWV3KSB8fCAhc3RhdGljX2Nhc3Q8QmFja0ZvcndhcmRMaXN0Kj4oY29yZSh3ZWJWaWV3KS0+ YmFja0ZvcndhcmRDbGllbnQoKSktPmVuYWJsZWQoKSkKKyAgICBpZiAoIWNvcmUod2ViVmlldykg fHwgIXN0YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlzdCo+KGNvcmUod2ViVmlldyktPmJhY2tGb3J3 YXJkKCkuY2xpZW50KCkpLT5lbmFibGVkKCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIHJldHVy biB3ZWJWaWV3LT5wcml2LT5iYWNrRm9yd2FyZExpc3QuZ2V0KCk7CiB9CkBAIC00MTUyLDcgKzQx NTMsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19nb19iYWNrKFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykp OwogCi0gICAgY29yZSh3ZWJWaWV3KS0+Z29CYWNrKCk7CisgICAgY29yZSh3ZWJWaWV3KS0+YmFj a0ZvcndhcmQoKS5nb0JhY2soKTsKIH0KIAogLyoqCkBAIC00MTY4LDcgKzQxNjksNyBAQCB2b2lk IHdlYmtpdF93ZWJfdmlld19nb19iYWNrX29yX2ZvcndhcmQoV2ViS2l0V2ViVmlldyogd2ViVmll dywgZ2ludCBzdGVwcykKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklF Vyh3ZWJWaWV3KSk7CiAKLSAgICBjb3JlKHdlYlZpZXcpLT5nb0JhY2tPckZvcndhcmQoc3RlcHMp OworICAgIGNvcmUod2ViVmlldyktPmJhY2tGb3J3YXJkKCkuZ29CYWNrT3JGb3J3YXJkKHN0ZXBz KTsKIH0KIAogLyoqCkBAIC00MTgxLDcgKzQxODIsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19n b19mb3J3YXJkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFp bChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwogCi0gICAgY29yZSh3ZWJWaWV3KS0+Z29G b3J3YXJkKCk7CisgICAgY29yZSh3ZWJWaWV3KS0+YmFja0ZvcndhcmQoKS5nb0ZvcndhcmQoKTsK IH0KIAogLyoqCkBAIC00MjE3LDcgKzQyMTgsNyBAQCBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdf Y2FuX2dvX2JhY2tfb3JfZm9yd2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnaW50IHN0ZQog ewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwg RkFMU0UpOwogCi0gICAgcmV0dXJuIGNvcmUod2ViVmlldyktPmNhbkdvQmFja09yRm9yd2FyZChz dGVwcyk7CisgICAgcmV0dXJuIGNvcmUod2ViVmlldyktPmJhY2tGb3J3YXJkKCkuY2FuR29CYWNr T3JGb3J3YXJkKHN0ZXBzKTsKIH0KIAogLyoqCkBAIC00MjM3LDcgKzQyMzgsNyBAQCBnYm9vbGVh biB3ZWJraXRfd2ViX3ZpZXdfY2FuX2dvX2ZvcndhcmQoV2ViS2l0V2ViVmlldyogd2ViVmlldykK ICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybiBGQUxTRTsKIAotICAgIGlmICghcGFnZS0+ YmFja0ZvcndhcmRDbGllbnQoKS0+Zm9yd2FyZEl0ZW0oKSkKKyAgICBpZiAoIXBhZ2UtPmJhY2tG b3J3YXJkKCkuZm9yd2FyZEl0ZW0oKSkKICAgICAgICAgcmV0dXJuIEZBTFNFOwogCiAgICAgcmV0 dXJuIFRSVUU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1l Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tCmluZGV4 IDdhNTQ4ODM5MDkyMTcwZjQ1M2UyOWM2YzNjNzBiZTIwYWJhOTkwNTguLjBlZWQ5NjYzNGIyOTQx MTZhNjliM2I5MDIyMGRlY2E1NzM5MjdjZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViRnJhbWVWaWV3Lm1tCkBAIC01Miw2ICs1Miw3IEBACiAjaW1wb3J0ICJXZWJWaWV3SW50ZXJu YWwuaCIKICNpbXBvcnQgIldlYlZpZXdQcml2YXRlLmgiCiAjaW1wb3J0IDxGb3VuZGF0aW9uL05T VVJMUmVxdWVzdC5oPgorI2ltcG9ydCA8V2ViQ29yZS9CYWNrRm9yd2FyZENvbnRyb2xsZXIuaD4K ICNpbXBvcnQgPFdlYkNvcmUvQmFja0ZvcndhcmRMaXN0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Ry YWdDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0V2ZW50SGFuZGxlci5oPgpAQCAtOTI2 LDcgKzkyNyw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBlc0Zyb21DbGFzcyhOU011dGFi bGVEaWN0aW9uYXJ5ICphbGxUeXBlcywgQ2xhc3Mgb2JqQ0NsCiAgICAgaW50IGluZGV4LCBjb3Vu dDsKICAgICBCT09MIGNhbGxTdXBlciA9IFlFUzsKICAgICBGcmFtZSogY29yZUZyYW1lID0gW3Nl bGYgX3dlYl9mcmFtZV07Ci0gICAgQk9PTCBtYWludGFpbnNCYWNrRm9yd2FyZExpc3QgPSBjb3Jl RnJhbWUgJiYgc3RhdGljX2Nhc3Q8QmFja0ZvcndhcmRMaXN0Kj4oY29yZUZyYW1lLT5wYWdlKCkt PmJhY2tGb3J3YXJkQ2xpZW50KCkpLT5lbmFibGVkKCkgPyBZRVMgOiBOTzsKKyAgICBCT09MIG1h aW50YWluc0JhY2tGb3J3YXJkTGlzdCA9IGNvcmVGcmFtZSAmJiBzdGF0aWNfY2FzdDxCYWNrRm9y d2FyZExpc3QqPihjb3JlRnJhbWUtPnBhZ2UoKS0+YmFja0ZvcndhcmQoKS5jbGllbnQoKSktPmVu YWJsZWQoKSA/IFlFUyA6IE5POwogICAgIAogICAgIGNvdW50ID0gW2NoYXJhY3RlcnMgbGVuZ3Ro XTsKICAgICBmb3IgKGluZGV4ID0gMDsgaW5kZXggPCBjb3VudDsgKytpbmRleCkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDRjMGU3MWYzZDYxYTJmMmU3YjZjMzJkZjFl ZjM2YTgzZDFkOWU5OTIuLmMwODJmOTJmN2VkMDhhNWRkNzYxZmQ2ODdhYzUyNTdhODk3YTI0NTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE5OTMsMTAgKzE5OTMsMTAg QEAgc3RhdGljIGJvb2wgZmFzdERvY3VtZW50VGVhcmRvd25FbmFibGVkKCkKICAgICAvLyB0eXBl LiAgKFNlZSBiZWhhdmlvciBtYXRyaXggYXQgdGhlIHRvcCBvZiBXZWJGcmFtZVByaXZhdGUuKSAg U28gd2UgY29weSBhbGwgdGhlIGl0ZW1zCiAgICAgLy8gaW4gdGhlIGJhY2sgZm9yd2FyZCBsaXN0 LCBhbmQgZ28gdG8gdGhlIGN1cnJlbnQgb25lLgogCi0gICAgQmFja0ZvcndhcmRDbGllbnQqIGJh Y2tGb3J3YXJkQ2xpZW50ID0gX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkQ2xpZW50KCk7Cisg ICAgQmFja0ZvcndhcmRDbGllbnQqIGJhY2tGb3J3YXJkQ2xpZW50ID0gX3ByaXZhdGUtPnBhZ2Ut PmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7CiAgICAgQVNTRVJUKCFiYWNrRm9yd2FyZENsaWVudC0+ Y3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9uIGxpc3Qgc2hvdWxkIGJlIGVtcHR5CiAKLSAg ICBCYWNrRm9yd2FyZENsaWVudCogb3RoZXJCYWNrRm9yd2FyZENsaWVudCA9IG90aGVyVmlldy0+ X3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkQ2xpZW50KCk7CisgICAgQmFja0ZvcndhcmRDbGll bnQqIG90aGVyQmFja0ZvcndhcmRDbGllbnQgPSBvdGhlclZpZXctPl9wcml2YXRlLT5wYWdlLT5i YWNrRm9yd2FyZCgpLmNsaWVudCgpOwogICAgIGlmICghb3RoZXJCYWNrRm9yd2FyZENsaWVudC0+ Y3VycmVudEl0ZW0oKSkKICAgICAgICAgcmV0dXJuOyAvLyBlbXB0eSBiYWNrIGZvcndhcmQgbGlz dCwgYmFpbAogICAgIApAQCAtNTEzMSw3ICs1MTMxLDcgQEAgc3RhdGljIGJvb2wgbmVlZHNXZWJW aWV3SW5pdFRocmVhZFdvcmthcm91bmQoKQogCiAgICAgICAgIExPRyhFbmNvZGluZywgIkZyYW1l TmFtZSA9ICVALCBHcm91cE5hbWUgPSAlQCwgdXNlQmFja0ZvcndhcmRMaXN0ID0gJWRcbiIsIGZy YW1lTmFtZSwgZ3JvdXBOYW1lLCAoaW50KXVzZUJhY2tGb3J3YXJkTGlzdCk7CiAgICAgICAgIFty ZXN1bHQgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTpmcmFtZU5hbWUgZ3JvdXBO YW1lOmdyb3VwTmFtZV07Ci0gICAgICAgIHN0YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlzdCo+KFty ZXN1bHQgcGFnZV0tPmJhY2tGb3J3YXJkQ2xpZW50KCkpLT5zZXRFbmFibGVkKHVzZUJhY2tGb3J3 YXJkTGlzdCk7CisgICAgICAgIHN0YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlzdCo+KFtyZXN1bHQg cGFnZV0tPmJhY2tGb3J3YXJkKCkuY2xpZW50KCkpLT5zZXRFbmFibGVkKHVzZUJhY2tGb3J3YXJk TGlzdCk7CiAgICAgICAgIHJlc3VsdC0+X3ByaXZhdGUtPmFsbG93c1VuZG8gPSBhbGxvd3NVbmRv OwogICAgICAgICBpZiAocHJlZmVyZW5jZXMpCiAgICAgICAgICAgICBbcmVzdWx0IHNldFByZWZl cmVuY2VzOnByZWZlcmVuY2VzXTsKQEAgLTUxNTUsNyArNTE1NSw3IEBAIHN0YXRpYyBib29sIG5l ZWRzV2ViVmlld0luaXRUaHJlYWRXb3JrYXJvdW5kKCkKICAgICAvLyBSZXN0b3JlIHRoZSBzdWJ2 aWV3cyB3ZSBzZXQgYXNpZGUuCiAgICAgX3N1YnZpZXdzID0gb3JpZ2luYWxTdWJ2aWV3czsKIAot ICAgIEJPT0wgdXNlQmFja0ZvcndhcmRMaXN0ID0gX3ByaXZhdGUtPnBhZ2UgJiYgc3RhdGljX2Nh c3Q8QmFja0ZvcndhcmRMaXN0Kj4oX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkQ2xpZW50KCkp LT5lbmFibGVkKCk7CisgICAgQk9PTCB1c2VCYWNrRm9yd2FyZExpc3QgPSBfcHJpdmF0ZS0+cGFn ZSAmJiBzdGF0aWNfY2FzdDxCYWNrRm9yd2FyZExpc3QqPihfcHJpdmF0ZS0+cGFnZS0+YmFja0Zv cndhcmQoKS5jbGllbnQoKSktPmVuYWJsZWQoKTsKICAgICBpZiAoW2VuY29kZXIgYWxsb3dzS2V5 ZWRDb2RpbmddKSB7CiAgICAgICAgIFtlbmNvZGVyIGVuY29kZU9iamVjdDpbW3NlbGYgbWFpbkZy YW1lXSBuYW1lXSBmb3JLZXk6QCJGcmFtZU5hbWUiXTsKICAgICAgICAgW2VuY29kZXIgZW5jb2Rl T2JqZWN0OltzZWxmIGdyb3VwTmFtZV0gZm9yS2V5OkAiR3JvdXBOYW1lIl07CkBAIC01NjE3LDcg KzU2MTcsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBiYWNraW5nUHJvcGVydHlPbGRTY2Fs ZUZhY3RvcktleSA9IEAiTlNCYWNraW5nUHJvcGVydHlPbAogewogICAgIGlmICghX3ByaXZhdGUt PnBhZ2UpCiAgICAgICAgIHJldHVybiBuaWw7Ci0gICAgQmFja0ZvcndhcmRMaXN0KiBsaXN0ID0g c3RhdGljX2Nhc3Q8QmFja0ZvcndhcmRMaXN0Kj4oX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJk Q2xpZW50KCkpOworICAgIEJhY2tGb3J3YXJkTGlzdCogbGlzdCA9IHN0YXRpY19jYXN0PEJhY2tG b3J3YXJkTGlzdCo+KF9wcml2YXRlLT5wYWdlLT5iYWNrRm9yd2FyZCgpLmNsaWVudCgpKTsKICAg ICBpZiAoIWxpc3QtPmVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICByZXR1cm4g a2l0KGxpc3QpOwpAQCAtNTYyNyw3ICs1NjI3LDcgQEAgc3RhdGljIE5TU3RyaW5nICogY29uc3Qg YmFja2luZ1Byb3BlcnR5T2xkU2NhbGVGYWN0b3JLZXkgPSBAIk5TQmFja2luZ1Byb3BlcnR5T2wK IHsKICAgICBpZiAoIV9wcml2YXRlLT5wYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgc3RhdGlj X2Nhc3Q8QmFja0ZvcndhcmRMaXN0Kj4oX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkQ2xpZW50 KCkpLT5zZXRFbmFibGVkKGZsYWcpOworICAgIHN0YXRpY19jYXN0PEJhY2tGb3J3YXJkTGlzdCo+ KF9wcml2YXRlLT5wYWdlLT5iYWNrRm9yd2FyZCgpLmNsaWVudCgpKS0+c2V0RW5hYmxlZChmbGFn KTsKIH0KIAogLSAoQk9PTClnb0JhY2sKQEAgLTU2MzgsMTAgKzU2MzgsMTAgQEAgc3RhdGljIE5T U3RyaW5nICogY29uc3QgYmFja2luZ1Byb3BlcnR5T2xkU2NhbGVGYWN0b3JLZXkgPSBAIk5TQmFj a2luZ1Byb3BlcnR5T2wKICNpZiBQTEFURk9STShJT1MpCiAgICAgaWYgKFdlYlRocmVhZElzQ3Vy cmVudCgpIHx8ICFXZWJUaHJlYWRJc0VuYWJsZWQoKSkKICNlbmRpZgotICAgIHJldHVybiBfcHJp dmF0ZS0+cGFnZS0+Z29CYWNrKCk7CisgICAgcmV0dXJuIF9wcml2YXRlLT5wYWdlLT5iYWNrRm9y d2FyZCgpLmdvQmFjaygpOwogI2lmIFBMQVRGT1JNKElPUykKICAgICBXZWJUaHJlYWRSdW4oXnsK LSAgICAgICAgX3ByaXZhdGUtPnBhZ2UtPmdvQmFjaygpOworICAgICAgICBfcHJpdmF0ZS0+cGFn ZS0+YmFja0ZvcndhcmQoKS5nb0JhY2soKTsKICAgICB9KTsKICAgICAvLyBGSVhNRTogPHJkYXI6 Ly9wcm9ibGVtLzkxNTc1NzI+IC1bV2ViVmlldyBnb0JhY2tdIGFuZCAtZ29Gb3J3YXJkIGFsd2F5 cyByZXR1cm4gWUVTIHdoZW4gY2FsbGVkIGZyb20gdGhlIG1haW4gdGhyZWFkCiAgICAgcmV0dXJu IFlFUzsKQEAgLTU2NTYsMTAgKzU2NTYsMTAgQEAgc3RhdGljIE5TU3RyaW5nICogY29uc3QgYmFj a2luZ1Byb3BlcnR5T2xkU2NhbGVGYWN0b3JLZXkgPSBAIk5TQmFja2luZ1Byb3BlcnR5T2wKICNp ZiBQTEFURk9STShJT1MpCiAgICAgaWYgKFdlYlRocmVhZElzQ3VycmVudCgpIHx8ICFXZWJUaHJl YWRJc0VuYWJsZWQoKSkKICNlbmRpZgotICAgIHJldHVybiBfcHJpdmF0ZS0+cGFnZS0+Z29Gb3J3 YXJkKCk7CisgICAgcmV0dXJuIF9wcml2YXRlLT5wYWdlLT5iYWNrRm9yd2FyZCgpLmdvRm9yd2Fy ZCgpOwogI2lmIFBMQVRGT1JNKElPUykKICAgICBXZWJUaHJlYWRSdW4oXnsKLSAgICAgICAgX3By aXZhdGUtPnBhZ2UtPmdvRm9yd2FyZCgpOworICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+YmFja0Zv cndhcmQoKS5nb0ZvcndhcmQoKTsKICAgICB9KTsKICAgICAvLyBGSVhNRTogPHJkYXI6Ly9wcm9i bGVtLzkxNTc1NzI+IC1bV2ViVmlldyBnb0JhY2tdIGFuZCAtZ29Gb3J3YXJkIGFsd2F5cyByZXR1 cm4gWUVTIHdoZW4gY2FsbGVkIGZyb20gdGhlIG1haW4gdGhyZWFkCiAgICAgcmV0dXJuIFlFUzsK QEAgLTYzODEsNyArNjM4MSw3IEBAIHN0YXRpYyBXZWJGcmFtZSAqaW5jcmVtZW50RnJhbWUoV2Vi RnJhbWUgKmZyYW1lLCBXZWJGaW5kT3B0aW9ucyBvcHRpb25zID0gMCkKICNlbmRpZgogICAgICAg ICByZXR1cm4gTk87CiAKLSAgICByZXR1cm4gISFfcHJpdmF0ZS0+cGFnZS0+YmFja0ZvcndhcmRD bGllbnQoKS0+YmFja0l0ZW0oKTsKKyAgICByZXR1cm4gX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3 YXJkKCkuY2FuR29CYWNrT3JGb3J3YXJkKC0xKTsKIH0KIAogLSAoQk9PTCljYW5Hb0ZvcndhcmQK QEAgLTYzOTQsNyArNjM5NCw3IEBAIHN0YXRpYyBXZWJGcmFtZSAqaW5jcmVtZW50RnJhbWUoV2Vi RnJhbWUgKmZyYW1lLCBXZWJGaW5kT3B0aW9ucyBvcHRpb25zID0gMCkKICNlbmRpZgogICAgICAg ICByZXR1cm4gTk87CiAKLSAgICByZXR1cm4gISFfcHJpdmF0ZS0+cGFnZS0+YmFja0ZvcndhcmRD bGllbnQoKS0+Zm9yd2FyZEl0ZW0oKTsKKyAgICByZXR1cm4gISFfcHJpdmF0ZS0+cGFnZS0+YmFj a0ZvcndhcmQoKS5jYW5Hb0JhY2tPckZvcndhcmQoMSk7CiB9CiAKIC0gKElCQWN0aW9uKWdvQmFj azooaWQpc2VuZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBi L1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGE5OTUzOWI0Mzk1ZGQ0YjYzOGJi Y2Q3ZDU0NGQ2MjA1MGViNzJlNmYuLmFjMmIxZGZiNTAyZWRiMWZjMWRmMjRkZjZlNDJkZTAwODc4 YTE1M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC03Miw2ICs3Miw3IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9BWE9iamVjdENhY2hlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9BcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQlN0cmluZy5oPgorI2luY2x1ZGUgPFdl YkNvcmUvQmFja0ZvcndhcmRDb250cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9CYWNrRm9y d2FyZExpc3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0JpdG1hcEluZm8uaD4KICNpbmNsdWRlIDxX ZWJDb3JlL0Nocm9tZS5oPgpAQCAtMjA2Nyw5ICsyMDY4LDkgQEAgYm9vbCBXZWJWaWV3OjprZXlE b3duKFdQQVJBTSB2aXJ0dWFsS2V5Q29kZSwgTFBBUkFNIGtleURhdGEsIGJvb2wgc3lzdGVtS2V5 RG93bikKICAgICAvLyBGSVhNRTogVGhpcyBsb2dpYyBzaG91bGQgcHJvYmFibHkgYmUgaW4gRXZl bnRIYW5kbGVyOjpkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoKS4KICAgICAvLyBGSVhNRTogU2hv dWxkIGNoZWNrIHRoYXQgb3RoZXIgbW9kaWZpZXJzIGFyZW4ndCBwcmVzc2VkLgogICAgIGlmICh2 aXJ0dWFsS2V5Q29kZSA9PSBWS19SSUdIVCAmJiBrZXlFdmVudC5jdHJsS2V5KCkpCi0gICAgICAg IHJldHVybiBtX3BhZ2UtPmdvRm9yd2FyZCgpOworICAgICAgICByZXR1cm4gbV9wYWdlLT5iYWNr Rm9yd2FyZCgpLmdvRm9yd2FyZCgpOwogICAgIGlmICh2aXJ0dWFsS2V5Q29kZSA9PSBWS19MRUZU ICYmIGtleUV2ZW50LmN0cmxLZXkoKSkKLSAgICAgICAgcmV0dXJuIG1fcGFnZS0+Z29CYWNrKCk7 CisgICAgICAgIHJldHVybiBtX3BhZ2UtPmJhY2tGb3J3YXJkKCkuZ29CYWNrKCk7CiAKICAgICAv LyBOZWVkIHRvIHNjcm9sbCB0aGUgcGFnZSBpZiB0aGUgYXJyb3cga2V5cywgcGd1cC9kbiwgb3Ig aG9tZS9lbmQgYXJlIGhpdC4KICAgICBTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uOwpAQCAtMzA5 OSwxNCArMzEwMCwxNCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OnNldE1h aW50YWluc0JhY2tGb3J3YXJkTGlzdCgKIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmll dzo6Z29CYWNrKCAKICAgICAvKiBbcmV0dmFsXVtvdXRdICovIEJPT0wqIHN1Y2NlZWRlZCkKIHsK LSAgICAqc3VjY2VlZGVkID0gbV9wYWdlLT5nb0JhY2soKTsKKyAgICAqc3VjY2VlZGVkID0gbV9w YWdlLT5iYWNrRm9yd2FyZCgpLmdvQmFjaygpOwogICAgIHJldHVybiBTX09LOwogfQogCiBIUkVT VUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OmdvRm9yd2FyZCggCiAgICAgLyogW3JldHZh bF1bb3V0XSAqLyBCT09MKiBzdWNjZWVkZWQpCiB7Ci0gICAgKnN1Y2NlZWRlZCA9IG1fcGFnZS0+ Z29Gb3J3YXJkKCk7CisgICAgKnN1Y2NlZWRlZCA9IG1fcGFnZS0+YmFja0ZvcndhcmQoKS5nb0Zv cndhcmQoKTsKICAgICByZXR1cm4gU19PSzsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IDBiNTRhMDY2OGZlODNk NjBkNzJkZDU3OTkxMzU1ODc4ZTNhMzNmZDkuLmU0NGZjNzNlODZkZTM0OTVhNWNkY2FhNTg3NmJj ZDI3ZjQ3NjI0YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTQ2LDYgKzQ2LDcgQEAKICNpbXBvcnQgPFBERktpdC9Q REZLaXQuaD4KICNpbXBvcnQgPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9BWE9iamVjdENhY2hlLmg+CisjaW1wb3J0IDxXZWJDb3JlL0JhY2tGb3J3YXJkQ29udHJv bGxlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9FdmVudEhhbmRsZXIuaD4KICNpbXBvcnQgPFdlYkNv cmUvRm9jdXNDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lTG9hZGVyLmg+CkBA IC02MzcsMTMgKzYzOCwxMyBAQCBib29sIFdlYlBhZ2U6OnBlcmZvcm1Ob25FZGl0aW5nQmVoYXZp b3JGb3JTZWxlY3Rvcihjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBLZXlibwogICAgIGVsc2UgaWYg KHNlbGVjdG9yID09ICJtb3ZlV29yZExlZnQ6IikKICAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiA9 IHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExlZnQsIFNjcm9sbEJ5UGFnZSk7CiAgICAgZWxz ZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVUb0xlZnRFbmRPZkxpbmU6IikKLSAgICAgICAgZGlkUGVy Zm9ybUFjdGlvbiA9IG1fcGFnZS0+Z29CYWNrKCk7CisgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24g PSBtX3BhZ2UtPmJhY2tGb3J3YXJkKCkuZ29CYWNrKCk7CiAgICAgZWxzZSBpZiAoc2VsZWN0b3Ig PT0gIm1vdmVSaWdodDoiKQogICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFn ZS5nZXQoKSwgU2Nyb2xsUmlnaHQsIFNjcm9sbEJ5TGluZSk7CiAgICAgZWxzZSBpZiAoc2VsZWN0 b3IgPT0gIm1vdmVXb3JkUmlnaHQ6IikKICAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiA9IHNjcm9s bChtX3BhZ2UuZ2V0KCksIFNjcm9sbFJpZ2h0LCBTY3JvbGxCeVBhZ2UpOwogICAgIGVsc2UgaWYg KHNlbGVjdG9yID09ICJtb3ZlVG9SaWdodEVuZE9mTGluZToiKQotICAgICAgICBkaWRQZXJmb3Jt QWN0aW9uID0gbV9wYWdlLT5nb0ZvcndhcmQoKTsKKyAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiA9 IG1fcGFnZS0+YmFja0ZvcndhcmQoKS5nb0ZvcndhcmQoKTsKIAogICAgIHJldHVybiBkaWRQZXJm b3JtQWN0aW9uOwogfQo=