231200 2021-10-04 17:50:02 -0700 Move handling of AXValue from platform wrapper to AX core code. 2021-10-05 11:42:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1800315 0 andresg_22 2021-10-04 17:50:02 -0700 Move handling of AXValue from platform wrapper to AX core code. 1800323 1 440131 andresg_22 2021-10-04 18:00:41 -0700 Created attachment 440131 Patch 1800328 2 440131 cfleizach 2021-10-04 18:06:36 -0700 Comment on attachment 440131 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440131&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:2297 > + [] (bool& typedValue) { return [NSNumber numberWithBool:typedValue]; }, You should be able to use boxed values for bool and float 1800527 3 440202 andresg_22 2021-10-05 05:20:03 -0700 Created attachment 440202 Patch 1800679 4 ews-feeder 2021-10-05 11:41:14 -0700 Committed r283564 (242529@main): <https://commits.webkit.org/242529@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440202. 1800681 5 webkit-bug-importer 2021-10-05 11:42:22 -0700 <rdar://problem/83896403> 440131 2021-10-04 18:00:41 -0700 2021-10-05 05:20:00 -0700 Patch bug-231200-20211004210040.patch text/plain 12247 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVhOTJlZjY1NmFhMDNi YTExZDBkYjQ5ZGJkNWQ3ZDQzZDcwYTc0OC4uNzY4NjQ0ZGZlODJkZDMxNTQ0MTVhNTY5MjNlNWJk MTMyNDZlY2JjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTA0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGhhbmRs aW5nIG9mIEFYVmFsdWUgZnJvbSBwbGF0Zm9ybSB3cmFwcGVyIHRvIEFYIGNvcmUgY29kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTIwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBp biBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgIE1vdmVkIGhhbmRsaW5nIG9mIHRoZSBBWFZhbHVl IChOU0FjY2Vzc2liaWxpdHlWYWx1ZUF0dHJpYnV0ZSkgZnJvbSB0aGUKKyAgICAgICAgTWFjIHdy YXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlIGhhbmRsZXIgdG8gQVhDb3JlT2JqZWN0 Ojp2YWx1ZS4KKyAgICAgICAgVGhpcyBtYWtlcyBwb3NzaWJsZSB0byBzaGFyZSB0aGlzIGNvZGUg YWNyb3NzIG11bHRpcGxlIHBsYXRmb3Jtcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eU5vZGVPYmplY3Q6OmhlYWRpbmdMZXZlbCBjb25zdCk6CisgICAgICAgIFJldHVybnMgdW5zaWdu ZWQgaW5zdGVhZCBvZiBpbnQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojp2YWx1ZSk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmg6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgor ICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0 cmlidXRlVmFsdWU6XSk6CisKIDIwMjEtMTAtMDQgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxp YS5jb20+CiAKICAgICAgICAgRml4IExUUyBidWlsZCBhZnRlciAyNDI0NDNAbWFpbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2Jq ZWN0LmNwcAppbmRleCA1MzAyNTNkZmJjOTE1OWIzZjRhMTBkYWZjZmM5OWQ1NTcyYTU2ZTc1Li43 M2I3OWNiZTAzNzllOGEwNTE5ZmY3ZTUwMWI1NzlkNWVhYTIxZDY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNw cApAQCAtNzY2LDEyICs3NjYsMTIgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6c3Vw cG9ydHNSZXF1aXJlZEF0dHJpYnV0ZSgpIGNvbnN0CiAgICAgfQogfQogCi1pbnQgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OmhlYWRpbmdMZXZlbCgpIGNvbnN0Cit1bnNpZ25lZCBBY2Nlc3NpYmls aXR5Tm9kZU9iamVjdDo6aGVhZGluZ0xldmVsKCkgY29uc3QKIHsKICAgICAvLyBoZWFkaW5ncyBj YW4gYmUgaW4gYmxvY2sgZmxvdyBhbmQgbm9uLWJsb2NrIGZsb3cKICAgICBOb2RlKiBub2RlID0g dGhpcy0+bm9kZSgpOwogICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICByZXR1cm4gMDsKIAogICAgIGlmIChpc0hlYWRpbmcoKSkgewogICAgICAgICBpZiAoYXV0 byBsZXZlbCA9IGdldEludGVncmFsQXR0cmlidXRlKGFyaWFfbGV2ZWxBdHRyKTsgbGV2ZWwgPiAw KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oCmluZGV4IDI4YzdkYWRjNTZiODc2ZDNmZDk0NzQ2YjhjMWQ1NzIwZjE5YmNm NDYuLjQwYTQyOWE2MDAzNWYyZWI0MGVjMDlhYmQ5Mzg5NWYwZTZjNTViNmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 LmgKQEAgLTkwLDcgKzkwLDcgQEAgcHVibGljOgogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNv bnN0IG92ZXJyaWRlOwogCiAgICAgYm9vbCBjYW5TZXRGb2N1c0F0dHJpYnV0ZSgpIGNvbnN0IG92 ZXJyaWRlOwotICAgIGludCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlkZTsKKyAgICB1bnNp Z25lZCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIGJvb2wgY2FuU2V0VmFs dWVBdHRyaWJ1dGUoKSBjb25zdCBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNTA2OTRhOThkM2Fh OGQ3OWIyYjEyNDY3M2FkMzlmNmMzNTY0NDJjMy4uZWY3ZDI3NjU0ZDk3MGQ3M2ZmNTJlMjg1YWZi ZDkzN2M2MDkyNGNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xODksNyArMTg5LDM5IEBAIGJvb2wgQWNjZXNz aWJpbGl0eU9iamVjdDo6YWNjZXNzaWJsZU5hbWVEZXJpdmVzRnJvbUNvbnRlbnQoKSBjb25zdAog ICAgIAogICAgIHJldHVybiB0cnVlOwogfQotICAgIAorCitBWENvcmVPYmplY3Q6OkFYVmFsdWUg QWNjZXNzaWJpbGl0eU9iamVjdDo6dmFsdWUoKQoreworICAgIGlmIChzdXBwb3J0c1JhbmdlVmFs dWUoKSkKKyAgICAgICAgcmV0dXJuIHZhbHVlRm9yUmFuZ2UoKTsKKworICAgIGlmIChyb2xlVmFs dWUoKSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6U2xpZGVyVGh1bWIpCisgICAgICAgIHJldHVybiBw YXJlbnRPYmplY3QoKS0+dmFsdWVGb3JSYW5nZSgpOworCisgICAgaWYgKGlzSGVhZGluZygpKQor ICAgICAgICByZXR1cm4gaGVhZGluZ0xldmVsKCk7CisKKyAgICBpZiAoc3VwcG9ydHNDaGVja2Vk U3RhdGUoKSkKKyAgICAgICAgcmV0dXJuIGNoZWNrYm94T3JSYWRpb1ZhbHVlKCk7CisKKyAgICAv LyBSYWRpbyBncm91cHMgcmV0dXJuIHRoZSBzZWxlY3RlZCByYWRpbyBidXR0b24gYXMgdGhlIEFY VmFsdWUuCisgICAgaWYgKGlzUmFkaW9Hcm91cCgpKQorICAgICAgICByZXR1cm4gc2VsZWN0ZWRS YWRpb0J1dHRvbigpOworCisgICAgaWYgKGlzVGFiTGlzdCgpKQorICAgICAgICByZXR1cm4gc2Vs ZWN0ZWRUYWJJdGVtKCk7CisKKyAgICBpZiAoaXNUYWJJdGVtKCkpCisgICAgICAgIHJldHVybiBp c1NlbGVjdGVkKCk7CisKKyAgICBpZiAoaXNDb2xvcldlbGwoKSkgeworICAgICAgICBhdXRvIGNv bG9yID0gY29udmVydENvbG9yPFNSR0JBPGZsb2F0Pj4oY29sb3JWYWx1ZSgpKTsKKyAgICAgICAg cmV0dXJuIG1ha2VTdHJpbmcoInJnYiAiLCBTdHJpbmc6Om51bWJlclRvU3RyaW5nRml4ZWRQcmVj aXNpb24oY29sb3IucmVkLCA2LCBLZWVwVHJhaWxpbmdaZXJvcyksICIgIiwgU3RyaW5nOjpudW1i ZXJUb1N0cmluZ0ZpeGVkUHJlY2lzaW9uKGNvbG9yLmdyZWVuLCA2LCBLZWVwVHJhaWxpbmdaZXJv cyksICIgIiwgU3RyaW5nOjpudW1iZXJUb1N0cmluZ0ZpeGVkUHJlY2lzaW9uKGNvbG9yLmJsdWUs IDYsIEtlZXBUcmFpbGluZ1plcm9zKSwgIiAxIik7CisgICAgfQorCisgICAgcmV0dXJuIHN0cmlu Z1ZhbHVlKCk7Cit9CisKIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpjb21wdXRlZExhYmVs KCkKIHsKICAgICAvLyBUaGlzIG1ldGhvZCBpcyBiZWluZyBjYWxsZWQgYnkgV2ViS2l0IGluc3Bl Y3Rvciwgd2hpY2ggbWF5IGhhcHBlbiBhdCBhbnkgdGltZSwgc28gd2UgbmVlZCB0byB1cGRhdGUg b3VyIGJhY2tpbmcgc3RvcmUgbm93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA2MmQyOWZlZGNlY2Y1MDcxMDdhNzE4OTlm NzA0ZmJkMjdmYmNlMTk1Li42NTQ0MTZhMTdiNDk1YzMyNTcyYWZkMjc2NDg1Y2I2NTQwOTZmZjZl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaApAQCAtMjYzLDcgKzI2Myw3IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgdmFsaWRhdGlv bk1lc3NhZ2UoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHVuc2lnbmVkIGJsb2NrcXVvdGVMZXZl bCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIGludCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiAwOyB9CisgICAgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gMDsgfQogICAgIEFjY2Vzc2liaWxpdHlCdXR0b25TdGF0ZSBjaGVja2JveE9y UmFkaW9WYWx1ZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyB2YWx1ZURlc2NyaXB0aW9u KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICBmbG9hdCB2YWx1ZUZv clJhbmdlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gMC4wZjsgfQpAQCAtMzczLDYgKzM3Myw4 IEBAIHB1YmxpYzoKICAgICBib29sIGFyaWFSb2xlSGFzUHJlc2VudGF0aW9uYWxDaGlsZHJlbigp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgYm9vbCBpbmhlcml0c1ByZXNl bnRhdGlvbmFsUm9sZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAgICBB WFZhbHVlIHZhbHVlKCkgb3ZlcnJpZGU7CisKICAgICAvLyBBY2Nlc3NpYmlsaXR5IFRleHQKICAg ICB2b2lkIGFjY2Vzc2liaWxpdHlUZXh0KFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4mKSBjb25z dCBvdmVycmlkZSB7IH07CiAgICAgLy8gQSBzaW5nbGUgbWV0aG9kIGZvciBnZXR0aW5nIGEgY29t cHV0ZWQgbGFiZWwgZm9yIGFuIEFYT2JqZWN0LiBJdCBjb25kZW5zZXMgdGhlIG51YW5jZXMgb2Yg YWNjZXNzaWJpbGl0eVRleHQuIFVzZWQgYnkgSW5zcGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAppbmRleCA1YWEwZDJiZmI1YmYyZjRlZmYzNTU3NjFkYjdjZDdiMGM3OWNhZmU5Li4zZDg2ZjJl YTNmMGJlZTc2YjhjNzZiYzBlZmJjMDYxOWExMGIxNDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aApAQCAtMTAxMCw3ICsxMDEwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIHZhbGlk YXRpb25NZXNzYWdlKCkgY29uc3QgPSAwOwogCiAgICAgdmlydHVhbCB1bnNpZ25lZCBibG9ja3F1 b3RlTGV2ZWwoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgaGVhZGluZ0xldmVsKCkgY29u c3QgPSAwOworICAgIHZpcnR1YWwgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eUJ1dHRvblN0YXRlIGNoZWNrYm94T3JSYWRpb1ZhbHVl KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgU3RyaW5nIHZhbHVlRGVzY3JpcHRpb24oKSBjb25z dCA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCB2YWx1ZUZvclJhbmdlKCkgY29uc3QgPSAwOwpAQCAt MTExOSw2ICsxMTE5LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBhcmlhUm9sZUhhc1By ZXNlbnRhdGlvbmFsQ2hpbGRyZW4oKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIGluaGVy aXRzUHJlc2VudGF0aW9uYWxSb2xlKCkgY29uc3QgPSAwOwogCisgICAgdXNpbmcgQVhWYWx1ZSA9 IFZhcmlhbnQ8Ym9vbCwgdW5zaWduZWQsIGZsb2F0LCBTdHJpbmcsIEFjY2Vzc2liaWxpdHlCdXR0 b25TdGF0ZSwgQVhDb3JlT2JqZWN0Kj47CisgICAgdmlydHVhbCBBWFZhbHVlIHZhbHVlKCkgPSAw OworCiAgICAgLy8gQWNjZXNzaWJpbGl0eSBUZXh0CiAgICAgdmlydHVhbCB2b2lkIGFjY2Vzc2li aWxpdHlUZXh0KFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4mKSBjb25zdCA9IDA7CiAgICAgLy8g QSBzaW5nbGUgbWV0aG9kIGZvciBnZXR0aW5nIGEgY29tcHV0ZWQgbGFiZWwgZm9yIGFuIEFYT2Jq ZWN0LiBJdCBjb25kZW5zZXMgdGhlIG51YW5jZXMgb2YgYWNjZXNzaWJpbGl0eVRleHQuIFVzZWQg YnkgSW5zcGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IGJkZGI2ODRkMTk2OTg2 YTI0MTcwYzM2Mzg2MTk2MDcyN2IzMTA3YWIuLmEwNmNiYWM2OGQ0OTg3NDU5OWZlMDRiNWNjNjgx OWU4NmRmMGM5NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAgLTIxMSw3ICsyMTEsNyBA QCBwcml2YXRlOgogICAgIGJvb2wgaXNTaG93aW5nVmFsaWRhdGlvbk1lc3NhZ2UoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiBib29sQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OklzU2hv d2luZ1ZhbGlkYXRpb25NZXNzYWdlKTsgfQogICAgIFN0cmluZyB2YWxpZGF0aW9uTWVzc2FnZSgp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlO YW1lOjpWYWxpZGF0aW9uTWVzc2FnZSk7IH0KICAgICB1bnNpZ25lZCBibG9ja3F1b3RlTGV2ZWwo KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB1bnNpZ25lZEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVy dHlOYW1lOjpCbG9ja3F1b3RlTGV2ZWwpOyB9Ci0gICAgaW50IGhlYWRpbmdMZXZlbCgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpIZWFk aW5nTGV2ZWwpOyB9CisgICAgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gaW50QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkhlYWRpbmdMZXZlbCk7 IH0KICAgICBBY2Nlc3NpYmlsaXR5QnV0dG9uU3RhdGUgY2hlY2tib3hPclJhZGlvVmFsdWUoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5QnV0dG9uU3Rh dGU+KGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5QnV0dG9u U3RhdGUpKTsgfQogICAgIFN0cmluZyB2YWx1ZURlc2NyaXB0aW9uKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OlZhbHVlRGVzY3Jp cHRpb24pOyB9CiAgICAgZmxvYXQgdmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIGZsb2F0QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OlZhbHVlRm9yUmFuZ2UpOyB9 CkBAIC0yNzQsNiArMjc0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRSZWN0IGJvdW5kaW5nQm94 UmVjdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHJlY3RBdHRyaWJ1dGVWYWx1ZTxMYXlvdXRS ZWN0PihBWFByb3BlcnR5TmFtZTo6Qm91bmRpbmdCb3hSZWN0KTsgfQogICAgIExheW91dFJlY3Qg ZWxlbWVudFJlY3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiByZWN0QXR0cmlidXRlVmFsdWU8 TGF5b3V0UmVjdD4oQVhQcm9wZXJ0eU5hbWU6OkVsZW1lbnRSZWN0KTsgfQogICAgIEludFBvaW50 IGNsaWNrUG9pbnQoKSBvdmVycmlkZSB7IHJldHVybiBpbnRQb2ludEF0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lOjpDbGlja1BvaW50KTsgfQorICAgIEFYVmFsdWUgdmFsdWUoKSBvdmVycmlk ZSB7IHJldHVybiB7IH07IH0KICAgICB2b2lkIGFjY2Vzc2liaWxpdHlUZXh0KFZlY3RvcjxBY2Nl c3NpYmlsaXR5VGV4dD4mIHRleHRzKSBjb25zdCBvdmVycmlkZTsKICAgICBTdHJpbmcgYnJhaWxs ZUxhYmVsKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQ cm9wZXJ0eU5hbWU6OkJyYWlsbGVMYWJlbCk7IH0KICAgICBTdHJpbmcgYnJhaWxsZVJvbGVEZXNj cmlwdGlvbigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lOjpCcmFpbGxlUm9sZURlc2NyaXB0aW9uKTsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCBiOWM3ZmJkOThhY2FjMjhlZDE5ZDJmNWExNDNl MTkzZDRlOWY4ZWM5Li41N2Y3MzExMTdjZDA5YjgyNzJhZmU0OWU5Y2RjNWY1NzJjYjFkYzg0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjI5MSw0OCArMjI5 MSwxNyBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgICAg IGlmIChbW1tzZWxmIGF0dGFjaG1lbnRWaWV3XSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlTmFtZXNd IGNvbnRhaW5zT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eVZhbHVlQXR0cmlidXRlXSkKICAgICAgICAg ICAgICAgICByZXR1cm4gW1tzZWxmIGF0dGFjaG1lbnRWaWV3XSBhY2Nlc3NpYmlsaXR5QXR0cmli dXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdOwogICAgICAgICB9Ci0gICAg ICAgIGlmIChiYWNraW5nT2JqZWN0LT5zdXBwb3J0c1JhbmdlVmFsdWUoKSkKLSAgICAgICAgICAg IHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmJhY2tpbmdPYmplY3QtPnZhbHVlRm9y UmFuZ2UoKV07Ci0gICAgICAgIGlmIChiYWNraW5nT2JqZWN0LT5yb2xlVmFsdWUoKSA9PSBBY2Nl c3NpYmlsaXR5Um9sZTo6U2xpZGVyVGh1bWIpCi0gICAgICAgICAgICByZXR1cm4gW05TTnVtYmVy IG51bWJlcldpdGhGbG9hdDpiYWNraW5nT2JqZWN0LT5wYXJlbnRPYmplY3QoKS0+dmFsdWVGb3JS YW5nZSgpXTsKLSAgICAgICAgaWYgKGJhY2tpbmdPYmplY3QtPmlzSGVhZGluZygpKQotICAgICAg ICAgICAgcmV0dXJuIEAoYmFja2luZ09iamVjdC0+aGVhZGluZ0xldmVsKCkpOwotCi0gICAgICAg IGlmIChiYWNraW5nT2JqZWN0LT5zdXBwb3J0c0NoZWNrZWRTdGF0ZSgpKSB7Ci0gICAgICAgICAg ICBzd2l0Y2ggKGJhY2tpbmdPYmplY3QtPmNoZWNrYm94T3JSYWRpb1ZhbHVlKCkpIHsKLSAgICAg ICAgICAgIGNhc2UgQWNjZXNzaWJpbGl0eUJ1dHRvblN0YXRlOjpPZmY6Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIEAoMCk7Ci0gICAgICAgICAgICBjYXNlIEFjY2Vzc2liaWxpdHlCdXR0b25TdGF0 ZTo6T246Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEAoMSk7Ci0gICAgICAgICAgICBjYXNlIEFj Y2Vzc2liaWxpdHlCdXR0b25TdGF0ZTo6TWl4ZWQ6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEAo Mik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICAvLyByYWRpbyBncm91cHMg cmV0dXJuIHRoZSBzZWxlY3RlZCByYWRpbyBidXR0b24gYXMgdGhlIEFYVmFsdWUKLSAgICAgICAg aWYgKGJhY2tpbmdPYmplY3QtPmlzUmFkaW9Hcm91cCgpKSB7Ci0gICAgICAgICAgICBBWENvcmVP YmplY3QqIHJhZGlvQnV0dG9uID0gYmFja2luZ09iamVjdC0+c2VsZWN0ZWRSYWRpb0J1dHRvbigp OwotICAgICAgICAgICAgaWYgKCFyYWRpb0J1dHRvbikKLSAgICAgICAgICAgICAgICByZXR1cm4g bmlsOwotICAgICAgICAgICAgcmV0dXJuIHJhZGlvQnV0dG9uLT53cmFwcGVyKCk7Ci0gICAgICAg IH0KLQotICAgICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNUYWJMaXN0KCkpIHsKLSAgICAgICAg ICAgIEFYQ29yZU9iamVjdCogdGFiSXRlbSA9IGJhY2tpbmdPYmplY3QtPnNlbGVjdGVkVGFiSXRl bSgpOwotICAgICAgICAgICAgaWYgKCF0YWJJdGVtKQotICAgICAgICAgICAgICAgIHJldHVybiBu aWw7Ci0gICAgICAgICAgICByZXR1cm4gdGFiSXRlbS0+d3JhcHBlcigpOwotICAgICAgICB9Ci0K LSAgICAgICAgaWYgKGJhY2tpbmdPYmplY3QtPmlzVGFiSXRlbSgpKQotICAgICAgICAgICAgcmV0 dXJuIEAoYmFja2luZ09iamVjdC0+aXNTZWxlY3RlZCgpKTsKLQotICAgICAgICBpZiAoYmFja2lu Z09iamVjdC0+aXNDb2xvcldlbGwoKSkgewotICAgICAgICAgICAgYXV0byBjb2xvciA9IGNvbnZl cnRDb2xvcjxTUkdCQTxmbG9hdD4+KGJhY2tpbmdPYmplY3QtPmNvbG9yVmFsdWUoKSk7Ci0gICAg ICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJyZ2IgJTcuNWYgJTcu NWYgJTcuNWYgMSIsIGNvbG9yLnJlZCwgY29sb3IuZ3JlZW4sIGNvbG9yLmJsdWVdOwotICAgICAg ICB9CiAKLSAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPnN0cmluZ1ZhbHVlKCk7CisgICAg ICAgIGF1dG8gdmFsdWUgPSBiYWNraW5nT2JqZWN0LT52YWx1ZSgpOworICAgICAgICByZXR1cm4g V1RGOjpzd2l0Y2hPbih2YWx1ZSwKKyAgICAgICAgICAgIFtdIChib29sJiB0eXBlZFZhbHVlKSB7 IHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6dHlwZWRWYWx1ZV07IH0sCisgICAgICAg ICAgICBbXSAodW5zaWduZWQmIHR5cGVkVmFsdWUpIHsgcmV0dXJuIEAodHlwZWRWYWx1ZSk7IH0s CisgICAgICAgICAgICBbXSAoZmxvYXQmIHR5cGVkVmFsdWUpIHsgcmV0dXJuIFtOU051bWJlciBu dW1iZXJXaXRoRmxvYXQ6dHlwZWRWYWx1ZV07IH0sCisgICAgICAgICAgICBbXSAoU3RyaW5nJiB0 eXBlZFZhbHVlKSB7IHJldHVybiAoaWQpKE5TU3RyaW5nICopdHlwZWRWYWx1ZTsgfSwKKyAgICAg ICAgICAgIFtdIChBY2Nlc3NpYmlsaXR5QnV0dG9uU3RhdGUmIHR5cGVkVmFsdWUpIHsgcmV0dXJu IEAoKHVuc2lnbmVkKXR5cGVkVmFsdWUpOyB9LAorICAgICAgICAgICAgW10gKEFYQ29yZU9iamVj dComIHR5cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWUgPyAoaWQpdHlwZWRWYWx1ZS0+d3Jh cHBlcigpIDogbmlsOyB9LAorICAgICAgICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBuaWw7IH0K KyAgICAgICAgKTsKICAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3Ry aW5nOihOU1N0cmluZyAqKWtBWE1lbnVJdGVtTWFya0NoYXJBdHRyaWJ1dGVdKSB7Cg== 440202 2021-10-05 05:20:03 -0700 2021-10-05 11:41:15 -0700 Patch bug-231200-20211005082002.patch text/plain 12200 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVhOTJlZjY1NmFhMDNi YTExZDBkYjQ5ZGJkNWQ3ZDQzZDcwYTc0OC4uNDZjYjQzNWEzMGNiMGE1ZGMwZDRiNTBmNWM3MDBl OTBhOGU1NjRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTA0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGhhbmRs aW5nIG9mIEFYVmFsdWUgZnJvbSBwbGF0Zm9ybSB3cmFwcGVyIHRvIEFYIGNvcmUgY29kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTIwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIEZsZWl6YWNoLgorCisgICAgICAgIE5vIGNoYW5nZSBp biBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgIE1vdmVkIGhhbmRsaW5nIG9mIHRoZSBBWFZhbHVl IChOU0FjY2Vzc2liaWxpdHlWYWx1ZUF0dHJpYnV0ZSkgZnJvbSB0aGUKKyAgICAgICAgTWFjIHdy YXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlIGhhbmRsZXIgdG8gQVhDb3JlT2JqZWN0 Ojp2YWx1ZS4KKyAgICAgICAgVGhpcyBtYWtlcyBwb3NzaWJsZSB0byBzaGFyZSB0aGlzIGNvZGUg YWNyb3NzIG11bHRpcGxlIHBsYXRmb3Jtcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eU5vZGVPYmplY3Q6OmhlYWRpbmdMZXZlbCBjb25zdCk6CisgICAgICAgIFJldHVybnMgdW5zaWdu ZWQgaW5zdGVhZCBvZiBpbnQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojp2YWx1ZSk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmg6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgor ICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0 cmlidXRlVmFsdWU6XSk6CisKIDIwMjEtMTAtMDQgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxp YS5jb20+CiAKICAgICAgICAgRml4IExUUyBidWlsZCBhZnRlciAyNDI0NDNAbWFpbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2Jq ZWN0LmNwcAppbmRleCA1MzAyNTNkZmJjOTE1OWIzZjRhMTBkYWZjZmM5OWQ1NTcyYTU2ZTc1Li43 M2I3OWNiZTAzNzllOGEwNTE5ZmY3ZTUwMWI1NzlkNWVhYTIxZDY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNw cApAQCAtNzY2LDEyICs3NjYsMTIgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6c3Vw cG9ydHNSZXF1aXJlZEF0dHJpYnV0ZSgpIGNvbnN0CiAgICAgfQogfQogCi1pbnQgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OmhlYWRpbmdMZXZlbCgpIGNvbnN0Cit1bnNpZ25lZCBBY2Nlc3NpYmls aXR5Tm9kZU9iamVjdDo6aGVhZGluZ0xldmVsKCkgY29uc3QKIHsKICAgICAvLyBoZWFkaW5ncyBj YW4gYmUgaW4gYmxvY2sgZmxvdyBhbmQgbm9uLWJsb2NrIGZsb3cKICAgICBOb2RlKiBub2RlID0g dGhpcy0+bm9kZSgpOwogICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICByZXR1cm4gMDsKIAogICAgIGlmIChpc0hlYWRpbmcoKSkgewogICAgICAgICBpZiAoYXV0 byBsZXZlbCA9IGdldEludGVncmFsQXR0cmlidXRlKGFyaWFfbGV2ZWxBdHRyKTsgbGV2ZWwgPiAw KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5oCmluZGV4IDI4YzdkYWRjNTZiODc2ZDNmZDk0NzQ2YjhjMWQ1NzIwZjE5YmNm NDYuLjQwYTQyOWE2MDAzNWYyZWI0MGVjMDlhYmQ5Mzg5NWYwZTZjNTViNmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 LmgKQEAgLTkwLDcgKzkwLDcgQEAgcHVibGljOgogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNv bnN0IG92ZXJyaWRlOwogCiAgICAgYm9vbCBjYW5TZXRGb2N1c0F0dHJpYnV0ZSgpIGNvbnN0IG92 ZXJyaWRlOwotICAgIGludCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlkZTsKKyAgICB1bnNp Z25lZCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIGJvb2wgY2FuU2V0VmFs dWVBdHRyaWJ1dGUoKSBjb25zdCBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNTA2OTRhOThkM2Fh OGQ3OWIyYjEyNDY3M2FkMzlmNmMzNTY0NDJjMy4uZWY3ZDI3NjU0ZDk3MGQ3M2ZmNTJlMjg1YWZi ZDkzN2M2MDkyNGNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xODksNyArMTg5LDM5IEBAIGJvb2wgQWNjZXNz aWJpbGl0eU9iamVjdDo6YWNjZXNzaWJsZU5hbWVEZXJpdmVzRnJvbUNvbnRlbnQoKSBjb25zdAog ICAgIAogICAgIHJldHVybiB0cnVlOwogfQotICAgIAorCitBWENvcmVPYmplY3Q6OkFYVmFsdWUg QWNjZXNzaWJpbGl0eU9iamVjdDo6dmFsdWUoKQoreworICAgIGlmIChzdXBwb3J0c1JhbmdlVmFs dWUoKSkKKyAgICAgICAgcmV0dXJuIHZhbHVlRm9yUmFuZ2UoKTsKKworICAgIGlmIChyb2xlVmFs dWUoKSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6U2xpZGVyVGh1bWIpCisgICAgICAgIHJldHVybiBw YXJlbnRPYmplY3QoKS0+dmFsdWVGb3JSYW5nZSgpOworCisgICAgaWYgKGlzSGVhZGluZygpKQor ICAgICAgICByZXR1cm4gaGVhZGluZ0xldmVsKCk7CisKKyAgICBpZiAoc3VwcG9ydHNDaGVja2Vk U3RhdGUoKSkKKyAgICAgICAgcmV0dXJuIGNoZWNrYm94T3JSYWRpb1ZhbHVlKCk7CisKKyAgICAv LyBSYWRpbyBncm91cHMgcmV0dXJuIHRoZSBzZWxlY3RlZCByYWRpbyBidXR0b24gYXMgdGhlIEFY VmFsdWUuCisgICAgaWYgKGlzUmFkaW9Hcm91cCgpKQorICAgICAgICByZXR1cm4gc2VsZWN0ZWRS YWRpb0J1dHRvbigpOworCisgICAgaWYgKGlzVGFiTGlzdCgpKQorICAgICAgICByZXR1cm4gc2Vs ZWN0ZWRUYWJJdGVtKCk7CisKKyAgICBpZiAoaXNUYWJJdGVtKCkpCisgICAgICAgIHJldHVybiBp c1NlbGVjdGVkKCk7CisKKyAgICBpZiAoaXNDb2xvcldlbGwoKSkgeworICAgICAgICBhdXRvIGNv bG9yID0gY29udmVydENvbG9yPFNSR0JBPGZsb2F0Pj4oY29sb3JWYWx1ZSgpKTsKKyAgICAgICAg cmV0dXJuIG1ha2VTdHJpbmcoInJnYiAiLCBTdHJpbmc6Om51bWJlclRvU3RyaW5nRml4ZWRQcmVj aXNpb24oY29sb3IucmVkLCA2LCBLZWVwVHJhaWxpbmdaZXJvcyksICIgIiwgU3RyaW5nOjpudW1i ZXJUb1N0cmluZ0ZpeGVkUHJlY2lzaW9uKGNvbG9yLmdyZWVuLCA2LCBLZWVwVHJhaWxpbmdaZXJv cyksICIgIiwgU3RyaW5nOjpudW1iZXJUb1N0cmluZ0ZpeGVkUHJlY2lzaW9uKGNvbG9yLmJsdWUs IDYsIEtlZXBUcmFpbGluZ1plcm9zKSwgIiAxIik7CisgICAgfQorCisgICAgcmV0dXJuIHN0cmlu Z1ZhbHVlKCk7Cit9CisKIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpjb21wdXRlZExhYmVs KCkKIHsKICAgICAvLyBUaGlzIG1ldGhvZCBpcyBiZWluZyBjYWxsZWQgYnkgV2ViS2l0IGluc3Bl Y3Rvciwgd2hpY2ggbWF5IGhhcHBlbiBhdCBhbnkgdGltZSwgc28gd2UgbmVlZCB0byB1cGRhdGUg b3VyIGJhY2tpbmcgc3RvcmUgbm93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA2MmQyOWZlZGNlY2Y1MDcxMDdhNzE4OTlm NzA0ZmJkMjdmYmNlMTk1Li42NTQ0MTZhMTdiNDk1YzMyNTcyYWZkMjc2NDg1Y2I2NTQwOTZmZjZl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaApAQCAtMjYzLDcgKzI2Myw3IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgdmFsaWRhdGlv bk1lc3NhZ2UoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHVuc2lnbmVkIGJsb2NrcXVvdGVMZXZl bCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIGludCBoZWFkaW5nTGV2ZWwoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiAwOyB9CisgICAgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gMDsgfQogICAgIEFjY2Vzc2liaWxpdHlCdXR0b25TdGF0ZSBjaGVja2JveE9y UmFkaW9WYWx1ZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyB2YWx1ZURlc2NyaXB0aW9u KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICBmbG9hdCB2YWx1ZUZv clJhbmdlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gMC4wZjsgfQpAQCAtMzczLDYgKzM3Myw4 IEBAIHB1YmxpYzoKICAgICBib29sIGFyaWFSb2xlSGFzUHJlc2VudGF0aW9uYWxDaGlsZHJlbigp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgYm9vbCBpbmhlcml0c1ByZXNl bnRhdGlvbmFsUm9sZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAgICBB WFZhbHVlIHZhbHVlKCkgb3ZlcnJpZGU7CisKICAgICAvLyBBY2Nlc3NpYmlsaXR5IFRleHQKICAg ICB2b2lkIGFjY2Vzc2liaWxpdHlUZXh0KFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4mKSBjb25z dCBvdmVycmlkZSB7IH07CiAgICAgLy8gQSBzaW5nbGUgbWV0aG9kIGZvciBnZXR0aW5nIGEgY29t cHV0ZWQgbGFiZWwgZm9yIGFuIEFYT2JqZWN0LiBJdCBjb25kZW5zZXMgdGhlIG51YW5jZXMgb2Yg YWNjZXNzaWJpbGl0eVRleHQuIFVzZWQgYnkgSW5zcGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAppbmRleCA1YWEwZDJiZmI1YmYyZjRlZmYzNTU3NjFkYjdjZDdiMGM3OWNhZmU5Li4zZDg2ZjJl YTNmMGJlZTc2YjhjNzZiYzBlZmJjMDYxOWExMGIxNDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aApAQCAtMTAxMCw3ICsxMDEwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIHZhbGlk YXRpb25NZXNzYWdlKCkgY29uc3QgPSAwOwogCiAgICAgdmlydHVhbCB1bnNpZ25lZCBibG9ja3F1 b3RlTGV2ZWwoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgaGVhZGluZ0xldmVsKCkgY29u c3QgPSAwOworICAgIHZpcnR1YWwgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eUJ1dHRvblN0YXRlIGNoZWNrYm94T3JSYWRpb1ZhbHVl KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgU3RyaW5nIHZhbHVlRGVzY3JpcHRpb24oKSBjb25z dCA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCB2YWx1ZUZvclJhbmdlKCkgY29uc3QgPSAwOwpAQCAt MTExOSw2ICsxMTE5LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBhcmlhUm9sZUhhc1By ZXNlbnRhdGlvbmFsQ2hpbGRyZW4oKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIGluaGVy aXRzUHJlc2VudGF0aW9uYWxSb2xlKCkgY29uc3QgPSAwOwogCisgICAgdXNpbmcgQVhWYWx1ZSA9 IFZhcmlhbnQ8Ym9vbCwgdW5zaWduZWQsIGZsb2F0LCBTdHJpbmcsIEFjY2Vzc2liaWxpdHlCdXR0 b25TdGF0ZSwgQVhDb3JlT2JqZWN0Kj47CisgICAgdmlydHVhbCBBWFZhbHVlIHZhbHVlKCkgPSAw OworCiAgICAgLy8gQWNjZXNzaWJpbGl0eSBUZXh0CiAgICAgdmlydHVhbCB2b2lkIGFjY2Vzc2li aWxpdHlUZXh0KFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4mKSBjb25zdCA9IDA7CiAgICAgLy8g QSBzaW5nbGUgbWV0aG9kIGZvciBnZXR0aW5nIGEgY29tcHV0ZWQgbGFiZWwgZm9yIGFuIEFYT2Jq ZWN0LiBJdCBjb25kZW5zZXMgdGhlIG51YW5jZXMgb2YgYWNjZXNzaWJpbGl0eVRleHQuIFVzZWQg YnkgSW5zcGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IGJkZGI2ODRkMTk2OTg2 YTI0MTcwYzM2Mzg2MTk2MDcyN2IzMTA3YWIuLmEwNmNiYWM2OGQ0OTg3NDU5OWZlMDRiNWNjNjgx OWU4NmRmMGM5NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAgLTIxMSw3ICsyMTEsNyBA QCBwcml2YXRlOgogICAgIGJvb2wgaXNTaG93aW5nVmFsaWRhdGlvbk1lc3NhZ2UoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiBib29sQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OklzU2hv d2luZ1ZhbGlkYXRpb25NZXNzYWdlKTsgfQogICAgIFN0cmluZyB2YWxpZGF0aW9uTWVzc2FnZSgp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlO YW1lOjpWYWxpZGF0aW9uTWVzc2FnZSk7IH0KICAgICB1bnNpZ25lZCBibG9ja3F1b3RlTGV2ZWwo KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB1bnNpZ25lZEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVy dHlOYW1lOjpCbG9ja3F1b3RlTGV2ZWwpOyB9Ci0gICAgaW50IGhlYWRpbmdMZXZlbCgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpIZWFk aW5nTGV2ZWwpOyB9CisgICAgdW5zaWduZWQgaGVhZGluZ0xldmVsKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gaW50QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkhlYWRpbmdMZXZlbCk7 IH0KICAgICBBY2Nlc3NpYmlsaXR5QnV0dG9uU3RhdGUgY2hlY2tib3hPclJhZGlvVmFsdWUoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5QnV0dG9uU3Rh dGU+KGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5QnV0dG9u U3RhdGUpKTsgfQogICAgIFN0cmluZyB2YWx1ZURlc2NyaXB0aW9uKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OlZhbHVlRGVzY3Jp cHRpb24pOyB9CiAgICAgZmxvYXQgdmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIGZsb2F0QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OlZhbHVlRm9yUmFuZ2UpOyB9 CkBAIC0yNzQsNiArMjc0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRSZWN0IGJvdW5kaW5nQm94 UmVjdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHJlY3RBdHRyaWJ1dGVWYWx1ZTxMYXlvdXRS ZWN0PihBWFByb3BlcnR5TmFtZTo6Qm91bmRpbmdCb3hSZWN0KTsgfQogICAgIExheW91dFJlY3Qg ZWxlbWVudFJlY3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiByZWN0QXR0cmlidXRlVmFsdWU8 TGF5b3V0UmVjdD4oQVhQcm9wZXJ0eU5hbWU6OkVsZW1lbnRSZWN0KTsgfQogICAgIEludFBvaW50 IGNsaWNrUG9pbnQoKSBvdmVycmlkZSB7IHJldHVybiBpbnRQb2ludEF0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lOjpDbGlja1BvaW50KTsgfQorICAgIEFYVmFsdWUgdmFsdWUoKSBvdmVycmlk ZSB7IHJldHVybiB7IH07IH0KICAgICB2b2lkIGFjY2Vzc2liaWxpdHlUZXh0KFZlY3RvcjxBY2Nl c3NpYmlsaXR5VGV4dD4mIHRleHRzKSBjb25zdCBvdmVycmlkZTsKICAgICBTdHJpbmcgYnJhaWxs ZUxhYmVsKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQ cm9wZXJ0eU5hbWU6OkJyYWlsbGVMYWJlbCk7IH0KICAgICBTdHJpbmcgYnJhaWxsZVJvbGVEZXNj cmlwdGlvbigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lOjpCcmFpbGxlUm9sZURlc2NyaXB0aW9uKTsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCBiOWM3ZmJkOThhY2FjMjhlZDE5ZDJmNWExNDNl MTkzZDRlOWY4ZWM5Li5mZjhhMjlkYTRjYmY3YWY2ZTMxNThlMWY4NjYwYTY0NmY0MTExZWNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjI5MSw0OCArMjI5 MSwxNyBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgICAg IGlmIChbW1tzZWxmIGF0dGFjaG1lbnRWaWV3XSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlTmFtZXNd IGNvbnRhaW5zT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eVZhbHVlQXR0cmlidXRlXSkKICAgICAgICAg ICAgICAgICByZXR1cm4gW1tzZWxmIGF0dGFjaG1lbnRWaWV3XSBhY2Nlc3NpYmlsaXR5QXR0cmli dXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdOwogICAgICAgICB9Ci0gICAg ICAgIGlmIChiYWNraW5nT2JqZWN0LT5zdXBwb3J0c1JhbmdlVmFsdWUoKSkKLSAgICAgICAgICAg IHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmJhY2tpbmdPYmplY3QtPnZhbHVlRm9y UmFuZ2UoKV07Ci0gICAgICAgIGlmIChiYWNraW5nT2JqZWN0LT5yb2xlVmFsdWUoKSA9PSBBY2Nl c3NpYmlsaXR5Um9sZTo6U2xpZGVyVGh1bWIpCi0gICAgICAgICAgICByZXR1cm4gW05TTnVtYmVy IG51bWJlcldpdGhGbG9hdDpiYWNraW5nT2JqZWN0LT5wYXJlbnRPYmplY3QoKS0+dmFsdWVGb3JS YW5nZSgpXTsKLSAgICAgICAgaWYgKGJhY2tpbmdPYmplY3QtPmlzSGVhZGluZygpKQotICAgICAg ICAgICAgcmV0dXJuIEAoYmFja2luZ09iamVjdC0+aGVhZGluZ0xldmVsKCkpOwotCi0gICAgICAg IGlmIChiYWNraW5nT2JqZWN0LT5zdXBwb3J0c0NoZWNrZWRTdGF0ZSgpKSB7Ci0gICAgICAgICAg ICBzd2l0Y2ggKGJhY2tpbmdPYmplY3QtPmNoZWNrYm94T3JSYWRpb1ZhbHVlKCkpIHsKLSAgICAg ICAgICAgIGNhc2UgQWNjZXNzaWJpbGl0eUJ1dHRvblN0YXRlOjpPZmY6Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIEAoMCk7Ci0gICAgICAgICAgICBjYXNlIEFjY2Vzc2liaWxpdHlCdXR0b25TdGF0 ZTo6T246Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEAoMSk7Ci0gICAgICAgICAgICBjYXNlIEFj Y2Vzc2liaWxpdHlCdXR0b25TdGF0ZTo6TWl4ZWQ6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEAo Mik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICAvLyByYWRpbyBncm91cHMg cmV0dXJuIHRoZSBzZWxlY3RlZCByYWRpbyBidXR0b24gYXMgdGhlIEFYVmFsdWUKLSAgICAgICAg aWYgKGJhY2tpbmdPYmplY3QtPmlzUmFkaW9Hcm91cCgpKSB7Ci0gICAgICAgICAgICBBWENvcmVP YmplY3QqIHJhZGlvQnV0dG9uID0gYmFja2luZ09iamVjdC0+c2VsZWN0ZWRSYWRpb0J1dHRvbigp OwotICAgICAgICAgICAgaWYgKCFyYWRpb0J1dHRvbikKLSAgICAgICAgICAgICAgICByZXR1cm4g bmlsOwotICAgICAgICAgICAgcmV0dXJuIHJhZGlvQnV0dG9uLT53cmFwcGVyKCk7Ci0gICAgICAg IH0KLQotICAgICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNUYWJMaXN0KCkpIHsKLSAgICAgICAg ICAgIEFYQ29yZU9iamVjdCogdGFiSXRlbSA9IGJhY2tpbmdPYmplY3QtPnNlbGVjdGVkVGFiSXRl bSgpOwotICAgICAgICAgICAgaWYgKCF0YWJJdGVtKQotICAgICAgICAgICAgICAgIHJldHVybiBu aWw7Ci0gICAgICAgICAgICByZXR1cm4gdGFiSXRlbS0+d3JhcHBlcigpOwotICAgICAgICB9Ci0K LSAgICAgICAgaWYgKGJhY2tpbmdPYmplY3QtPmlzVGFiSXRlbSgpKQotICAgICAgICAgICAgcmV0 dXJuIEAoYmFja2luZ09iamVjdC0+aXNTZWxlY3RlZCgpKTsKLQotICAgICAgICBpZiAoYmFja2lu Z09iamVjdC0+aXNDb2xvcldlbGwoKSkgewotICAgICAgICAgICAgYXV0byBjb2xvciA9IGNvbnZl cnRDb2xvcjxTUkdCQTxmbG9hdD4+KGJhY2tpbmdPYmplY3QtPmNvbG9yVmFsdWUoKSk7Ci0gICAg ICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJyZ2IgJTcuNWYgJTcu NWYgJTcuNWYgMSIsIGNvbG9yLnJlZCwgY29sb3IuZ3JlZW4sIGNvbG9yLmJsdWVdOwotICAgICAg ICB9CiAKLSAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPnN0cmluZ1ZhbHVlKCk7CisgICAg ICAgIGF1dG8gdmFsdWUgPSBiYWNraW5nT2JqZWN0LT52YWx1ZSgpOworICAgICAgICByZXR1cm4g V1RGOjpzd2l0Y2hPbih2YWx1ZSwKKyAgICAgICAgICAgIFtdIChib29sJiB0eXBlZFZhbHVlKSB7 IHJldHVybiBAKHR5cGVkVmFsdWUpOyB9LAorICAgICAgICAgICAgW10gKHVuc2lnbmVkJiB0eXBl ZFZhbHVlKSB7IHJldHVybiBAKHR5cGVkVmFsdWUpOyB9LAorICAgICAgICAgICAgW10gKGZsb2F0 JiB0eXBlZFZhbHVlKSB7IHJldHVybiBAKHR5cGVkVmFsdWUpOyB9LAorICAgICAgICAgICAgW10g KFN0cmluZyYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gKGlkKShOU1N0cmluZyAqKXR5cGVkVmFsdWU7 IH0sCisgICAgICAgICAgICBbXSAoQWNjZXNzaWJpbGl0eUJ1dHRvblN0YXRlJiB0eXBlZFZhbHVl KSB7IHJldHVybiBAKCh1bnNpZ25lZCl0eXBlZFZhbHVlKTsgfSwKKyAgICAgICAgICAgIFtdIChB WENvcmVPYmplY3QqJiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZhbHVlID8gKGlkKXR5cGVk VmFsdWUtPndyYXBwZXIoKSA6IG5pbDsgfSwKKyAgICAgICAgICAgIFtdIChhdXRvJikgeyByZXR1 cm4gbmlsOyB9CisgICAgICAgICk7CiAgICAgfQogCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlz RXF1YWxUb1N0cmluZzooTlNTdHJpbmcgKilrQVhNZW51SXRlbU1hcmtDaGFyQXR0cmlidXRlXSkg ewo=