217391 2020-10-06 09:58:26 -0700 Rename namespace Packed to namespace PackedColor 2020-10-07 19:05:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard rniwa simon.fraser webkit-bug-importer oldest_to_newest 1695190 0 achristensen 2020-10-06 09:58:26 -0700 Rename namespace Packed to namespace PackedColor 1695191 1 410651 achristensen 2020-10-06 09:59:30 -0700 Created attachment 410651 Patch 1695200 2 410653 achristensen 2020-10-06 10:18:44 -0700 Created attachment 410653 Patch 1695270 3 achristensen 2020-10-06 12:36:15 -0700 http://trac.webkit.org/r268064 1695272 4 webkit-bug-importer 2020-10-06 12:37:19 -0700 <rdar://problem/70011838> 1695780 5 rniwa 2020-10-07 19:05:14 -0700 Very nice! I saw this yesterday and wanted to do the rename myself! 410651 2020-10-06 09:59:30 -0700 2020-10-06 10:57:39 -0700 Patch bug-217391-20201006095929.patch text/plain 11533 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwZmI5MWY1NGVmOTg0 YjAzY2E1MjYzZWZiYzkxYWFhODkzYjEwZi4uNWE5MzYxM2IwOTAzNmYwMTBlNmVmY2NlMDc5N2Jm YmU3ZGU4ZDFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTEwLTA2ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuYW1l IG5hbWVzcGFjZSBQYWNrZWQgdG8gbmFtZXNwYWNlIFBhY2tlZENvbG9yCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczOTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdGhlcndpc2UgInVzaW5nIFdURjo6 UGFja2VkOyIgaW4gd3RmL1BhY2tlZC5oIGNhdXNlcyBwcm9ibGVtcyBpZiBib3RoIGhlYWRlcnMg YXJlIGluY2x1ZGVkIGluIHRoZSBzYW1lIHRyYW5zbGF0aW9uIHVuaXQuCisKKyAgICAgICAgKiBj c3MvU3R5bGVDb2xvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUNvbG9yOjpjb2xvckZy b21LZXl3b3JkKToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpmaW5pc2hQYXJzaW5nSGV4Q29sb3IpOgorICAgICAgICAoV2Vi Q29yZTo6ZmluaXNoUGFyc2luZ05hbWVkQ29sb3IpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0NvbG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDb2xvcjo6YXNJbmxpbmUgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OnNldENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNv bG9yOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OmRlY29kZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oOgorICAgICAgICAoV2ViQ29y ZTo6YXNTUkdCQSk6CisgICAgICAgIChXZWJDb3JlOjpQYWNrZWQ6OlJHQkE6OlJHQkEpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6UGFja2VkOjpBUkdCOjpBUkdCKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJhY2tpbmdTdG9yZS5oOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCYWNraW5nU3RvcmU6OmJsZW5kUGl4ZWwpOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VCYWNraW5nU3RvcmU6OnBpeGVsVmFsdWUgY29uc3QpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NnL0NvbG9yQ0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FjaGVkQ0dD b2xvcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9yTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6bnNDb2xvcik6CisKIDIwMjAtMTAtMDUgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGFzc2VydGlvbiBmaXggYWZ0ZXIg cjI2ODAwNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUNvbG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUNvbG9yLmNwcAppbmRleCAwODUxYzVjNGRjNTIzMTg2 ZTczZGM3ODg3ZGYzYmJmMWEyMzU1MGNkLi4yYWZkNThlZTE3Yzg5NDk1ODcxMmZhNDgxZjFjNzVi YzczMWVjOTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVDb2xvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQ29sb3IuY3BwCkBAIC00MSw3ICs0MSw3IEBA IENvbG9yIFN0eWxlQ29sb3I6OmNvbG9yRnJvbUtleXdvcmQoQ1NTVmFsdWVJRCBrZXl3b3JkLCBP cHRpb25TZXQ8T3B0aW9ucz4gb3B0aW9uCiB7CiAgICAgaWYgKGNvbnN0IGNoYXIqIHZhbHVlTmFt ZSA9IGdldFZhbHVlTmFtZShrZXl3b3JkKSkgewogICAgICAgICBpZiAoY29uc3QgTmFtZWRDb2xv ciogbmFtZWRDb2xvciA9IGZpbmRDb2xvcih2YWx1ZU5hbWUsIHN0cmxlbih2YWx1ZU5hbWUpKSkK LSAgICAgICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6QVJHQiB7IG5hbWVkQ29sb3ItPkFS R0JWYWx1ZSB9KTsKKyAgICAgICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZENvbG9yOjpBUkdC IHsgbmFtZWRDb2xvci0+QVJHQlZhbHVlIH0pOwogICAgIH0KIAogICAgIHJldHVybiBSZW5kZXJU aGVtZTo6c2luZ2xldG9uKCkuc3lzdGVtQ29sb3Ioa2V5d29yZCwgb3B0aW9ucyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAKaW5kZXggYjYz NTY4ZWZiZTAzNjQ5ZDRjYmRlZGQ2NjE0N2Y5OTkyY2Q5YTY2ZS4uYjliZTY5ODUxOTNhMjU0NzYy MDg5MTM5ODc2ZDIwMWU5ODIxNWUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXJGYXN0UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcApAQCAtNDE0LDI4ICs0MTQsMjggQEAgc3RhdGljIE9w dGlvbmFsPFNSR0JBPHVpbnQ4X3Q+PiBmaW5pc2hQYXJzaW5nSGV4Q29sb3IodWludDMyX3QgdmFs dWUsIHVuc2lnbmVkIGwKICAgICBzd2l0Y2ggKGxlbmd0aCkgewogICAgIGNhc2UgMzoKICAgICAg ICAgLy8gI2FiYyBjb252ZXJ0cyB0byAjYWFiYmNjCi0gICAgICAgIC8vIEZJWE1FOiBSZXBsYWNl IGNvbnZlcnNpb24gdG8gUGFja2VkOjpBUkdCIHdpdGggc2ltcGxlciBiaXQgbWF0aCB0byBjb25z dHJ1Y3QKKyAgICAgICAgLy8gRklYTUU6IFJlcGxhY2UgY29udmVyc2lvbiB0byBQYWNrZWRDb2xv cjo6QVJHQiB3aXRoIHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CiAgICAgICAgIC8vIHRo ZSBTUkdCQTx1aW50OF90PiBkaXJlY3RseS4KLSAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFja2Vk OjpBUkdCIHsKKyAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkQ29sb3I6OkFSR0IgewogICAg ICAgICAgICAgICAgMHhGRjAwMDAwMAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYwMCkgPDwg MTIgfCAodmFsdWUgJiAweEYwMCkgPDwgOAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYwKSA8 PCA4IHwgKHZhbHVlICYgMHhGMCkgPDwgNAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYpIDw8 IDQgfCAodmFsdWUgJiAweEYpIH0pOwogICAgIGNhc2UgNDoKICAgICAgICAgLy8gI2FiY2QgY29u dmVydHMgdG8gZGRhYWJiY2Mgc2luY2UgYWxwaGEgYnl0ZXMgYXJlIHRoZSBoaWdoIGJ5dGVzLgot ICAgICAgICAvLyBGSVhNRTogUmVwbGFjZSBjb252ZXJzaW9uIHRvIFBhY2tlZDo6QVJHQiB3aXRo IHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CisgICAgICAgIC8vIEZJWE1FOiBSZXBsYWNl IGNvbnZlcnNpb24gdG8gUGFja2VkQ29sb3I6OkFSR0Igd2l0aCBzaW1wbGVyIGJpdCBtYXRoIHRv IGNvbnN0cnVjdAogICAgICAgICAvLyB0aGUgU1JHQkE8dWludDhfdD4gZGlyZWN0bHkuCi0gICAg ICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6QVJHQiB7CisgICAgICAgIHJldHVybiBhc1NSR0JB KFBhY2tlZENvbG9yOjpBUkdCIHsKICAgICAgICAgICAgICAgKHZhbHVlICYgMHhGKSA8PCAyOCB8 ICh2YWx1ZSAmIDB4RikgPDwgMjQKICAgICAgICAgICAgIHwgKHZhbHVlICYgMHhGMDAwKSA8PCA4 IHwgKHZhbHVlICYgMHhGMDAwKSA8PCA0CiAgICAgICAgICAgICB8ICh2YWx1ZSAmIDB4RjAwKSA8 PCA0IHwgKHZhbHVlICYgMHhGMDApCiAgICAgICAgICAgICB8ICh2YWx1ZSAmIDB4RjApIHwgKHZh bHVlICYgMHhGMCkgPj4gNCB9KTsKICAgICBjYXNlIDY6Ci0gICAgICAgIC8vIEZJWE1FOiBSZXBs YWNlIGNvbnZlcnNpb24gdG8gUGFja2VkOjpBUkdCIHdpdGggc2ltcGxlciBiaXQgbWF0aCB0byBj b25zdHJ1Y3QKKyAgICAgICAgLy8gRklYTUU6IFJlcGxhY2UgY29udmVyc2lvbiB0byBQYWNrZWRD b2xvcjo6QVJHQiB3aXRoIHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CiAgICAgICAgIC8v IHRoZSBTUkdCQTx1aW50OF90PiBkaXJlY3RseS4KLSAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFj a2VkOjpBUkdCIHsgMHhGRjAwMDAwMCB8IHZhbHVlIH0pOworICAgICAgICByZXR1cm4gYXNTUkdC QShQYWNrZWRDb2xvcjo6QVJHQiB7IDB4RkYwMDAwMDAgfCB2YWx1ZSB9KTsKICAgICBjYXNlIDg6 Ci0gICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6UkdCQSB7IHZhbHVlIH0pOworICAgICAg ICByZXR1cm4gYXNTUkdCQShQYWNrZWRDb2xvcjo6UkdCQSB7IHZhbHVlIH0pOwogICAgIH0KICAg ICByZXR1cm4gV1RGOjpudWxsb3B0OwogfQpAQCAtNTM5LDcgKzUzOSw3IEBAIHN0YXRpYyBPcHRp b25hbDxTUkdCQTx1aW50OF90Pj4gZmluaXNoUGFyc2luZ05hbWVkQ29sb3IoY2hhciogYnVmZmVy LCB1bnNpZ25lZCBsCiAgICAgYXV0byBuYW1lZENvbG9yID0gZmluZENvbG9yKGJ1ZmZlciwgbGVu Z3RoKTsKICAgICBpZiAoIW5hbWVkQ29sb3IpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 Ci0gICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkOjpBUkdCIHsgbmFtZWRDb2xvci0+QVJHQlZhbHVl IH0pOworICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZENvbG9yOjpBUkdCIHsgbmFtZWRDb2xvci0+ QVJHQlZhbHVlIH0pOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBzdGF0 aWMgT3B0aW9uYWw8U1JHQkE8dWludDhfdD4+IHBhcnNlTmFtZWRDb2xvckludGVybmFsKGNvbnN0 IENoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCmluZGV4IDM3ZmRmMTk5ZWM2Yjk4NjdhMTczNDk2 MWRlNDFjOWFhYTdjN2NiOGEuLjU2MTc2NGE3MGZkM2Y5MGMyNTRmZGYyZjVkMWU1ZDgwMzVmMTdm ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaApAQCAtMzkzLDEy ICszOTMsMTIgQEAgaW5saW5lIGNvbnN0IEV4dGVuZGVkQ29sb3ImIENvbG9yOjphc0V4dGVuZGVk KCkgY29uc3QKIGlubGluZSBTUkdCQTx1aW50OF90PiBDb2xvcjo6YXNJbmxpbmUoKSBjb25zdAog ewogICAgIEFTU0VSVChpc0lubGluZSgpKTsKLSAgICByZXR1cm4gYXNTUkdCQShQYWNrZWQ6OlJH QkEgeyBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9jb2xvckRhdGEuaW5saW5lQ29sb3JBbmRGbGFn cyA+PiAzMikgfSk7CisgICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkQ29sb3I6OlJHQkEgeyBzdGF0 aWNfY2FzdDx1aW50MzJfdD4obV9jb2xvckRhdGEuaW5saW5lQ29sb3JBbmRGbGFncyA+PiAzMikg fSk7CiB9CiAKIGlubGluZSB2b2lkIENvbG9yOjpzZXRDb2xvcihTUkdCQTx1aW50OF90PiBjb2xv cikKIHsKLSAgICBtX2NvbG9yRGF0YS5pbmxpbmVDb2xvckFuZEZsYWdzID0gc3RhdGljX2Nhc3Q8 dWludDY0X3Q+KFBhY2tlZDo6UkdCQSB7IGNvbG9yIH0udmFsdWUpIDw8IDMyOworICAgIG1fY29s b3JEYXRhLmlubGluZUNvbG9yQW5kRmxhZ3MgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oUGFja2Vk Q29sb3I6OlJHQkEgeyBjb2xvciB9LnZhbHVlKSA8PCAzMjsKICAgICB0YWdBc1ZhbGlkKCk7CiB9 CiAKQEAgLTQ2NSw3ICs0NjUsNyBAQCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIENvbG9y OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgZW5jb2RlIHdoZXRoZXIgdGhlIGNvbG9yIGlzIHNlbWFudGljLgogCiAgICAgZW5jb2RlciA8 PCB0cnVlOwotICAgIGVuY29kZXIgPDwgUGFja2VkOjpSR0JBIHsgYXNJbmxpbmUoKSB9LnZhbHVl OworICAgIGVuY29kZXIgPDwgUGFja2VkQ29sb3I6OlJHQkEgeyBhc0lubGluZSgpIH0udmFsdWU7 CiB9CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IE9wdGlvbmFsPENvbG9yPiBDb2xvcjo6ZGVj b2RlKERlY29kZXImIGRlY29kZXIpCkBAIC01MDQsNyArNTA0LDcgQEAgdGVtcGxhdGU8Y2xhc3Mg RGVjb2Rlcj4gT3B0aW9uYWw8Q29sb3I+IENvbG9yOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikK ICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHZhbHVlKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKIAotICAgIHJldHVybiBDb2xvciB7IGFzU1JHQkEoUGFja2VkOjpSR0JBIHsgdmFsdWUg fSkgfTsKKyAgICByZXR1cm4gQ29sb3IgeyBhc1NSR0JBKFBhY2tlZENvbG9yOjpSR0JBIHsgdmFs dWUgfSkgfTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oCmluZGV4IGUzZDlhOTM1ZjIxZWFjNDlhMWZh ZmRiN2RiY2RkOTY3YWIyN2FmOWMuLjQ0MmVhNzBiMjlhODM3YWQwNTgzNmM3NWI0ZmY2OTY0NDU5 ZjYyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9y VHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvclR5cGVz LmgKQEAgLTM1Niw3ICszNTYsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjb25zdGV4cHIgYm9v bCBvcGVyYXRvciE9KGNvbnN0IFhZWkE8VD4mIGEsIGNvbnN0IFhZWkE8VD4mCiAKIC8vIFBhY2tl ZCBDb2xvciBGb3JtYXRzCiAKLW5hbWVzcGFjZSBQYWNrZWQgeworbmFtZXNwYWNlIFBhY2tlZENv bG9yIHsKIAogc3RydWN0IFJHQkEgewogICAgIGNvbnN0ZXhwciBleHBsaWNpdCBSR0JBKHVpbnQz Ml90IHJnYmEpCkBAIC0zODgsMTIgKzM4OCwxMiBAQCBzdHJ1Y3QgQVJHQiB7CiAKIH0KIAotY29u c3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkOjpSR0JBIGNvbG9yKQorY29uc3Rl eHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkQ29sb3I6OlJHQkEgY29sb3IpCiB7CiAg ICAgcmV0dXJuIHsgc3RhdGljX2Nhc3Q8dWludDhfdD4oY29sb3IudmFsdWUgPj4gMjQpLCBzdGF0 aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+PiAxNiksIHN0YXRpY19jYXN0PHVpbnQ4X3Q+ KGNvbG9yLnZhbHVlID4+IDgpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSkgfTsK IH0KIAotY29uc3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkOjpBUkdCIGNvbG9y KQorY29uc3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkQ29sb3I6OkFSR0IgY29s b3IpCiB7CiAgICAgcmV0dXJuIHsgc3RhdGljX2Nhc3Q8dWludDhfdD4oY29sb3IudmFsdWUgPj4g MTYpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+PiA4KSwgc3RhdGljX2Nhc3Q8 dWludDhfdD4oY29sb3IudmFsdWUpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+ PiAyNCkgfTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ltYWdlQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZUJhY2tpbmdTdG9yZS5oCmluZGV4IGQ4OTVlYTU2MGE5ZTM3NzY4MDgyYzg3OTBiYTQwNzZh ZjkxZTlhNjkuLmExNzVkZGE1NGE2MzRlOWY3ODM4NTk4ZDBlZGFiMGM4NjI4MjQ5YWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQmFja2luZ1N0b3Jl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCYWNraW5nU3Rv cmUuaApAQCAtMTUyLDcgKzE1Miw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFhKQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gcGl4ZWwgPSBhc1NSR0JBKFBhY2tlZDo6QVJH QiB7ICpkZXN0IH0pOworICAgICAgICBhdXRvIHBpeGVsID0gYXNTUkdCQShQYWNrZWRDb2xvcjo6 QVJHQiB7ICpkZXN0IH0pOwogCiAgICAgICAgIGlmIChhID49IDI1NSB8fCAhcGl4ZWwuYWxwaGEp IHsKICAgICAgICAgICAgIHNldFBpeGVsKGRlc3QsIHIsIGcsIGIsIGEpOwpAQCAtMTc0LDcgKzE3 NCw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX3ByZW11bHRpcGx5QWxwaGEpCiAgICAgICAg ICAgICByZXN1bHQgPSB1bnByZW11bHRpcGxpZWQocmVzdWx0KTsKIAotICAgICAgICAqZGVzdCA9 IFBhY2tlZDo6QVJHQiB7IHJlc3VsdCB9LnZhbHVlOworICAgICAgICAqZGVzdCA9IFBhY2tlZENv bG9yOjpBUkdCIHsgcmVzdWx0IH0udmFsdWU7CiAgICAgfQogCiAgICAgc3RhdGljIGJvb2wgaXNP dmVyU2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQpAQCAtMjMxLDcgKzIzMSw3IEBAIHByaXZhdGU6 CiAgICAgICAgIGlmIChtX3ByZW11bHRpcGx5QWxwaGEgJiYgYSA8IDI1NSkKICAgICAgICAgICAg IHJlc3VsdCA9IHByZW11bHRpcGxpZWRGbG9vcmluZyhyZXN1bHQpOwogCi0gICAgICAgIHJldHVy biBQYWNrZWQ6OkFSR0IgeyByZXN1bHQgfS52YWx1ZTsKKyAgICAgICAgcmV0dXJuIFBhY2tlZENv bG9yOjpBUkdCIHsgcmVzdWx0IH0udmFsdWU7CiAgICAgfQogCiAgICAgUmVmUHRyPFNoYXJlZEJ1 ZmZlcjo6RGF0YVNlZ21lbnQ+IG1fcGl4ZWxzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2cvQ29sb3JDRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jZy9Db2xvckNHLmNwcAppbmRleCA0NzMxMDRjNTdhZDExMjQ3MjI2YTIxNzNi MTllMmMxMTVjMDg4MGM4Li5hNTgyNjJhYTNjMjkzZjU3N2ZkNGYxZDM3OTY2NDhiYjRiMWVjNWQ1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9Db2xvckNH LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9Db2xvckNHLmNw cApAQCAtMTE3LDE2ICsxMTcsMTYgQEAgc3RhdGljIENHQ29sb3JSZWYgbGVha0NHQ29sb3IoY29u c3QgQ29sb3ImIGNvbG9yKQogQ0dDb2xvclJlZiBjYWNoZWRDR0NvbG9yKGNvbnN0IENvbG9yJiBj b2xvcikKIHsKICAgICBpZiAoY29sb3IuaXNJbmxpbmUoKSkgewotICAgICAgICBzd2l0Y2ggKFBh Y2tlZDo6UkdCQSB7IGNvbG9yLmFzSW5saW5lKCkgfS52YWx1ZSkgewotICAgICAgICBjYXNlIFBh Y2tlZDo6UkdCQSB7IENvbG9yOjp0cmFuc3BhcmVudEJsYWNrIH0udmFsdWU6IHsKKyAgICAgICAg c3dpdGNoIChQYWNrZWRDb2xvcjo6UkdCQSB7IGNvbG9yLmFzSW5saW5lKCkgfS52YWx1ZSkgewor ICAgICAgICBjYXNlIFBhY2tlZENvbG9yOjpSR0JBIHsgQ29sb3I6OnRyYW5zcGFyZW50QmxhY2sg fS52YWx1ZTogewogICAgICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgdHJhbnNwYXJlbnRDR0Nv bG9yID0gbGVha0NHQ29sb3IoY29sb3IpOwogICAgICAgICAgICAgcmV0dXJuIHRyYW5zcGFyZW50 Q0dDb2xvcjsKICAgICAgICAgfQotICAgICAgICBjYXNlIFBhY2tlZDo6UkdCQSB7IENvbG9yOjpi bGFjayB9LnZhbHVlOiB7CisgICAgICAgIGNhc2UgUGFja2VkQ29sb3I6OlJHQkEgeyBDb2xvcjo6 YmxhY2sgfS52YWx1ZTogewogICAgICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgYmxhY2tDR0Nv bG9yID0gbGVha0NHQ29sb3IoY29sb3IpOwogICAgICAgICAgICAgcmV0dXJuIGJsYWNrQ0dDb2xv cjsKICAgICAgICAgfQotICAgICAgICBjYXNlIFBhY2tlZDo6UkdCQSB7IENvbG9yOjp3aGl0ZSB9 LnZhbHVlOiB7CisgICAgICAgIGNhc2UgUGFja2VkQ29sb3I6OlJHQkEgeyBDb2xvcjo6d2hpdGUg fS52YWx1ZTogewogICAgICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgd2hpdGVDR0NvbG9yID0g bGVha0NHQ29sb3IoY29sb3IpOwogICAgICAgICAgICAgcmV0dXJuIHdoaXRlQ0dDb2xvcjsKICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L0NvbG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9y TWFjLm1tCmluZGV4IDczYzI2OThmZTJhODcwNDE3MjlmMDA3NTg0NTk5Y2U5OGEzMTJlOWYuLjdl ZWM2NGRlYWY5N2I4MWI2N2VkMzFjZWVjODY5MzlhODYxMjUyMzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db2xvck1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29sb3JNYWMubW0KQEAgLTExNCwxNiArMTE0 LDE2IEBAIENvbG9yIHNlbWFudGljQ29sb3JGcm9tTlNDb2xvcihOU0NvbG9yICpjb2xvcikKIE5T Q29sb3IgKm5zQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogewogICAgIGlmIChjb2xvci5pc0lu bGluZSgpKSB7Ci0gICAgICAgIHN3aXRjaCAoUGFja2VkOjpSR0JBIHsgY29sb3IuYXNJbmxpbmUo KSB9LnZhbHVlKSB7Ci0gICAgICAgIGNhc2UgUGFja2VkOjpSR0JBIHsgQ29sb3I6OnRyYW5zcGFy ZW50QmxhY2sgfS52YWx1ZTogeworICAgICAgICBzd2l0Y2ggKFBhY2tlZENvbG9yOjpSR0JBIHsg Y29sb3IuYXNJbmxpbmUoKSB9LnZhbHVlKSB7CisgICAgICAgIGNhc2UgUGFja2VkQ29sb3I6OlJH QkEgeyBDb2xvcjo6dHJhbnNwYXJlbnRCbGFjayB9LnZhbHVlOiB7CiAgICAgICAgICAgICBzdGF0 aWMgTlNDb2xvciAqY2xlYXJDb2xvciA9IFtbTlNDb2xvciBjb2xvcldpdGhTUkdCUmVkOjAgZ3Jl ZW46MCBibHVlOjAgYWxwaGE6MF0gcmV0YWluXTsKICAgICAgICAgICAgIHJldHVybiBjbGVhckNv bG9yOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgUGFja2VkOjpSR0JBIHsgQ29sb3I6OmJsYWNr IH0udmFsdWU6IHsKKyAgICAgICAgY2FzZSBQYWNrZWRDb2xvcjo6UkdCQSB7IENvbG9yOjpibGFj ayB9LnZhbHVlOiB7CiAgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqYmxhY2tDb2xvciA9IFtb TlNDb2xvciBjb2xvcldpdGhTUkdCUmVkOjAgZ3JlZW46MCBibHVlOjAgYWxwaGE6MV0gcmV0YWlu XTsKICAgICAgICAgICAgIHJldHVybiBibGFja0NvbG9yOwogICAgICAgICB9Ci0gICAgICAgIGNh c2UgUGFja2VkOjpSR0JBIHsgQ29sb3I6OndoaXRlIH0udmFsdWU6IHsKKyAgICAgICAgY2FzZSBQ YWNrZWRDb2xvcjo6UkdCQSB7IENvbG9yOjp3aGl0ZSB9LnZhbHVlOiB7CiAgICAgICAgICAgICBz dGF0aWMgTlNDb2xvciAqd2hpdGVDb2xvciA9IFtbTlNDb2xvciBjb2xvcldpdGhTUkdCUmVkOjEg Z3JlZW46MSBibHVlOjEgYWxwaGE6MV0gcmV0YWluXTsKICAgICAgICAgICAgIHJldHVybiB3aGl0 ZUNvbG9yOwogICAgICAgICB9Cg== 410653 2020-10-06 10:18:44 -0700 2020-10-06 11:23:32 -0700 Patch bug-217391-20201006101843.patch text/plain 13798 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwZmI5MWY1NGVmOTg0 YjAzY2E1MjYzZWZiYzkxYWFhODkzYjEwZi4uNWE5MzYxM2IwOTAzNmYwMTBlNmVmY2NlMDc5N2Jm YmU3ZGU4ZDFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTEwLTA2ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuYW1l IG5hbWVzcGFjZSBQYWNrZWQgdG8gbmFtZXNwYWNlIFBhY2tlZENvbG9yCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczOTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdGhlcndpc2UgInVzaW5nIFdURjo6 UGFja2VkOyIgaW4gd3RmL1BhY2tlZC5oIGNhdXNlcyBwcm9ibGVtcyBpZiBib3RoIGhlYWRlcnMg YXJlIGluY2x1ZGVkIGluIHRoZSBzYW1lIHRyYW5zbGF0aW9uIHVuaXQuCisKKyAgICAgICAgKiBj c3MvU3R5bGVDb2xvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUNvbG9yOjpjb2xvckZy b21LZXl3b3JkKToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpmaW5pc2hQYXJzaW5nSGV4Q29sb3IpOgorICAgICAgICAoV2Vi Q29yZTo6ZmluaXNoUGFyc2luZ05hbWVkQ29sb3IpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0NvbG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDb2xvcjo6YXNJbmxpbmUgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OnNldENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNv bG9yOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OmRlY29kZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oOgorICAgICAgICAoV2ViQ29y ZTo6YXNTUkdCQSk6CisgICAgICAgIChXZWJDb3JlOjpQYWNrZWQ6OlJHQkE6OlJHQkEpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6UGFja2VkOjpBUkdCOjpBUkdCKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJhY2tpbmdTdG9yZS5oOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCYWNraW5nU3RvcmU6OmJsZW5kUGl4ZWwpOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VCYWNraW5nU3RvcmU6OnBpeGVsVmFsdWUgY29uc3QpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NnL0NvbG9yQ0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FjaGVkQ0dD b2xvcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9yTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6bnNDb2xvcik6CisKIDIwMjAtMTAtMDUgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGFzc2VydGlvbiBmaXggYWZ0ZXIg cjI2ODAwNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUNvbG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUNvbG9yLmNwcAppbmRleCAwODUxYzVjNGRjNTIzMTg2 ZTczZGM3ODg3ZGYzYmJmMWEyMzU1MGNkLi4yYWZkNThlZTE3Yzg5NDk1ODcxMmZhNDgxZjFjNzVi YzczMWVjOTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVDb2xvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQ29sb3IuY3BwCkBAIC00MSw3ICs0MSw3IEBA IENvbG9yIFN0eWxlQ29sb3I6OmNvbG9yRnJvbUtleXdvcmQoQ1NTVmFsdWVJRCBrZXl3b3JkLCBP cHRpb25TZXQ8T3B0aW9ucz4gb3B0aW9uCiB7CiAgICAgaWYgKGNvbnN0IGNoYXIqIHZhbHVlTmFt ZSA9IGdldFZhbHVlTmFtZShrZXl3b3JkKSkgewogICAgICAgICBpZiAoY29uc3QgTmFtZWRDb2xv ciogbmFtZWRDb2xvciA9IGZpbmRDb2xvcih2YWx1ZU5hbWUsIHN0cmxlbih2YWx1ZU5hbWUpKSkK LSAgICAgICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6QVJHQiB7IG5hbWVkQ29sb3ItPkFS R0JWYWx1ZSB9KTsKKyAgICAgICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZENvbG9yOjpBUkdC IHsgbmFtZWRDb2xvci0+QVJHQlZhbHVlIH0pOwogICAgIH0KIAogICAgIHJldHVybiBSZW5kZXJU aGVtZTo6c2luZ2xldG9uKCkuc3lzdGVtQ29sb3Ioa2V5d29yZCwgb3B0aW9ucyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAKaW5kZXggYjYz NTY4ZWZiZTAzNjQ5ZDRjYmRlZGQ2NjE0N2Y5OTkyY2Q5YTY2ZS4uYjliZTY5ODUxOTNhMjU0NzYy MDg5MTM5ODc2ZDIwMWU5ODIxNWUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXJGYXN0UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcApAQCAtNDE0LDI4ICs0MTQsMjggQEAgc3RhdGljIE9w dGlvbmFsPFNSR0JBPHVpbnQ4X3Q+PiBmaW5pc2hQYXJzaW5nSGV4Q29sb3IodWludDMyX3QgdmFs dWUsIHVuc2lnbmVkIGwKICAgICBzd2l0Y2ggKGxlbmd0aCkgewogICAgIGNhc2UgMzoKICAgICAg ICAgLy8gI2FiYyBjb252ZXJ0cyB0byAjYWFiYmNjCi0gICAgICAgIC8vIEZJWE1FOiBSZXBsYWNl IGNvbnZlcnNpb24gdG8gUGFja2VkOjpBUkdCIHdpdGggc2ltcGxlciBiaXQgbWF0aCB0byBjb25z dHJ1Y3QKKyAgICAgICAgLy8gRklYTUU6IFJlcGxhY2UgY29udmVyc2lvbiB0byBQYWNrZWRDb2xv cjo6QVJHQiB3aXRoIHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CiAgICAgICAgIC8vIHRo ZSBTUkdCQTx1aW50OF90PiBkaXJlY3RseS4KLSAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFja2Vk OjpBUkdCIHsKKyAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkQ29sb3I6OkFSR0IgewogICAg ICAgICAgICAgICAgMHhGRjAwMDAwMAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYwMCkgPDwg MTIgfCAodmFsdWUgJiAweEYwMCkgPDwgOAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYwKSA8 PCA4IHwgKHZhbHVlICYgMHhGMCkgPDwgNAogICAgICAgICAgICAgfCAodmFsdWUgJiAweEYpIDw8 IDQgfCAodmFsdWUgJiAweEYpIH0pOwogICAgIGNhc2UgNDoKICAgICAgICAgLy8gI2FiY2QgY29u dmVydHMgdG8gZGRhYWJiY2Mgc2luY2UgYWxwaGEgYnl0ZXMgYXJlIHRoZSBoaWdoIGJ5dGVzLgot ICAgICAgICAvLyBGSVhNRTogUmVwbGFjZSBjb252ZXJzaW9uIHRvIFBhY2tlZDo6QVJHQiB3aXRo IHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CisgICAgICAgIC8vIEZJWE1FOiBSZXBsYWNl IGNvbnZlcnNpb24gdG8gUGFja2VkQ29sb3I6OkFSR0Igd2l0aCBzaW1wbGVyIGJpdCBtYXRoIHRv IGNvbnN0cnVjdAogICAgICAgICAvLyB0aGUgU1JHQkE8dWludDhfdD4gZGlyZWN0bHkuCi0gICAg ICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6QVJHQiB7CisgICAgICAgIHJldHVybiBhc1NSR0JB KFBhY2tlZENvbG9yOjpBUkdCIHsKICAgICAgICAgICAgICAgKHZhbHVlICYgMHhGKSA8PCAyOCB8 ICh2YWx1ZSAmIDB4RikgPDwgMjQKICAgICAgICAgICAgIHwgKHZhbHVlICYgMHhGMDAwKSA8PCA4 IHwgKHZhbHVlICYgMHhGMDAwKSA8PCA0CiAgICAgICAgICAgICB8ICh2YWx1ZSAmIDB4RjAwKSA8 PCA0IHwgKHZhbHVlICYgMHhGMDApCiAgICAgICAgICAgICB8ICh2YWx1ZSAmIDB4RjApIHwgKHZh bHVlICYgMHhGMCkgPj4gNCB9KTsKICAgICBjYXNlIDY6Ci0gICAgICAgIC8vIEZJWE1FOiBSZXBs YWNlIGNvbnZlcnNpb24gdG8gUGFja2VkOjpBUkdCIHdpdGggc2ltcGxlciBiaXQgbWF0aCB0byBj b25zdHJ1Y3QKKyAgICAgICAgLy8gRklYTUU6IFJlcGxhY2UgY29udmVyc2lvbiB0byBQYWNrZWRD b2xvcjo6QVJHQiB3aXRoIHNpbXBsZXIgYml0IG1hdGggdG8gY29uc3RydWN0CiAgICAgICAgIC8v IHRoZSBTUkdCQTx1aW50OF90PiBkaXJlY3RseS4KLSAgICAgICAgcmV0dXJuIGFzU1JHQkEoUGFj a2VkOjpBUkdCIHsgMHhGRjAwMDAwMCB8IHZhbHVlIH0pOworICAgICAgICByZXR1cm4gYXNTUkdC QShQYWNrZWRDb2xvcjo6QVJHQiB7IDB4RkYwMDAwMDAgfCB2YWx1ZSB9KTsKICAgICBjYXNlIDg6 Ci0gICAgICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZDo6UkdCQSB7IHZhbHVlIH0pOworICAgICAg ICByZXR1cm4gYXNTUkdCQShQYWNrZWRDb2xvcjo6UkdCQSB7IHZhbHVlIH0pOwogICAgIH0KICAg ICByZXR1cm4gV1RGOjpudWxsb3B0OwogfQpAQCAtNTM5LDcgKzUzOSw3IEBAIHN0YXRpYyBPcHRp b25hbDxTUkdCQTx1aW50OF90Pj4gZmluaXNoUGFyc2luZ05hbWVkQ29sb3IoY2hhciogYnVmZmVy LCB1bnNpZ25lZCBsCiAgICAgYXV0byBuYW1lZENvbG9yID0gZmluZENvbG9yKGJ1ZmZlciwgbGVu Z3RoKTsKICAgICBpZiAoIW5hbWVkQ29sb3IpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 Ci0gICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkOjpBUkdCIHsgbmFtZWRDb2xvci0+QVJHQlZhbHVl IH0pOworICAgIHJldHVybiBhc1NSR0JBKFBhY2tlZENvbG9yOjpBUkdCIHsgbmFtZWRDb2xvci0+ QVJHQlZhbHVlIH0pOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBzdGF0 aWMgT3B0aW9uYWw8U1JHQkE8dWludDhfdD4+IHBhcnNlTmFtZWRDb2xvckludGVybmFsKGNvbnN0 IENoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCmluZGV4IDM3ZmRmMTk5ZWM2Yjk4NjdhMTczNDk2 MWRlNDFjOWFhYTdjN2NiOGEuLjU2MTc2NGE3MGZkM2Y5MGMyNTRmZGYyZjVkMWU1ZDgwMzVmMTdm ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaApAQCAtMzkzLDEy ICszOTMsMTIgQEAgaW5saW5lIGNvbnN0IEV4dGVuZGVkQ29sb3ImIENvbG9yOjphc0V4dGVuZGVk KCkgY29uc3QKIGlubGluZSBTUkdCQTx1aW50OF90PiBDb2xvcjo6YXNJbmxpbmUoKSBjb25zdAog ewogICAgIEFTU0VSVChpc0lubGluZSgpKTsKLSAgICByZXR1cm4gYXNTUkdCQShQYWNrZWQ6OlJH QkEgeyBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9jb2xvckRhdGEuaW5saW5lQ29sb3JBbmRGbGFn cyA+PiAzMikgfSk7CisgICAgcmV0dXJuIGFzU1JHQkEoUGFja2VkQ29sb3I6OlJHQkEgeyBzdGF0 aWNfY2FzdDx1aW50MzJfdD4obV9jb2xvckRhdGEuaW5saW5lQ29sb3JBbmRGbGFncyA+PiAzMikg fSk7CiB9CiAKIGlubGluZSB2b2lkIENvbG9yOjpzZXRDb2xvcihTUkdCQTx1aW50OF90PiBjb2xv cikKIHsKLSAgICBtX2NvbG9yRGF0YS5pbmxpbmVDb2xvckFuZEZsYWdzID0gc3RhdGljX2Nhc3Q8 dWludDY0X3Q+KFBhY2tlZDo6UkdCQSB7IGNvbG9yIH0udmFsdWUpIDw8IDMyOworICAgIG1fY29s b3JEYXRhLmlubGluZUNvbG9yQW5kRmxhZ3MgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oUGFja2Vk Q29sb3I6OlJHQkEgeyBjb2xvciB9LnZhbHVlKSA8PCAzMjsKICAgICB0YWdBc1ZhbGlkKCk7CiB9 CiAKQEAgLTQ2NSw3ICs0NjUsNyBAQCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIENvbG9y OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgZW5jb2RlIHdoZXRoZXIgdGhlIGNvbG9yIGlzIHNlbWFudGljLgogCiAgICAgZW5jb2RlciA8 PCB0cnVlOwotICAgIGVuY29kZXIgPDwgUGFja2VkOjpSR0JBIHsgYXNJbmxpbmUoKSB9LnZhbHVl OworICAgIGVuY29kZXIgPDwgUGFja2VkQ29sb3I6OlJHQkEgeyBhc0lubGluZSgpIH0udmFsdWU7 CiB9CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IE9wdGlvbmFsPENvbG9yPiBDb2xvcjo6ZGVj b2RlKERlY29kZXImIGRlY29kZXIpCkBAIC01MDQsNyArNTA0LDcgQEAgdGVtcGxhdGU8Y2xhc3Mg RGVjb2Rlcj4gT3B0aW9uYWw8Q29sb3I+IENvbG9yOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikK ICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHZhbHVlKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKIAotICAgIHJldHVybiBDb2xvciB7IGFzU1JHQkEoUGFja2VkOjpSR0JBIHsgdmFsdWUg fSkgfTsKKyAgICByZXR1cm4gQ29sb3IgeyBhc1NSR0JBKFBhY2tlZENvbG9yOjpSR0JBIHsgdmFs dWUgfSkgfTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3JUeXBlcy5oCmluZGV4IGUzZDlhOTM1ZjIxZWFjNDlhMWZh ZmRiN2RiY2RkOTY3YWIyN2FmOWMuLjQ0MmVhNzBiMjlhODM3YWQwNTgzNmM3NWI0ZmY2OTY0NDU5 ZjYyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9y VHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvclR5cGVz LmgKQEAgLTM1Niw3ICszNTYsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjb25zdGV4cHIgYm9v bCBvcGVyYXRvciE9KGNvbnN0IFhZWkE8VD4mIGEsIGNvbnN0IFhZWkE8VD4mCiAKIC8vIFBhY2tl ZCBDb2xvciBGb3JtYXRzCiAKLW5hbWVzcGFjZSBQYWNrZWQgeworbmFtZXNwYWNlIFBhY2tlZENv bG9yIHsKIAogc3RydWN0IFJHQkEgewogICAgIGNvbnN0ZXhwciBleHBsaWNpdCBSR0JBKHVpbnQz Ml90IHJnYmEpCkBAIC0zODgsMTIgKzM4OCwxMiBAQCBzdHJ1Y3QgQVJHQiB7CiAKIH0KIAotY29u c3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkOjpSR0JBIGNvbG9yKQorY29uc3Rl eHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkQ29sb3I6OlJHQkEgY29sb3IpCiB7CiAg ICAgcmV0dXJuIHsgc3RhdGljX2Nhc3Q8dWludDhfdD4oY29sb3IudmFsdWUgPj4gMjQpLCBzdGF0 aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+PiAxNiksIHN0YXRpY19jYXN0PHVpbnQ4X3Q+ KGNvbG9yLnZhbHVlID4+IDgpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSkgfTsK IH0KIAotY29uc3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkOjpBUkdCIGNvbG9y KQorY29uc3RleHByIFNSR0JBPHVpbnQ4X3Q+IGFzU1JHQkEoUGFja2VkQ29sb3I6OkFSR0IgY29s b3IpCiB7CiAgICAgcmV0dXJuIHsgc3RhdGljX2Nhc3Q8dWludDhfdD4oY29sb3IudmFsdWUgPj4g MTYpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+PiA4KSwgc3RhdGljX2Nhc3Q8 dWludDhfdD4oY29sb3IudmFsdWUpLCBzdGF0aWNfY2FzdDx1aW50OF90Pihjb2xvci52YWx1ZSA+ PiAyNCkgfTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ltYWdlQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZUJhY2tpbmdTdG9yZS5oCmluZGV4IGQ4OTVlYTU2MGE5ZTM3NzY4MDgyYzg3OTBiYTQwNzZh ZjkxZTlhNjkuLmExNzVkZGE1NGE2MzRlOWY3ODM4NTk4ZDBlZGFiMGM4NjI4MjQ5YWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQmFja2luZ1N0b3Jl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCYWNraW5nU3Rv cmUuaApAQCAtMTUyLDcgKzE1Miw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFhKQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gcGl4ZWwgPSBhc1NSR0JBKFBhY2tlZDo6QVJH QiB7ICpkZXN0IH0pOworICAgICAgICBhdXRvIHBpeGVsID0gYXNTUkdCQShQYWNrZWRDb2xvcjo6 QVJHQiB7ICpkZXN0IH0pOwogCiAgICAgICAgIGlmIChhID49IDI1NSB8fCAhcGl4ZWwuYWxwaGEp IHsKICAgICAgICAgICAgIHNldFBpeGVsKGRlc3QsIHIsIGcsIGIsIGEpOwpAQCAtMTc0LDcgKzE3 NCw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX3ByZW11bHRpcGx5QWxwaGEpCiAgICAgICAg ICAgICByZXN1bHQgPSB1bnByZW11bHRpcGxpZWQocmVzdWx0KTsKIAotICAgICAgICAqZGVzdCA9 IFBhY2tlZDo6QVJHQiB7IHJlc3VsdCB9LnZhbHVlOworICAgICAgICAqZGVzdCA9IFBhY2tlZENv bG9yOjpBUkdCIHsgcmVzdWx0IH0udmFsdWU7CiAgICAgfQogCiAgICAgc3RhdGljIGJvb2wgaXNP dmVyU2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQpAQCAtMjMxLDcgKzIzMSw3IEBAIHByaXZhdGU6 CiAgICAgICAgIGlmIChtX3ByZW11bHRpcGx5QWxwaGEgJiYgYSA8IDI1NSkKICAgICAgICAgICAg IHJlc3VsdCA9IHByZW11bHRpcGxpZWRGbG9vcmluZyhyZXN1bHQpOwogCi0gICAgICAgIHJldHVy biBQYWNrZWQ6OkFSR0IgeyByZXN1bHQgfS52YWx1ZTsKKyAgICAgICAgcmV0dXJuIFBhY2tlZENv bG9yOjpBUkdCIHsgcmVzdWx0IH0udmFsdWU7CiAgICAgfQogCiAgICAgUmVmUHRyPFNoYXJlZEJ1 ZmZlcjo6RGF0YVNlZ21lbnQ+IG1fcGl4ZWxzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyb0ltYWdlU3VyZmFjZUJhY2tl bmQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZm ZXJDYWlyb0ltYWdlU3VyZmFjZUJhY2tlbmQuY3BwCmluZGV4IDE4Njc0MGQ5NDhiZjg3M2JhMDhm OTY1NzRmMjJjMzc1YTI2NDBiOGQuLjNmMGViMDg0MDdjNzI1MzNkZWExYTE0OWZjN2NkNWE2ODI3 ZTQwOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ltYWdlQnVmZmVyQ2Fpcm9JbWFnZVN1cmZhY2VCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvSW1hZ2VTdXJmYWNl QmFja2VuZC5jcHAKQEAgLTgxLDkgKzgxLDkgQEAgdm9pZCBJbWFnZUJ1ZmZlckNhaXJvSW1hZ2VT dXJmYWNlQmFja2VuZDo6cGxhdGZvcm1UcmFuc2Zvcm1Db2xvclNwYWNlKGNvbnN0IHN0ZDoKICAg ICAgICAgdW5zaWduZWQqIHJvdyA9IHJlaW50ZXJwcmV0X2Nhc3RfcHRyPHVuc2lnbmVkKj4oZGF0 YVNyYyArIHN0cmlkZSAqIHkpOwogICAgICAgICBmb3IgKGludCB4ID0gMDsgeCA8IG1fbG9naWNh bFNpemUud2lkdGgoKTsgeCsrKSB7CiAgICAgICAgICAgICB1bnNpZ25lZCogcGl4ZWwgPSByb3cg KyB4OwotICAgICAgICAgICAgYXV0byBwaXhlbENvbXBvbmVudHMgPSB1bnByZW11bHRpcGxpZWQo YXNTUkdCQShQYWNrZWQ6OkFSR0IgeyAqcGl4ZWwgfSkpOworICAgICAgICAgICAgYXV0byBwaXhl bENvbXBvbmVudHMgPSB1bnByZW11bHRpcGxpZWQoYXNTUkdCQShQYWNrZWRDb2xvcjo6QVJHQiB7 ICpwaXhlbCB9KSk7CiAgICAgICAgICAgICBwaXhlbENvbXBvbmVudHMgPSB7IGxvb2tVcFRhYmxl W3BpeGVsQ29tcG9uZW50cy5yZWRdLCBsb29rVXBUYWJsZVtwaXhlbENvbXBvbmVudHMuZ3JlZW5d LCBsb29rVXBUYWJsZVtwaXhlbENvbXBvbmVudHMuYmx1ZV0sIHBpeGVsQ29tcG9uZW50cy5hbHBo YSB9OwotICAgICAgICAgICAgKnBpeGVsID0gUGFja2VkOjpBUkdCIHsgcHJlbXVsdGlwbGllZENl aWxpbmcocGl4ZWxDb21wb25lbnRzKSB9LnZhbHVlOworICAgICAgICAgICAgKnBpeGVsID0gUGFj a2VkQ29sb3I6OkFSR0IgeyBwcmVtdWx0aXBsaWVkQ2VpbGluZyhwaXhlbENvbXBvbmVudHMpIH0u dmFsdWU7CiAgICAgICAgIH0KICAgICB9CiAgICAgY2Fpcm9fc3VyZmFjZV9tYXJrX2RpcnR5X3Jl Y3RhbmdsZShtX3N1cmZhY2UuZ2V0KCksIDAsIDAsIG1fbG9naWNhbFNpemUud2lkdGgoKSwgbV9s b2dpY2FsU2l6ZS5oZWlnaHQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9OYXRpdmVJbWFnZUNhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL05hdGl2ZUltYWdlQ2Fpcm8uY3BwCmluZGV4IGUyZmFkZTVi NTQyOWM2NjFhMTgyNmRkYjhkNWJmZjkyNjdkNTg5MWYuLjA1YzBmODFjYjM0MTkwY2IzNzNiZDg0 MzQxNThiNGQwMzMwMWFiMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL05hdGl2ZUltYWdlQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL05hdGl2ZUltYWdlQ2Fpcm8uY3BwCkBAIC01NCw3ICs1NCw3 IEBAIENvbG9yIG5hdGl2ZUltYWdlU2luZ2xlUGl4ZWxTb2xpZENvbG9yKGNvbnN0IE5hdGl2ZUlt YWdlUHRyJiBpbWFnZSkKICAgICAgICAgcmV0dXJuIENvbG9yKCk7CiAKICAgICB1bnNpZ25lZCog cGl4ZWwgPSByZWludGVycHJldF9jYXN0X3B0cjx1bnNpZ25lZCo+KGNhaXJvX2ltYWdlX3N1cmZh Y2VfZ2V0X2RhdGEoaW1hZ2UuZ2V0KCkpKTsKLSAgICByZXR1cm4gdW5wcmVtdWx0aXBsaWVkKGFz U1JHQkEoUGFja2VkOjpBUkdCIHsgKnBpeGVsIH0pKTsKKyAgICByZXR1cm4gdW5wcmVtdWx0aXBs aWVkKGFzU1JHQkEoUGFja2VkQ29sb3I6OkFSR0IgeyAqcGl4ZWwgfSkpOwogfQogCiB2b2lkIGRy YXdOYXRpdmVJbWFnZShjb25zdCBOYXRpdmVJbWFnZVB0ciYgaW1hZ2UsIEdyYXBoaWNzQ29udGV4 dCYgY29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBz cmNSZWN0LCBjb25zdCBJbnRTaXplJiBpbWFnZVNpemUsIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRp b25zJiBvcHRpb25zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvQ29sb3JDRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9D b2xvckNHLmNwcAppbmRleCA0NzMxMDRjNTdhZDExMjQ3MjI2YTIxNzNiMTllMmMxMTVjMDg4MGM4 Li5hNTgyNjJhYTNjMjkzZjU3N2ZkNGYxZDM3OTY2NDhiYjRiMWVjNWQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9Db2xvckNHLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9Db2xvckNHLmNwcApAQCAtMTE3LDE2ICsx MTcsMTYgQEAgc3RhdGljIENHQ29sb3JSZWYgbGVha0NHQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9y KQogQ0dDb2xvclJlZiBjYWNoZWRDR0NvbG9yKGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBp ZiAoY29sb3IuaXNJbmxpbmUoKSkgewotICAgICAgICBzd2l0Y2ggKFBhY2tlZDo6UkdCQSB7IGNv bG9yLmFzSW5saW5lKCkgfS52YWx1ZSkgewotICAgICAgICBjYXNlIFBhY2tlZDo6UkdCQSB7IENv bG9yOjp0cmFuc3BhcmVudEJsYWNrIH0udmFsdWU6IHsKKyAgICAgICAgc3dpdGNoIChQYWNrZWRD b2xvcjo6UkdCQSB7IGNvbG9yLmFzSW5saW5lKCkgfS52YWx1ZSkgeworICAgICAgICBjYXNlIFBh Y2tlZENvbG9yOjpSR0JBIHsgQ29sb3I6OnRyYW5zcGFyZW50QmxhY2sgfS52YWx1ZTogewogICAg ICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgdHJhbnNwYXJlbnRDR0NvbG9yID0gbGVha0NHQ29s b3IoY29sb3IpOwogICAgICAgICAgICAgcmV0dXJuIHRyYW5zcGFyZW50Q0dDb2xvcjsKICAgICAg ICAgfQotICAgICAgICBjYXNlIFBhY2tlZDo6UkdCQSB7IENvbG9yOjpibGFjayB9LnZhbHVlOiB7 CisgICAgICAgIGNhc2UgUGFja2VkQ29sb3I6OlJHQkEgeyBDb2xvcjo6YmxhY2sgfS52YWx1ZTog ewogICAgICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgYmxhY2tDR0NvbG9yID0gbGVha0NHQ29s b3IoY29sb3IpOwogICAgICAgICAgICAgcmV0dXJuIGJsYWNrQ0dDb2xvcjsKICAgICAgICAgfQot ICAgICAgICBjYXNlIFBhY2tlZDo6UkdCQSB7IENvbG9yOjp3aGl0ZSB9LnZhbHVlOiB7CisgICAg ICAgIGNhc2UgUGFja2VkQ29sb3I6OlJHQkEgeyBDb2xvcjo6d2hpdGUgfS52YWx1ZTogewogICAg ICAgICAgICAgc3RhdGljIENHQ29sb3JSZWYgd2hpdGVDR0NvbG9yID0gbGVha0NHQ29sb3IoY29s b3IpOwogICAgICAgICAgICAgcmV0dXJuIHdoaXRlQ0dDb2xvcjsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9yTWFjLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbG9yTWFjLm1tCmluZGV4IDcz YzI2OThmZTJhODcwNDE3MjlmMDA3NTg0NTk5Y2U5OGEzMTJlOWYuLjdlZWM2NGRlYWY5N2I4MWI2 N2VkMzFjZWVjODY5MzlhODYxMjUyMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9Db2xvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvQ29sb3JNYWMubW0KQEAgLTExNCwxNiArMTE0LDE2IEBAIENvbG9yIHNl bWFudGljQ29sb3JGcm9tTlNDb2xvcihOU0NvbG9yICpjb2xvcikKIE5TQ29sb3IgKm5zQ29sb3Io Y29uc3QgQ29sb3ImIGNvbG9yKQogewogICAgIGlmIChjb2xvci5pc0lubGluZSgpKSB7Ci0gICAg ICAgIHN3aXRjaCAoUGFja2VkOjpSR0JBIHsgY29sb3IuYXNJbmxpbmUoKSB9LnZhbHVlKSB7Ci0g ICAgICAgIGNhc2UgUGFja2VkOjpSR0JBIHsgQ29sb3I6OnRyYW5zcGFyZW50QmxhY2sgfS52YWx1 ZTogeworICAgICAgICBzd2l0Y2ggKFBhY2tlZENvbG9yOjpSR0JBIHsgY29sb3IuYXNJbmxpbmUo KSB9LnZhbHVlKSB7CisgICAgICAgIGNhc2UgUGFja2VkQ29sb3I6OlJHQkEgeyBDb2xvcjo6dHJh bnNwYXJlbnRCbGFjayB9LnZhbHVlOiB7CiAgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqY2xl YXJDb2xvciA9IFtbTlNDb2xvciBjb2xvcldpdGhTUkdCUmVkOjAgZ3JlZW46MCBibHVlOjAgYWxw aGE6MF0gcmV0YWluXTsKICAgICAgICAgICAgIHJldHVybiBjbGVhckNvbG9yOwogICAgICAgICB9 Ci0gICAgICAgIGNhc2UgUGFja2VkOjpSR0JBIHsgQ29sb3I6OmJsYWNrIH0udmFsdWU6IHsKKyAg ICAgICAgY2FzZSBQYWNrZWRDb2xvcjo6UkdCQSB7IENvbG9yOjpibGFjayB9LnZhbHVlOiB7CiAg ICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAqYmxhY2tDb2xvciA9IFtbTlNDb2xvciBjb2xvcldp dGhTUkdCUmVkOjAgZ3JlZW46MCBibHVlOjAgYWxwaGE6MV0gcmV0YWluXTsKICAgICAgICAgICAg IHJldHVybiBibGFja0NvbG9yOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgUGFja2VkOjpSR0JB IHsgQ29sb3I6OndoaXRlIH0udmFsdWU6IHsKKyAgICAgICAgY2FzZSBQYWNrZWRDb2xvcjo6UkdC QSB7IENvbG9yOjp3aGl0ZSB9LnZhbHVlOiB7CiAgICAgICAgICAgICBzdGF0aWMgTlNDb2xvciAq d2hpdGVDb2xvciA9IFtbTlNDb2xvciBjb2xvcldpdGhTUkdCUmVkOjEgZ3JlZW46MSBibHVlOjEg YWxwaGE6MV0gcmV0YWluXTsKICAgICAgICAgICAgIHJldHVybiB3aGl0ZUNvbG9yOwogICAgICAg ICB9Cg==