182821 2018-02-14 21:53:36 -0800 Use std::make_unique instead of explicit calls to new and instead of writing create functions 2018-02-15 11:50:38 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin andersca webkit-bug-importer oldest_to_newest 1399382 0 darin 2018-02-14 21:53:36 -0800 Use std::make_unique instead of explicit calls to new and instead of writing create functions 1399383 1 333875 darin 2018-02-14 21:57:56 -0800 Created attachment 333875 Patch 1399557 2 darin 2018-02-15 11:49:28 -0800 Committed r228528: <https://trac.webkit.org/changeset/228528> 1399558 3 webkit-bug-importer 2018-02-15 11:50:38 -0800 <rdar://problem/37578473> 333875 2018-02-14 21:57:56 -0800 2018-02-15 11:46:41 -0800 Patch bug-182821-20180214215755.patch text/plain 18770 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5YzM4MmIyZjAwMTJj MjQxZjQwNDM2NTIzMzY5NDM5NjYxNmJhMC4uZjMyOGQ3MzNlMDZjNWM5NmU1NmNjNDM0OTUzMjhj MGY4ZTJhY2RkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE4LTAyLTE0ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBVc2Ugc3RkOjptYWtlX3VuaXF1 ZSBpbnN0ZWFkIG9mIGV4cGxpY2l0IGNhbGxzIHRvIG5ldyBhbmQgaW5zdGVhZCBvZiB3cml0aW5n IGNyZWF0ZSBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MjgyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogbG9hZGVyL0xpbmtMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudCk6IFVzZSBzdGQ6Om1ha2VfdW5pcXVlIGluc3Rl YWRvZiBjcmVhdGUgZnVuY3Rpb25zLgorCisgICAgICAgICogbG9hZGVyL0xpbmtQcmVsb2FkUmVz b3VyY2VDbGllbnRzLmg6IE1ha2UgY29uc3RydWN0b3JzIHB1YmxpYywgZ2V0IHJpZCBvZiBjcmVh dGUgZnVuY3Rpb25zLAorICAgICAgICBtYWtlIG92ZXJyaWRlcyBiZSBwcml2YXRlIGFuZCBmaW5h bCwgZ2V0IHJpZCBvZiB1bm5lY2Vzc2FyeSBwdWJsaWMgZGVmYXVsdCB2aXJ0dWFsIGRlc3RydWN0 b3JzCisgICAgICAgIHRoYXQgdGhlIGNvbXBpbGVyIHdpbGwgZ2VuZXJhdGUgY29ycmVjdGx5IHdp dGhvdXQgYW55dGhpbmcgZXhwbGljaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0ZWRt ZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1GYWN0 b3J5Q2xlYXJLZXk6OmNyZWF0ZUNETSk6IFVzZSBzdGQ6Om1ha2VfdW5pcXVlIGluc3RlYWQgb2Yg c3RkOjp1bmlxdWVfcHRyL25ldy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKTogVXNlCisgICAgICAgIHN0ZDo6bWFrZV91bmlx dWUgaW5zdGVhZCBvZiBjYWxsaW5nIGEgY3JlYXRlIGZ1bmN0aW9uLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291 cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U291cmNlQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDKTogRGl0 dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpNZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMpOiBEaXR0by4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL1ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci5oOiBNYWRlIHRoZSBj b25zdHJ1Y3RvcgorICAgICAgICBwdWJsaWMgYW5kIGdvdCByaWQgb2YgdGhlIGNyZWF0ZSBmdW5j dGlvbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRl b0Z1bGxzY3JlZW5MYXllck1hbmFnZXIubW06CisgICAgICAgIChXZWJDb3JlOjpWaWRlb0Z1bGxz Y3JlZW5MYXllck1hbmFnZXI6OmNyZWF0ZSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiByZW5kZXJp bmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRU cmFja1NpemluZ0FsZ29yaXRobTo6Y29tcHV0ZUZsZXhGYWN0b3JVbml0U2l6ZSBjb25zdCk6Cisg ICAgICAgIFVzZSBzdGQ6Om1ha2VfdW5pcXVlIGluc3RlYWQgb2Ygc3RkOjp1bmlxdWVfcHRyL25l dy4KKwogMjAxOC0wMi0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92ZSBSZW5kZXJNYXRoTUxGZW5jZWQ6OmFkZENoaWxk KCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9MaW5rTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcApp bmRleCA3NTI3YTdkYWI2OTJjMmNjZDI1MWFmMjk4MDZlOGRiZTUzMzViMzY3Li4yMjgwNGQ5MjM5 N2NmZmVjNDcxMDY4OGIxM2Q2ZGVmMDUzZGQzYjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtM b2FkZXIuY3BwCkBAIC0xMzksMjIgKzEzOSwyMiBAQCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExp bmtQcmVsb2FkUmVzb3VyY2VDbGllbnQ+IGNyZWF0ZUxpbmtQcmVsb2FkUmVzb3VyY2VDbGllbgog ewogICAgIHN3aXRjaCAocmVzb3VyY2UudHlwZSgpKSB7CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJj ZTo6SW1hZ2VSZXNvdXJjZToKLSAgICAgICAgcmV0dXJuIExpbmtQcmVsb2FkSW1hZ2VSZXNvdXJj ZUNsaWVudDo6Y3JlYXRlKGxvYWRlciwgZG93bmNhc3Q8Q2FjaGVkSW1hZ2U+KHJlc291cmNlKSk7 CisgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPExpbmtQcmVsb2FkSW1hZ2VSZXNvdXJj ZUNsaWVudD4obG9hZGVyLCBkb3duY2FzdDxDYWNoZWRJbWFnZT4ocmVzb3VyY2UpKTsKICAgICBj YXNlIENhY2hlZFJlc291cmNlOjpTY3JpcHQ6Ci0gICAgICAgIHJldHVybiBMaW5rUHJlbG9hZERl ZmF1bHRSZXNvdXJjZUNsaWVudDo6Y3JlYXRlKGxvYWRlciwgZG93bmNhc3Q8Q2FjaGVkU2NyaXB0 PihyZXNvdXJjZSkpOworICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxMaW5rUHJlbG9h ZERlZmF1bHRSZXNvdXJjZUNsaWVudD4obG9hZGVyLCBkb3duY2FzdDxDYWNoZWRTY3JpcHQ+KHJl c291cmNlKSk7CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6Q1NTU3R5bGVTaGVldDoKLSAgICAg ICAgcmV0dXJuIExpbmtQcmVsb2FkU3R5bGVSZXNvdXJjZUNsaWVudDo6Y3JlYXRlKGxvYWRlciwg ZG93bmNhc3Q8Q2FjaGVkQ1NTU3R5bGVTaGVldD4ocmVzb3VyY2UpKTsKKyAgICAgICAgcmV0dXJu IHN0ZDo6bWFrZV91bmlxdWU8TGlua1ByZWxvYWRTdHlsZVJlc291cmNlQ2xpZW50Pihsb2FkZXIs IGRvd25jYXN0PENhY2hlZENTU1N0eWxlU2hlZXQ+KHJlc291cmNlKSk7CiAgICAgY2FzZSBDYWNo ZWRSZXNvdXJjZTo6Rm9udFJlc291cmNlOgotICAgICAgICByZXR1cm4gTGlua1ByZWxvYWRGb250 UmVzb3VyY2VDbGllbnQ6OmNyZWF0ZShsb2FkZXIsIGRvd25jYXN0PENhY2hlZEZvbnQ+KHJlc291 cmNlKSk7CisgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPExpbmtQcmVsb2FkRm9udFJl c291cmNlQ2xpZW50Pihsb2FkZXIsIGRvd25jYXN0PENhY2hlZEZvbnQ+KHJlc291cmNlKSk7CiAj aWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlRleHRUcmFj a1Jlc291cmNlOgotICAgICAgICByZXR1cm4gTGlua1ByZWxvYWREZWZhdWx0UmVzb3VyY2VDbGll bnQ6OmNyZWF0ZShsb2FkZXIsIGRvd25jYXN0PENhY2hlZFRleHRUcmFjaz4ocmVzb3VyY2UpKTsK KyAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8TGlua1ByZWxvYWREZWZhdWx0UmVzb3Vy Y2VDbGllbnQ+KGxvYWRlciwgZG93bmNhc3Q8Q2FjaGVkVGV4dFRyYWNrPihyZXNvdXJjZSkpOwog I2VuZGlmCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6TWVkaWFSZXNvdXJjZToKICAgICAgICAg QVNTRVJUKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkubWVkaWFQcmVs b2FkaW5nRW5hYmxlZCgpKTsKICAgICAgICAgRkFMTFRIUk9VR0g7CiAgICAgY2FzZSBDYWNoZWRS ZXNvdXJjZTo6UmF3UmVzb3VyY2U6Ci0gICAgICAgIHJldHVybiBMaW5rUHJlbG9hZFJhd1Jlc291 cmNlQ2xpZW50OjpjcmVhdGUobG9hZGVyLCBkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4ocmVz b3VyY2UpKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8TGlua1ByZWxvYWRSYXdS ZXNvdXJjZUNsaWVudD4obG9hZGVyLCBkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4ocmVzb3Vy Y2UpKTsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpNYWluUmVzb3VyY2U6CiAgICAgY2FzZSBD YWNoZWRSZXNvdXJjZTo6SWNvbjoKICNpZiBFTkFCTEUoU1ZHX0ZPTlRTKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnRzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudHMuaAppbmRleCAyNjQ2 ZmJhNWNmZGQxYTAwNmY3NGJkNmJkYmIyODczYzU1MDQ3MGM5Li45MDZhZmU0NzVlZGRhYTg1MzA1 MWIzMTQxMWUzY2YyZjkwZDI4ZTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudHMuaApAQCAtNTMsNyArNTMsNiBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCB2b2lkIGNsZWFyKCkgPSAwOwogCiBwcm90ZWN0ZWQ6Ci0KICAgICBMaW5rUHJl bG9hZFJlc291cmNlQ2xpZW50KExpbmtMb2FkZXImLCBDYWNoZWRSZXNvdXJjZSYpOwogCiAgICAg dm9pZCBhZGRSZXNvdXJjZShDYWNoZWRSZXNvdXJjZUNsaWVudCYgY2xpZW50KQpAQCAtNzcsMTMx ICs3Niw4NSBAQCBwcml2YXRlOgogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291 cmNlPiBtX3Jlc291cmNlOwogfTsKIAotY2xhc3MgTGlua1ByZWxvYWREZWZhdWx0UmVzb3VyY2VD bGllbnQ6IHB1YmxpYyBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50LCBDYWNoZWRSZXNvdXJjZUNs aWVudCB7CitjbGFzcyBMaW5rUHJlbG9hZERlZmF1bHRSZXNvdXJjZUNsaWVudCA6IHB1YmxpYyBM aW5rUHJlbG9hZFJlc291cmNlQ2xpZW50LCBDYWNoZWRSZXNvdXJjZUNsaWVudCB7CiBwdWJsaWM6 Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5rUHJlbG9hZERlZmF1bHRSZXNvdXJjZUNs aWVudD4gY3JlYXRlKExpbmtMb2FkZXImIGxvYWRlciwgQ2FjaGVkU2NyaXB0JiByZXNvdXJjZSkK LSAgICB7Ci0gICAgICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWREZWZhdWx0 UmVzb3VyY2VDbGllbnQ+KG5ldyBMaW5rUHJlbG9hZERlZmF1bHRSZXNvdXJjZUNsaWVudChsb2Fk ZXIsIHJlc291cmNlKSk7Ci0gICAgfQotCi0jaWYgRU5BQkxFKFZJREVPX1RSQUNLKQotICAgIHN0 YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWREZWZhdWx0UmVzb3VyY2VDbGllbnQ+IGNy ZWF0ZShMaW5rTG9hZGVyJiBsb2FkZXIsIENhY2hlZFRleHRUcmFjayYgcmVzb3VyY2UpCi0gICAg ewotICAgICAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRyPExpbmtQcmVsb2FkRGVmYXVsdFJlc291 cmNlQ2xpZW50PihuZXcgTGlua1ByZWxvYWREZWZhdWx0UmVzb3VyY2VDbGllbnQobG9hZGVyLCBy ZXNvdXJjZSkpOwotICAgIH0KLSNlbmRpZgotCi0gICAgdmlydHVhbCB+TGlua1ByZWxvYWREZWZh dWx0UmVzb3VyY2VDbGllbnQoKSA9IGRlZmF1bHQ7Ci0KLQotICAgIHZvaWQgbm90aWZ5RmluaXNo ZWQoQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSBvdmVycmlkZSB7IHRyaWdnZXJFdmVudHMocmVz b3VyY2UpOyB9Ci0KLSAgICB2b2lkIGNsZWFyKCkgb3ZlcnJpZGUgeyBjbGVhclJlc291cmNlKCp0 aGlzKTsgfQotICAgIGJvb2wgc2hvdWxkTWFya0FzUmVmZXJlbmNlZCgpIGNvbnN0IG92ZXJyaWRl IHsgcmV0dXJuIGZhbHNlOyB9Ci0KLXByaXZhdGU6CiAgICAgTGlua1ByZWxvYWREZWZhdWx0UmVz b3VyY2VDbGllbnQoTGlua0xvYWRlciYgbG9hZGVyLCBDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2Up CiAgICAgICAgIDogTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudChsb2FkZXIsIHJlc291cmNlKQog ICAgIHsKICAgICAgICAgYWRkUmVzb3VyY2UoKnRoaXMpOwogICAgIH0KKworcHJpdmF0ZToKKyAg ICB2b2lkIG5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkgZmluYWwgeyB0 cmlnZ2VyRXZlbnRzKHJlc291cmNlKTsgfQorICAgIHZvaWQgY2xlYXIoKSBmaW5hbCB7IGNsZWFy UmVzb3VyY2UoKnRoaXMpOyB9CisgICAgYm9vbCBzaG91bGRNYXJrQXNSZWZlcmVuY2VkKCkgY29u c3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKLWNsYXNzIExpbmtQcmVsb2FkU3R5bGVS ZXNvdXJjZUNsaWVudDogcHVibGljIExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQsIHB1YmxpYyBD YWNoZWRTdHlsZVNoZWV0Q2xpZW50IHsKK2NsYXNzIExpbmtQcmVsb2FkU3R5bGVSZXNvdXJjZUNs aWVudCA6IHB1YmxpYyBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50LCBwdWJsaWMgQ2FjaGVkU3R5 bGVTaGVldENsaWVudCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5r UHJlbG9hZFN0eWxlUmVzb3VyY2VDbGllbnQ+IGNyZWF0ZShMaW5rTG9hZGVyJiBsb2FkZXIsIENh Y2hlZENTU1N0eWxlU2hlZXQmIHJlc291cmNlKQorICAgIExpbmtQcmVsb2FkU3R5bGVSZXNvdXJj ZUNsaWVudChMaW5rTG9hZGVyJiBsb2FkZXIsIENhY2hlZENTU1N0eWxlU2hlZXQmIHJlc291cmNl KQorICAgICAgICA6IExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQobG9hZGVyLCByZXNvdXJjZSkK ICAgICB7Ci0gICAgICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWRTdHlsZVJl c291cmNlQ2xpZW50PihuZXcgTGlua1ByZWxvYWRTdHlsZVJlc291cmNlQ2xpZW50KGxvYWRlciwg cmVzb3VyY2UpKTsKKyAgICAgICAgYWRkUmVzb3VyY2UoKnRoaXMpOwogICAgIH0KIAotICAgIHZp cnR1YWwgfkxpbmtQcmVsb2FkU3R5bGVSZXNvdXJjZUNsaWVudCgpID0gZGVmYXVsdDsKLQotICAg IHZvaWQgc2V0Q1NTU3R5bGVTaGVldChjb25zdCBTdHJpbmcmLCBjb25zdCBVUkwmLCBjb25zdCBT dHJpbmcmLCBjb25zdCBDYWNoZWRDU1NTdHlsZVNoZWV0KiByZXNvdXJjZSkgb3ZlcnJpZGUKK3By aXZhdGU6CisgICAgdm9pZCBzZXRDU1NTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYsIGNvbnN0IFVS TCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IENhY2hlZENTU1N0eWxlU2hlZXQqIHJlc291cmNlKSBm aW5hbAogICAgIHsKICAgICAgICAgQVNTRVJUKHJlc291cmNlKTsKICAgICAgICAgQVNTRVJUKG93 bmVkUmVzb3VyY2UoKSA9PSByZXNvdXJjZSk7CiAgICAgICAgIHRyaWdnZXJFdmVudHMoKnJlc291 cmNlKTsKICAgICB9CiAKLSAgICB2b2lkIGNsZWFyKCkgb3ZlcnJpZGUgeyBjbGVhclJlc291cmNl KCp0aGlzKTsgfQotICAgIGJvb2wgc2hvdWxkTWFya0FzUmVmZXJlbmNlZCgpIGNvbnN0IG92ZXJy aWRlIHsgcmV0dXJuIGZhbHNlOyB9Ci0KLXByaXZhdGU6Ci0gICAgTGlua1ByZWxvYWRTdHlsZVJl c291cmNlQ2xpZW50KExpbmtMb2FkZXImIGxvYWRlciwgQ2FjaGVkQ1NTU3R5bGVTaGVldCYgcmVz b3VyY2UpCi0gICAgICAgIDogTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudChsb2FkZXIsIHJlc291 cmNlKQotICAgIHsKLSAgICAgICAgYWRkUmVzb3VyY2UoKnRoaXMpOwotICAgIH0KKyAgICB2b2lk IGNsZWFyKCkgZmluYWwgeyBjbGVhclJlc291cmNlKCp0aGlzKTsgfQorICAgIGJvb2wgc2hvdWxk TWFya0FzUmVmZXJlbmNlZCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGZhbHNlOyB9CiB9OwogCi1j bGFzcyBMaW5rUHJlbG9hZEltYWdlUmVzb3VyY2VDbGllbnQ6IHB1YmxpYyBMaW5rUHJlbG9hZFJl c291cmNlQ2xpZW50LCBwdWJsaWMgQ2FjaGVkSW1hZ2VDbGllbnQgeworY2xhc3MgTGlua1ByZWxv YWRJbWFnZVJlc291cmNlQ2xpZW50IDogcHVibGljIExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQs IHB1YmxpYyBDYWNoZWRJbWFnZUNsaWVudCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5p cXVlX3B0cjxMaW5rUHJlbG9hZEltYWdlUmVzb3VyY2VDbGllbnQ+IGNyZWF0ZShMaW5rTG9hZGVy JiBsb2FkZXIsIENhY2hlZEltYWdlJiByZXNvdXJjZSkKLSAgICB7Ci0gICAgICAgIHJldHVybiBz dGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWRJbWFnZVJlc291cmNlQ2xpZW50PihuZXcgTGlua1By ZWxvYWRJbWFnZVJlc291cmNlQ2xpZW50KGxvYWRlciwgcmVzb3VyY2UpKTsKLSAgICB9Ci0KLSAg ICB2aXJ0dWFsIH5MaW5rUHJlbG9hZEltYWdlUmVzb3VyY2VDbGllbnQoKSA9IGRlZmF1bHQ7Ci0K LSAgICB2b2lkIG5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkgb3ZlcnJp ZGUgeyB0cmlnZ2VyRXZlbnRzKHJlc291cmNlKTsgfQotCi0gICAgdm9pZCBjbGVhcigpIG92ZXJy aWRlIHsgY2xlYXJSZXNvdXJjZSgqdGhpcyk7IH0KLSAgICBib29sIHNob3VsZE1hcmtBc1JlZmVy ZW5jZWQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQotCi1wcml2YXRlOgogICAg IExpbmtQcmVsb2FkSW1hZ2VSZXNvdXJjZUNsaWVudChMaW5rTG9hZGVyJiBsb2FkZXIsIENhY2hl ZEltYWdlJiByZXNvdXJjZSkKLSAgICAgICAgOiBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50KGxv YWRlciwgZHluYW1pY19jYXN0PENhY2hlZFJlc291cmNlJj4ocmVzb3VyY2UpKQorICAgICAgICA6 IExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQobG9hZGVyLCBzdGF0aWNfY2FzdDxDYWNoZWRSZXNv dXJjZSY+KHJlc291cmNlKSkKICAgICB7CiAgICAgICAgIGFkZFJlc291cmNlKCp0aGlzKTsKICAg ICB9CisKK3ByaXZhdGU6CisgICAgdm9pZCBub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSYg cmVzb3VyY2UpIGZpbmFsIHsgdHJpZ2dlckV2ZW50cyhyZXNvdXJjZSk7IH0KKyAgICB2b2lkIGNs ZWFyKCkgZmluYWwgeyBjbGVhclJlc291cmNlKCp0aGlzKTsgfQorICAgIGJvb2wgc2hvdWxkTWFy a0FzUmVmZXJlbmNlZCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGZhbHNlOyB9CiB9OwogCi1jbGFz cyBMaW5rUHJlbG9hZEZvbnRSZXNvdXJjZUNsaWVudDogcHVibGljIExpbmtQcmVsb2FkUmVzb3Vy Y2VDbGllbnQsIHB1YmxpYyBDYWNoZWRGb250Q2xpZW50IHsKK2NsYXNzIExpbmtQcmVsb2FkRm9u dFJlc291cmNlQ2xpZW50IDogcHVibGljIExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQsIHB1Ymxp YyBDYWNoZWRGb250Q2xpZW50IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRy PExpbmtQcmVsb2FkRm9udFJlc291cmNlQ2xpZW50PiBjcmVhdGUoTGlua0xvYWRlciYgbG9hZGVy LCBDYWNoZWRGb250JiByZXNvdXJjZSkKKyAgICBMaW5rUHJlbG9hZEZvbnRSZXNvdXJjZUNsaWVu dChMaW5rTG9hZGVyJiBsb2FkZXIsIENhY2hlZEZvbnQmIHJlc291cmNlKQorICAgICAgICA6IExp bmtQcmVsb2FkUmVzb3VyY2VDbGllbnQobG9hZGVyLCByZXNvdXJjZSkKICAgICB7Ci0gICAgICAg IHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWRGb250UmVzb3VyY2VDbGllbnQ+KG5l dyBMaW5rUHJlbG9hZEZvbnRSZXNvdXJjZUNsaWVudChsb2FkZXIsIHJlc291cmNlKSk7CisgICAg ICAgIGFkZFJlc291cmNlKCp0aGlzKTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIH5MaW5rUHJlbG9h ZEZvbnRSZXNvdXJjZUNsaWVudCgpID0gZGVmYXVsdDsKLQotICAgIHZvaWQgZm9udExvYWRlZChD YWNoZWRGb250JiByZXNvdXJjZSkgb3ZlcnJpZGUKK3ByaXZhdGU6CisgICAgdm9pZCBmb250TG9h ZGVkKENhY2hlZEZvbnQmIHJlc291cmNlKSBmaW5hbAogICAgIHsKICAgICAgICAgQVNTRVJUKG93 bmVkUmVzb3VyY2UoKSA9PSAmcmVzb3VyY2UpOwogICAgICAgICB0cmlnZ2VyRXZlbnRzKHJlc291 cmNlKTsKICAgICB9CiAKLSAgICB2b2lkIGNsZWFyKCkgb3ZlcnJpZGUgeyBjbGVhclJlc291cmNl KCp0aGlzKTsgfQotICAgIGJvb2wgc2hvdWxkTWFya0FzUmVmZXJlbmNlZCgpIGNvbnN0IG92ZXJy aWRlIHsgcmV0dXJuIGZhbHNlOyB9Ci0KLXByaXZhdGU6Ci0gICAgTGlua1ByZWxvYWRGb250UmVz b3VyY2VDbGllbnQoTGlua0xvYWRlciYgbG9hZGVyLCBDYWNoZWRGb250JiByZXNvdXJjZSkKLSAg ICAgICAgOiBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50KGxvYWRlciwgcmVzb3VyY2UpCi0gICAg ewotICAgICAgICBhZGRSZXNvdXJjZSgqdGhpcyk7Ci0gICAgfQorICAgIHZvaWQgY2xlYXIoKSBm aW5hbCB7IGNsZWFyUmVzb3VyY2UoKnRoaXMpOyB9CisgICAgYm9vbCBzaG91bGRNYXJrQXNSZWZl cmVuY2VkKCkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKLWNsYXNzIExpbmtQ cmVsb2FkUmF3UmVzb3VyY2VDbGllbnQ6IHB1YmxpYyBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50 LCBwdWJsaWMgQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQgeworY2xhc3MgTGlua1ByZWxvYWRSYXdS ZXNvdXJjZUNsaWVudCA6IHB1YmxpYyBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50LCBwdWJsaWMg Q2FjaGVkUmF3UmVzb3VyY2VDbGllbnQgewogcHVibGljOgotICAgIHN0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8TGlua1ByZWxvYWRSYXdSZXNvdXJjZUNsaWVudD4gY3JlYXRlKExpbmtMb2FkZXImIGxv YWRlciwgQ2FjaGVkUmF3UmVzb3VyY2UmIHJlc291cmNlKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHN0ZDo6dW5pcXVlX3B0cjxMaW5rUHJlbG9hZFJhd1Jlc291cmNlQ2xpZW50PihuZXcgTGlua1By ZWxvYWRSYXdSZXNvdXJjZUNsaWVudChsb2FkZXIsIHJlc291cmNlKSk7Ci0gICAgfQotCi0gICAg dmlydHVhbCB+TGlua1ByZWxvYWRSYXdSZXNvdXJjZUNsaWVudCgpID0gZGVmYXVsdDsKLQotICAg IHZvaWQgbm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSBvdmVycmlkZSB7 IHRyaWdnZXJFdmVudHMocmVzb3VyY2UpOyB9Ci0KLSAgICB2b2lkIGNsZWFyKCkgb3ZlcnJpZGUg eyBjbGVhclJlc291cmNlKCp0aGlzKTsgfQotICAgIGJvb2wgc2hvdWxkTWFya0FzUmVmZXJlbmNl ZCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9Ci0KLXByaXZhdGU6CiAgICAgTGlu a1ByZWxvYWRSYXdSZXNvdXJjZUNsaWVudChMaW5rTG9hZGVyJiBsb2FkZXIsIENhY2hlZFJhd1Jl c291cmNlJiByZXNvdXJjZSkKICAgICAgICAgOiBMaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50KGxv YWRlciwgcmVzb3VyY2UpCiAgICAgewogICAgICAgICBhZGRSZXNvdXJjZSgqdGhpcyk7CiAgICAg fQorCitwcml2YXRlOgorICAgIHZvaWQgbm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UmIHJl c291cmNlKSBmaW5hbCB7IHRyaWdnZXJFdmVudHMocmVzb3VyY2UpOyB9CisgICAgdm9pZCBjbGVh cigpIGZpbmFsIHsgY2xlYXJSZXNvdXJjZSgqdGhpcyk7IH0KKyAgICBib29sIHNob3VsZE1hcmtB c1JlZmVyZW5jZWQoKSBjb25zdCBmaW5hbCB7IHJldHVybiBmYWxzZTsgfQogfTsKIAogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkv Q0RNQ2xlYXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEv Y2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IDg1NTUxYmY1M2YyNWU4ZGM2NWFiZmJlMjk0 ZDNmYTdiZTc1MDdjOWIuLmNlZDU0NmM2ZDllOWZmYmM0ZTBjOTk5NzQwN2JkYWQ3NmZlMzM5OTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFy a2V5L0NETUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0 ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTI3OSw3ICsyNzksNyBAQCBzdGQ6 OnVuaXF1ZV9wdHI8Q0RNUHJpdmF0ZT4gQ0RNRmFjdG9yeUNsZWFyS2V5OjpjcmVhdGVDRE0oY29u c3QgU3RyaW5nJiBrZXlTeXN0ZQogI2Vsc2UKICAgICBBU1NFUlQoc3VwcG9ydHNLZXlTeXN0ZW0o a2V5U3lzdGVtKSk7CiAjZW5kaWYKLSAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRyPENETVByaXZh dGU+KG5ldyBDRE1Qcml2YXRlQ2xlYXJLZXkpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVl PENETVByaXZhdGVDbGVhcktleT4oKTsKIH0KIAogYm9vbCBDRE1GYWN0b3J5Q2xlYXJLZXk6OnN1 cHBvcnRzS2V5U3lzdGVtKGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akMubW0KaW5kZXggZWE0YzQ3NjQ1MjNjMWJmZWYxMWJlZDM3OTE4MTIwNmIxMGRmMmY3ZC4uYWNi NGFlMzlkN2VhZjI2OGJmYzA0MzMwM2M4NmJlYjU0ZTJjMmI0YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCkBAIC00ODYsNyArNDg2LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDOjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYKIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakMoTWVkaWFQbGF5ZXIqIHBsYXllcikKICAgICA6IE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbihwbGF5ZXIpCiAjaWYgUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAm JiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQotICAgICwgbV92aWRlb0Z1bGxzY3Jl ZW5MYXllck1hbmFnZXIoVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyOjpjcmVhdGUoKSkKKyAg ICAsIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyKHN0ZDo6bWFrZV91bmlxdWU8VmlkZW9G dWxsc2NyZWVuTGF5ZXJNYW5hZ2VyPigpKQogICAgICwgbV92aWRlb0Z1bGxzY3JlZW5HcmF2aXR5 KE1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QpCiAjZW5kaWYKICAgICAsIG1f b2JqY09ic2VydmVyKGFkb3B0TlMoW1tXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBhbGxvY10gaW5p dFdpdGhDYWxsYmFjazp0aGlzXSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJj ZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggMGQ5 MDdkNDY3YjAzNjVjZTExMTg0ZWUwZWYxZGRmZDQzYTNjMGMyZi4uMjcwZWUyOWZjZTY1MzM4Y2Y3 NjI1ODFhYjk3ZTY2ODA5MmY2YmU0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3Vy Y2VBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAt MTM1LDcgKzEzNSw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6TWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDKE1lZGlhCiAgICAgLCBtX3NlZWtpbmco ZmFsc2UpCiAgICAgLCBtX2xvYWRpbmdQcm9ncmVzc2VkKGZhbHNlKQogI2lmIFBMQVRGT1JNKE1B QykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQotICAgICwgbV92aWRlb0Z1bGxz Y3JlZW5MYXllck1hbmFnZXIoVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyOjpjcmVhdGUoKSkK KyAgICAsIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyKHN0ZDo6bWFrZV91bmlxdWU8Vmlk ZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyPigpKQogI2VuZGlmCiB7CiAgICAgQ01UaW1lYmFzZVJl ZiB0aW1lYmFzZSA9IFttX3N5bmNocm9uaXplciB0aW1lYmFzZV07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFW Rk9iakMubW0KaW5kZXggYWU3Y2NlMzMxOTBhMmY1ZWNjYTQwZGRhMjc3YjBhYWY5NmY0ZTBkNi4u OTMxZmIwMDZiMzA4ZTQzZDA3YWFmZTI1Y2U4ZDFmNDA1YzFlZDZhNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQy5tbQpAQCAtMTkyLDcgKzE5Miw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDKE1lZGlh CiAgICAgLCBtX3N0YXR1c0NoYW5nZUxpc3RlbmVyKGFkb3B0TlMoW1tXZWJBVlNhbXBsZUJ1ZmZl clN0YXR1c0NoYW5nZUxpc3RlbmVyIGFsbG9jXSBpbml0V2l0aFBhcmVudDp0aGlzXSkpCiAgICAg LCBtX2Nsb2NrKFBBTDo6Q2xvY2s6OmNyZWF0ZSgpKQogI2lmIFBMQVRGT1JNKElPUykgfHwgKFBM QVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKLSAgICAsIG1f dmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyKFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcjo6 Y3JlYXRlKCkpCisgICAgLCBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcihzdGQ6Om1ha2Vf dW5pcXVlPFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcj4oKSkKICNlbmRpZgogI2lmICFSRUxF QVNFX0xPR19ESVNBQkxFRAogICAgICwgbV9sb2dnZXIocGxheWVyLT5tZWRpYVBsYXllckxvZ2dl cigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRlb0Z1bGxzY3JlZW5MYXll ck1hbmFnZXIuaAppbmRleCBmMWVhZGRkMzYyNDNjMGZmNTQxY2RlZTcyNTA5NmQ2YjhkNTNlNjdh Li42ZThmNDViZDcyNDg1Y2QzZTM3ZDVkOWQ3NDQwNjQ0ZjMxZTQzNDc2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRlb0Z1 bGxzY3JlZW5MYXllck1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXIuaApAQCAt MjMsOCArMjMsNyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0jaWZuZGVmIFZpZGVvRnVsbHNj cmVlbkxheWVyTWFuYWdlcl9oCi0jZGVmaW5lIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcl9o CisjcHJhZ21hIG9uY2UKIAogI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYg RU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKIApAQCAtNDAsNyArMzksNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXIgewogICAg IFdURl9NQUtFX05PTkNPUFlBQkxFKFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcik7CiBwdWJs aWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFn ZXI+IGNyZWF0ZSgpOworICAgIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcigpOwogCiAgICAg UGxhdGZvcm1MYXllciAqdmlkZW9JbmxpbmVMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fdmlkZW9J bmxpbmVMYXllci5nZXQoKTsgfQogICAgIFBsYXRmb3JtTGF5ZXIgKnZpZGVvRnVsbHNjcmVlbkxh eWVyKCkgY29uc3QgeyByZXR1cm4gbV92aWRlb0Z1bGxzY3JlZW5MYXllci5nZXQoKTsgfQpAQCAt NTEsOCArNTAsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWREZXN0cm95VmlkZW9MYXllcigpOwog CiBwcml2YXRlOgotICAgIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcigpOwotCiAgICAgUmV0 YWluUHRyPFBsYXRmb3JtTGF5ZXI+IG1fdmlkZW9JbmxpbmVMYXllcjsKICAgICBSZXRhaW5QdHI8 UGxhdGZvcm1MYXllcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllcjsKICAgICBSZXRhaW5QdHI8UGxh dGZvcm1MYXllcj4gbV92aWRlb0xheWVyOwpAQCAtNjIsNSArNTksMyBAQCBwcml2YXRlOgogfQog CiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklE RU9fUFJFU0VOVEFUSU9OX01PREUpKQotCi0jZW5kaWYgLyogVmlkZW9GdWxsc2NyZWVuTGF5ZXJN YW5hZ2VyX2ggKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL1ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1ZpZGVvRnVsbHNj cmVlbkxheWVyTWFuYWdlci5tbQppbmRleCA2MmQ4ZjEzZjI4MTIxYTAzZWI1NjNmZjViOTI2ZmZl ZWYxMDQyZjdlLi45MjAxMWI0MmJiZTcyNDZlYWYzZWZkNDEwYTg1YWQzZTYxMjM2YTVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9WaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyLm1tCkBAIC01OSwxMSArNTksNiBAQCBAZW5kCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RkOjp1bmlxdWVfcHRyPFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcj4gVmlkZW9GdWxsc2Ny ZWVuTGF5ZXJNYW5hZ2VyOjpjcmVhdGUoKQotewotICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8 VmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyPihuZXcgVmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyKCkpOwotfQotCiBWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXI6OlZpZGVvRnVsbHNjcmVl bkxheWVyTWFuYWdlcigpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCmluZGV4IDJjY2Y0NzA0MzY3NDc0MmZhZTY1 OWExYWM1ZWUzNmNkMGQ5NDlmMDguLmNiN2FiZjMwMWMwZDY2OGVlY2MyYTdjMzEyMjM5M2E1NDI2 NTI0NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXpp bmdBbGdvcml0aG0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tT aXppbmdBbGdvcml0aG0uY3BwCkBAIC02MzksNyArNjM5LDcgQEAgZG91YmxlIEdyaWRUcmFja1Np emluZ0FsZ29yaXRobTo6Y29tcHV0ZUZsZXhGYWN0b3JVbml0U2l6ZShjb25zdCBWZWN0b3I8R3Jp ZFRyYWMKICAgICAgICAgICAgIGxlZnRPdmVyU3BhY2UgLT0gYmFzZVNpemU7CiAgICAgICAgICAg ICBmbGV4RmFjdG9yU3VtIC09IGZsZXhGYWN0b3I7CiAgICAgICAgICAgICBpZiAoIXRyYWNrc1Rv VHJlYXRBc0luZmxleGlibGUpCi0gICAgICAgICAgICAgICAgdHJhY2tzVG9UcmVhdEFzSW5mbGV4 aWJsZSA9IHN0ZDo6dW5pcXVlX3B0cjxUcmFja0luZGV4U2V0PihuZXcgVHJhY2tJbmRleFNldCgp KTsKKyAgICAgICAgICAgICAgICB0cmFja3NUb1RyZWF0QXNJbmZsZXhpYmxlID0gc3RkOjptYWtl X3VuaXF1ZTxUcmFja0luZGV4U2V0PigpOwogICAgICAgICAgICAgdHJhY2tzVG9UcmVhdEFzSW5m bGV4aWJsZS0+YWRkKGluZGV4KTsKICAgICAgICAgICAgIHZhbGlkRmxleEZhY3RvclVuaXQgPSBm YWxzZTsKICAgICAgICAgfQo=