212794 2020-06-04 18:02:24 -0700 AXIsolatedTree::updateChildren should not call nodeForID. 2020-06-05 10:16:20 -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 1659438 0 andresg_22 2020-06-04 18:02:24 -0700 AXIsolatedTree::updateChildren should not call nodeForID. 1659443 1 401107 andresg_22 2020-06-04 18:20:49 -0700 Created attachment 401107 Patch 1659669 2 ews-feeder 2020-06-05 10:15:51 -0700 Committed r262626: <https://trac.webkit.org/changeset/262626> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401107. 1659670 3 webkit-bug-importer 2020-06-05 10:16:20 -0700 <rdar://problem/64034018> 401107 2020-06-04 18:20:49 -0700 2020-06-05 10:15:52 -0700 Patch bug-212794-20200604212047.patch text/plain 17249 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWViNGQ3ODBiMGRiNDUw NTMzMTA2MTM1YWQzMTRhYmRkYzMxOTUwZi4uNWE2NzhiYmQ0NjIzYWZhZThmOTI2ZTVhNDI1ZjUy ZTQ5MjhlMDA3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIwLTA2LTA0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBBWElzb2xhdGVk VHJlZTo6dXBkYXRlQ2hpbGRyZW4gc2hvdWxkIG5vdCBjYWxsIG5vZGVGb3JJRC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjc5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFYSXNvbGF0ZWRUcmVlOjp1 cGRhdGVDaGlsZHJlbiBpcyBleGVjdXRlZCBvbiB0aGUgbWFpbiB0aHJlYWQgYW5kCisgICAgICAg IHRoZXJmb3JlIHNob3VsZCBub3QgY2FsbCBub2RlRm9ySUQuIFNpbmNlIGl0IHJlcXVpcmVzIHRo ZSBjaGlsZHJlbiBJRHMKKyAgICAgICAgZm9yIHRoZSBpc29sYXRlZCBvYmplY3Qgd2hvc2UgY2hp bGRyZW4gYXJlIGJlaW5nIHVwZGF0ZWQsIHdlIG5lZWQgdG8KKyAgICAgICAgc3RvcmUgdGhvc2Ug Y2hpbGRyZW4gSURzIG91dHNpZGUgdGhlIGlzb2xhdGVkIG9iamVjdC4gRm9yIHRoaXMgcmVhc29u CisgICAgICAgIHdlIGFkZGVkIHRoZSBtX25vZGVNYXAgbWVtYmVyIHZhcmlhYmxlIHdoaWNoIHdp bGwgbWFpbnRhaW4gYSBtYXAgYmV0d2VlbgorICAgICAgICBvYmplY3QgSUQgYW5kIGl0cyBjaGls ZHJlbiBJRHMuCisgICAgICAgIEluIGFkZGl0aW9uLCBzaW5jZSByZXRyaWV2aW5nIHRoZSByb290 IG5vZGUgaGFwcGVucyB2ZXJ5IG9mdGVuIGFuZAorICAgICAgICByZXF1aXJlZCBhbHNvIGEgY2Fs bCB0byBub2RlRm9ySUQsIHdlIG5vdyBzdG9yZSBhIHBvaW50ZXIgdG8gdGhlIHJvb3Qgbm9kZSBp bnN0ZWFkIG9mIGl0cyBJRCwgc28gdGhlcmUgaXMgbm8gbmVlZCB0byBsb29rIGl0IHVwIGluIHRo ZSByZWFkaW5nIG1hcC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElz b2xhdGVkT2JqZWN0OjpzZXRDaGlsZHJlbklEcyk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkT2JqZWN0OjphcHBlbmRDaGlsZCk6IFJlbmFtZWQgc2V0Q2hpbGRyZW5JRHMuCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpB WElzb2xhdGVkVHJlZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVl OjpyZW1vdmVUcmVlRm9yUGFnZUlEKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVl Ojpub2RlRm9ySUQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6Omdl bmVyYXRlU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6Y3JlYXRl U3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRy ZW4pOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OnJvb3ROb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpzZXRSb290Tm9kZSk6CisgICAgICAgIChXZWJD b3JlOjpBWElzb2xhdGVkVHJlZTo6cmVtb3ZlU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpB WElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcyk6CisgICAgICAgIChXZWJDb3JlOjpB WElzb2xhdGVkVHJlZTo6bm9kZUluVHJlZUZvcklEKTogRGVsZXRlZCwgbm90IHVzZWQuCisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6c2V0Um9vdE5vZGVJRCk6IFJlbmFtZWQgc2V0 Um9vdE5vZGUuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlckJhc2UubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZSBhdHRhY2hJc29sYXRlZE9iamVjdDpdKToKKwogMjAyMC0wNi0wMiAgQW5kcmVzIEdv bnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZU5vZGUgc2hvdWxkIG5vdCBjYWxsIG5vZGVGb3JJRC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKaW5kZXggMmYzNTNlNDcyZGM2MWQ3ZDliZjk1YzhiNjdk OGJmNDJkZDU5YjQyOS4uYzkyZTE4NGQ3Y2YxOWZjMjg5MzgzYThiZWM1YzE0ZjUzZGU2NDVjMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKQEAgLTI5LDYgKzI5 LDkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJBWExvZ2dlci5oIgogCisjaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKyNpbmNsdWRlICJBWElzb2xhdGVk T2JqZWN0LmgiCisjZW5kaWYKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCiAjaW5jbHVkZSAi TG9nZ2luZy5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRTdHJlYW0uaD4KQEAgLTczMiw3ICs3 MzUsNyBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgQVhJc29s YXRlZFRyZWUmIHRyZWUpCiB7CiAgICAgVGV4dFN0cmVhbTo6R3JvdXBTY29wZSBncm91cFNjb3Bl KHN0cmVhbSk7CiAgICAgc3RyZWFtIDw8ICJ0cmVlSUQgIiA8PCB0cmVlLnRyZWVJRCgpOwotICAg IHN0cmVhbS5kdW1wUHJvcGVydHkoInJvb3ROb2RlSUQiLCB0cmVlLm1fcm9vdE5vZGVJRCk7Cisg ICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgicm9vdE5vZGVJRCIsIHRyZWUucm9vdE5vZGUoKS0+b2Jq ZWN0SUQoKSk7CiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiZm9jdXNlZE5vZGVJRCIsIHRyZWUu bV9mb2N1c2VkTm9kZUlEKTsKICAgICBBWExvZ2dlcjo6YWRkKHN0cmVhbSwgdHJlZS5yb290Tm9k ZSgpLCB0cnVlKTsKICAgICByZXR1cm4gc3RyZWFtOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNw cAppbmRleCBiNjRkODM5MTNlN2QxNjVjOTQ4ZTZmNThjOTA0ZGRjNTEwMGYwY2VlLi44NDhjZjVm ODI4NjY2OTE3ZDZkOTdiYmM1OTIxNDAyMzk5MWU4NTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmNwcApAQCAtNDU2LDEwICs0NTYsMTAgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpzZXRQ cm9wZXJ0eShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEF0dHJpYnV0ZVZhbHVlVmEKICAg ICAgICAgbV9hdHRyaWJ1dGVNYXAuc2V0KHByb3BlcnR5TmFtZSwgdmFsdWUpOwogfQogCi12b2lk IEFYSXNvbGF0ZWRPYmplY3Q6OmFwcGVuZENoaWxkKEFYSUQgYXhJRCkKK3ZvaWQgQVhJc29sYXRl ZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMoVmVjdG9yPEFYSUQ+JiYgY2hpbGRyZW5JRHMpCiB7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBtX2NoaWxkcmVuSURzLmFwcGVuZChheElE KTsKKyAgICBtX2NoaWxkcmVuSURzID0gY2hpbGRyZW5JRHM7CiB9CiAKIHZvaWQgQVhJc29sYXRl ZE9iamVjdDo6c2V0UGFyZW50KEFYSUQgcGFyZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmlu ZGV4IDJiYzk5Mjg3NDI0NTE5NjAxYWM5NjA1MDI0NWUxNzBjZDM5YTU5NjYuLmM0OTRjNGVmYzZm MzliYWE2MzU3MTk0YTJlMGM3ZjgxZjhhMjJjYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgK QEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNEZXRhY2hlZCgpIGNvbnN0IG92 ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRQYXJlbnQoQVhJRCk7Ci0gICAgdm9pZCBhcHBlbmRDaGls ZChBWElEKTsKKyAgICB2b2lkIHNldENoaWxkcmVuSURzKFZlY3RvcjxBWElEPiYmKTsKIAogcHJp dmF0ZToKICAgICB2b2lkIGRldGFjaFJlbW90ZVBhcnRzKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50 VHlwZSkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKaW5kZXggYzAwMGQzNDhhMzk2 MWEwMjJjMDg0ZDNiODg4NTBhNzdiMjQ5ZjcxZS4uZGVmMjY0MTcwMTQ3MzcxZDI4MTQ1NWNlZTU0 ZWM5NGU5ODZmODU1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAtNzgsMTcgKzc4LDIz IEBAIEFYSXNvbGF0ZWRUcmVlOjp+QVhJc29sYXRlZFRyZWUoKQogICAgIEFYVFJBQ0UoIkFYSXNv bGF0ZWRUcmVlOjp+QVhJc29sYXRlZFRyZWUiKTsKIH0KIAotUmVmPEFYSXNvbGF0ZWRUcmVlPiBB WElzb2xhdGVkVHJlZTo6Y3JlYXRlKCkKK3ZvaWQgQVhJc29sYXRlZFRyZWU6OmNsZWFyKCkKIHsK LSAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6Y3JlYXRlIik7CisgICAgQVhUUkFDRSgiQVhJ c29sYXRlZFRyZWU6OmNsZWFyIik7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBy ZXR1cm4gYWRvcHRSZWYoKm5ldyBBWElzb2xhdGVkVHJlZSgpKTsKKworICAgIExvY2tIb2xkZXIg bG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CisgICAgbV9wZW5kaW5nU3VidHJlZVJlbW92YWxz LmFwcGVuZChtX3Jvb3ROb2RlLT5vYmplY3RJRCgpKTsKKyAgICBtX3Jvb3ROb2RlID0gbnVsbHB0 cjsKKyAgICBtX25vZGVNYXAuY2xlYXIoKTsKKyAgICBtX2F4T2JqZWN0Q2FjaGUgPSBudWxscHRy OwogfQogCi1SZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVJblRy ZWVGb3JJRChBWElzb2xhdGVkVHJlZUlEIHRyZWVJRCwgQVhJRCBheElEKQorUmVmPEFYSXNvbGF0 ZWRUcmVlPiBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlKCkKIHsKLSAgICBBWFRSQUNFKCJBWElzb2xh dGVkVHJlZTo6bm9kZUluVHJlZUZvcklEIik7Ci0gICAgcmV0dXJuIHRyZWVGb3JJRCh0cmVlSUQp LT5ub2RlRm9ySUQoYXhJRCk7CisgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OmNyZWF0ZSIp OworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg QVhJc29sYXRlZFRyZWUoKSk7CiB9CiAKIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRl ZFRyZWU6OnRyZWVGb3JJRChBWElzb2xhdGVkVHJlZUlEIHRyZWVJRCkKQEAgLTExNywxMiArMTIz LDcgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlVHJlZUZvclBhZ2VJRChQYWdlSWRlbnRp ZmllciBwYWdlSUQpCiAKICAgICBpZiAoYXV0byBvcHRpb25hbFRyZWUgPSB0cmVlUGFnZUNhY2hl KCkudGFrZShwYWdlSUQpKSB7CiAgICAgICAgIGF1dG8mIHRyZWUgeyAqb3B0aW9uYWxUcmVlIH07 Ci0KLSAgICAgICAgTG9ja0hvbGRlciB0cmVlTG9ja2VyIHsgdHJlZS0+bV9jaGFuZ2VMb2dMb2Nr IH07Ci0gICAgICAgIHRyZWUtPm1fcGVuZGluZ1N1YnRyZWVSZW1vdmFscy5hcHBlbmQodHJlZS0+ bV9yb290Tm9kZUlEKTsKLSAgICAgICAgdHJlZS0+c2V0QVhPYmplY3RDYWNoZShudWxscHRyKTsK LSAgICAgICAgdHJlZUxvY2tlci51bmxvY2tFYXJseSgpOwotCisgICAgICAgIHRyZWUtPmNsZWFy KCk7CiAgICAgICAgIHRyZWVJRENhY2hlKCkucmVtb3ZlKHRyZWUtPnRyZWVJRCgpKTsKICAgICB9 CiB9CkBAIC0xMzksNiArMTQwLDEwIEBAIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRl ZFRyZWU6OnRyZWVGb3JQYWdlSUQoUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogCiBSZWZQdHI8QVhJ c29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJRChBWElEIGF4SUQpIGNvbnN0 CiB7CisgICAgLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcgQVNTRVJUIHNob3VsZCBiZSBtZXQgYnV0 IGl0IGlzIGNvbW1lbnRlZCBvdXQgYXQgdGhlCisgICAgLy8gbW9tZW50IGJlY2F1c2Ugb2YgPHJk YXI6Ly9wcm9ibGVtLzYzOTg1NjQ2PiBBZnRlciBjYWxsaW5nIF9BWFVJRWxlbWVudFVzZVNlY29u ZGFyeUFYVGhyZWFkKHRydWUpLAorICAgIC8vIHN0aWxsIHJlY2VpdmVzIGNsaWVudCByZXF1ZXN0 IG9uIG1haW4gdGhyZWFkLgorICAgIC8vIEFTU0VSVChheE9iamVjdENhY2hlKCktPmNhblVzZVNl Y29uZGFyeUFYVGhyZWFkKCkgPyAhaXNNYWluVGhyZWFkKCkgOiBpc01haW5UaHJlYWQoKSk7CiAg ICAgcmV0dXJuIGF4SUQgIT0gSW52YWxpZEFYSUQgPyBtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0 KGF4SUQpIDogbnVsbHB0cjsKIH0KIApAQCAtMTY2LDcgKzE3MSw3IEBAIHZvaWQgQVhJc29sYXRl ZFRyZWU6OmdlbmVyYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElEIHBhcmVu dElELCBib29sCiAgICAgYXBwZW5kTm9kZUNoYW5nZXMobm9kZUNoYW5nZXMpOwogCiAgICAgaWYg KHBhcmVudElEID09IEludmFsaWRBWElEKQotICAgICAgICBzZXRSb290Tm9kZUlEKG9iamVjdC0+ b2JqZWN0SUQoKSk7CisgICAgICAgIHNldFJvb3ROb2RlKG9iamVjdC5wdHIoKSk7CiAgICAgLy8g RklYTUU6IGVsc2UgYXR0YWNoIHRoZSBuZXdseSBjcmVhdGVkIHN1YnRyZWUgdG8gaXRzIHBhcmVu dC4KIH0KIApAQCAtMTc0LDYgKzE3OSw3IEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xh dGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElECiB7CiAg ICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OmNyZWF0ZVN1YnRyZWUiKTsKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOworCiAgICAgYXV0byBvYmplY3QgPSBBWElzb2xhdGVkT2JqZWN0Ojpj cmVhdGUoYXhPYmplY3QsIG1fdHJlZUlELCBwYXJlbnRJRCk7CiAgICAgaWYgKGF0dGFjaFdyYXBw ZXIpIHsKICAgICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3Jh cHBlcigpKTsKQEAgLTE4NSwxMCArMTkxLDEzIEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElz b2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElECiAg ICAgICAgIG5vZGVDaGFuZ2VzLmFwcGVuZChOb2RlQ2hhbmdlKG9iamVjdCwgYXhPYmplY3Qud3Jh cHBlcigpKSk7CiAgICAgfQogCisgICAgVmVjdG9yPEFYSUQ+IGNoaWxkcmVuSURzOwogICAgIGZv ciAoY29uc3QgYXV0byYgYXhDaGlsZCA6IGF4T2JqZWN0LmNoaWxkcmVuKCkpIHsKLSAgICAgICAg YXV0byBjaGlsZCA9IGNyZWF0ZVN1YnRyZWUoKmF4Q2hpbGQsIG9iamVjdC0+b2JqZWN0SUQoKSwg YXR0YWNoV3JhcHBlciwgbm9kZUNoYW5nZXMpOwotICAgICAgICBvYmplY3QtPmFwcGVuZENoaWxk KGNoaWxkLT5vYmplY3RJRCgpKTsKKyAgICAgICAgYXV0byBjaGlsZCA9IGNyZWF0ZVN1YnRyZWUo KmF4Q2hpbGQsIGF4T2JqZWN0Lm9iamVjdElEKCksIGF0dGFjaFdyYXBwZXIsIG5vZGVDaGFuZ2Vz KTsKKyAgICAgICAgY2hpbGRyZW5JRHMuYXBwZW5kKGNoaWxkLT5vYmplY3RJRCgpKTsKICAgICB9 CisgICAgbV9ub2RlTWFwLnNldChvYmplY3QtPm9iamVjdElEKCksIGNoaWxkcmVuSURzKTsKKyAg ICBvYmplY3QtPnNldENoaWxkcmVuSURzKFdURk1vdmUoY2hpbGRyZW5JRHMpKTsKIAogICAgIHJl dHVybiBvYmplY3Q7CiB9CkBAIC0yMzUsMjQgKzI0NCwyNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVl Ojp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgIGlmICghYXhPYmpl Y3QuZG9jdW1lbnQoKSB8fCAhYXhPYmplY3QuZG9jdW1lbnQoKS0+aGFzTGl2aW5nUmVuZGVyVHJl ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBhcHBseVBlbmRpbmdDaGFuZ2VzKCk7Ci0gICAg TG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKLQogICAgIC8vIHVwZGF0ZUNo aWxkcmVuIG1heSBiZSBjYWxsZWQgYXMgdGhlIHJlc3VsdCBvZiBhIGNoaWxkcmVuIGNoYW5nZWQK ICAgICAvLyBub3RpZmljYXRpb24gZm9yIGFuIGF4T2JqZWN0IHRoYXQgaGFzIG5vIGFzc29jaWF0 ZWQgaXNvbGF0ZWQgb2JqZWN0LgogICAgIC8vIEFuIGV4YW1wbGUgb2YgdGhpcyBpcyB3aGVuIGFu IGVtcHR5IGVsZW1lbnQgc3VjaCBhcyBhIDxjYW52YXM+IG9yIDxkaXY+CiAgICAgLy8gaXMgYWRk ZWQgYSBuZXcgY2hpbGQuIFNvIGZpbmQgdGhlIGNsb3Nlc3QgYW5jZXN0b3Igb2YgYXhPYmplY3Qg dGhhdCBoYXMKICAgICAvLyBhbiBhc3NvY2lhdGVkIGlzb2xhdGVkIG9iamVjdCBhbmQgdXBkYXRl IGl0cyBjaGlsZHJlbi4KLSAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gb2JqZWN0OwotICAg IGF1dG8qIGF4QW5jZXN0b3IgPSBBY2Nlc3NpYmlsaXR5OjpmaW5kQW5jZXN0b3IoYXhPYmplY3Qs IHRydWUsIFsmb2JqZWN0LCB0aGlzXSAoY29uc3QgQVhDb3JlT2JqZWN0JiBhbmNlc3Rvcikgewot ICAgICAgICByZXR1cm4gb2JqZWN0ID0gbm9kZUZvcklEKGFuY2VzdG9yLm9iamVjdElEKCkpOwor ICAgIGF1dG8gaXRlcmF0b3IgPSBtX25vZGVNYXAuZW5kKCk7CisgICAgYXV0byogYXhBbmNlc3Rv ciA9IEFjY2Vzc2liaWxpdHk6OmZpbmRBbmNlc3RvcihheE9iamVjdCwgdHJ1ZSwgWyZpdGVyYXRv ciwgdGhpc10gKGNvbnN0IEFYQ29yZU9iamVjdCYgYW5jZXN0b3IpIHsKKyAgICAgICAgYXV0byBp dCA9IG1fbm9kZU1hcC5maW5kKGFuY2VzdG9yLm9iamVjdElEKCkpOworICAgICAgICBpZiAoaXQg IT0gbV9ub2RlTWFwLmVuZCgpKSB7CisgICAgICAgICAgICBpdGVyYXRvciA9IGl0OworICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0pOwotICAgIEFTU0VSVChvYmplY3QgJiYgb2JqZWN0LT5vYmplY3RJRCgpICE9IEludmFsaWRB WElEKTsKLSAgICBpZiAoIWF4QW5jZXN0b3IgfHwgIW9iamVjdCkKKyAgICBBU1NFUlQoYXhBbmNl c3RvciAmJiBpdGVyYXRvciAhPSBtX25vZGVNYXAuZW5kKCkpOworICAgIGlmICghYXhBbmNlc3Rv ciB8fCBpdGVyYXRvciA9PSBtX25vZGVNYXAuZW5kKCkpCiAgICAgICAgIHJldHVybjsgLy8gbm90 aGluZyB0byB1cGRhdGUuCiAKLSAgICBhdXRvIHJlbW92YWxzID0gb2JqZWN0LT5tX2NoaWxkcmVu SURzOwotICAgIGxvY2tlci51bmxvY2tFYXJseSgpOworICAgIC8vIGl0ZXJhdG9yIGlzIHBvaW50 aW5nIHRvIHRoZSBtX25vZGVNYXAgZW50cnkgY29ycmVzcG9uZGluZyB0byBheEFuY2VzdG9yLT5v YmplY3RJRCgpLgorICAgIEFTU0VSVChpdGVyYXRvci0+a2V5ID09IGF4QW5jZXN0b3ItPm9iamVj dElEKCkpOworICAgIGF1dG8gcmVtb3ZhbHMgPSBpdGVyYXRvci0+dmFsdWU7CiAKICAgICBjb25z dCBhdXRvJiBheENoaWxkcmVuID0gYXhBbmNlc3Rvci0+Y2hpbGRyZW4oKTsKICAgICBhdXRvIGF4 Q2hpbGRyZW5JRHMgPSBheEFuY2VzdG9yLT5jaGlsZHJlbklEcygpOwpAQCAtMjY1LDcgKzI3Nyw3 IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhP YmplY3QpCiAgICAgICAgICAgICAvLyBUaGlzIGlzIGEgbmV3IGNoaWxkLCBhZGQgaXQgdG8gdGhl IHRyZWUuCiAgICAgICAgICAgICBBWExPRygiQWRkaW5nIGEgbmV3IGNoaWxkIGZvcjoiKTsKICAg ICAgICAgICAgIEFYTE9HKGF4Q2hpbGRyZW5baV0pOwotICAgICAgICAgICAgZ2VuZXJhdGVTdWJ0 cmVlKCpheENoaWxkcmVuW2ldLCBvYmplY3QtPm9iamVjdElEKCksIHRydWUpOworICAgICAgICAg ICAgZ2VuZXJhdGVTdWJ0cmVlKCpheENoaWxkcmVuW2ldLCBheEFuY2VzdG9yLT5vYmplY3RJRCgp LCB0cnVlKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjc0LDEwICsyODYsMTEgQEAgdm9pZCBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAg ICBmb3IgKGNvbnN0IEFYSUQmIGNoaWxkSUQgOiByZW1vdmFscykKICAgICAgICAgcmVtb3ZlU3Vi dHJlZShjaGlsZElEKTsKIAorICAgIC8vIExhc3RseSwgbWFrZSB0aGUgY2hpbGRyZW4gSURzIG9m IHRoZSBpc29sYXRlZCBvYmplY3QgdG8gYmUgdGhlIHNhbWUgYXMgdGhlIEFYT2JqZWN0J3MuCisg ICAgbV9ub2RlTWFwLnNldChheEFuY2VzdG9yLT5vYmplY3RJRCgpLCBheENoaWxkcmVuSURzKTsK ICAgICB7Ci0gICAgICAgIC8vIExhc3RseSwgbWFrZSB0aGUgY2hpbGRyZW4gSURzIG9mIHRoZSBp c29sYXRlZCBvYmplY3QgdG8gYmUgdGhlIHNhbWUgYXMgdGhlIEFYT2JqZWN0J3MuCiAgICAgICAg IExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07Ci0gICAgICAgIG9iamVjdC0+ bV9jaGlsZHJlbklEcyA9IGF4Q2hpbGRyZW5JRHM7CisgICAgICAgIG1fcGVuZGluZ0NoaWxkcmVu VXBkYXRlcy5hcHBlbmQoc3RkOjptYWtlX3BhaXIoYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSwgYXhD aGlsZHJlbklEcykpOwogICAgIH0KIH0KIApAQCAtMjk2LDE4ICszMDksMTggQEAgUmVmUHRyPEFY SXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRUcmVlOjpmb2N1c2VkTm9kZSgpCiBSZWZQdHI8QVhJ c29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6OnJvb3ROb2RlKCkKIHsKICAgICBBWFRSQUNF KCJBWElzb2xhdGVkVHJlZTo6cm9vdE5vZGUiKTsKLSAgICAvLyBBcHBseSBwZW5kaW5nIGNoYW5n ZXMgaW4gY2FzZSB0aGUgcm9vdCBub2RlIGlzIGluIHRoZSBwZW5kaW5nIGNoYW5nZXMuCi0gICAg YXBwbHlQZW5kaW5nQ2hhbmdlcygpOwogICAgIExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VM b2dMb2NrIH07Ci0gICAgcmV0dXJuIG5vZGVGb3JJRChtX3Jvb3ROb2RlSUQpOworICAgIHJldHVy biBtX3Jvb3ROb2RlOwogfQogCi12b2lkIEFYSXNvbGF0ZWRUcmVlOjpzZXRSb290Tm9kZUlEKEFY SUQgYXhJRCkKK3ZvaWQgQVhJc29sYXRlZFRyZWU6OnNldFJvb3ROb2RlKEFYSXNvbGF0ZWRPYmpl Y3QqIHJvb3QpCiB7Ci0gICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnNldFJvb3ROb2RlSUQi KTsKKyAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6c2V0Um9vdE5vZGUiKTsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFTU0VSVChtX2NoYW5nZUxvZ0xvY2suaXNMb2NrZWQo KSk7Ci0gICAgbV9yb290Tm9kZUlEID0gYXhJRDsKKyAgICBBU1NFUlQocm9vdCk7CisKKyAgICBt X3Jvb3ROb2RlID0gcm9vdDsKIH0KIAogdm9pZCBBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5v ZGVJRChBWElEIGF4SUQpCkBAIC0zMzIsNiArMzQ1LDE4IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6 OnJlbW92ZVN1YnRyZWUoQVhJRCBheElEKQogewogICAgIEFYVFJBQ0UoIkFYSXNvbGF0ZWRUcmVl OjpyZW1vdmVTdWJ0cmVlIik7CiAgICAgQVhMT0cobWFrZVN0cmluZygiUmVtb3Zpbmcgc3VidHJl ZSBmb3IgYXhJRCAiLCBheElEKSk7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAg IFZlY3RvcjxBWElEPiByZW1vdmFscyA9IHsgYXhJRCB9OworICAgIHdoaWxlIChyZW1vdmFscy5z aXplKCkpIHsKKyAgICAgICAgQVhJRCBheElEID0gcmVtb3ZhbHMudGFrZUxhc3QoKTsKKyAgICAg ICAgYXV0byBpdCA9IG1fbm9kZU1hcC5maW5kKGF4SUQpOworICAgICAgICBpZiAoaXQgIT0gbV9u b2RlTWFwLmVuZCgpKSB7CisgICAgICAgICAgICByZW1vdmFscy5hcHBlbmRWZWN0b3IoaXQtPnZh bHVlKTsKKyAgICAgICAgICAgIG1fbm9kZU1hcC5yZW1vdmUoYXhJRCk7CisgICAgICAgIH0KKyAg ICB9CisKICAgICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIG1f cGVuZGluZ1N1YnRyZWVSZW1vdmFscy5hcHBlbmQoYXhJRCk7CiB9CkBAIC00MDIsMTAgKzQyNywx OCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzKCkKICAgICAgICAg QVNTRVJUX1VOVVNFRChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPndyYXBw ZXIoKSk7CiAgICAgICAgIC8vIFRoZSByZWZlcmVuY2UgY291bnQgb2YgdGhlIGp1c3QgYWRkZWQg SXNvbGF0ZWRPYmplY3QgbXVzdCBiZSAyCiAgICAgICAgIC8vIGJlY2F1c2UgaXQgaXMgcmVmZXJl bmNlZCBieSBtX3JlYWRlclRocmVhZE5vZGVNYXAgYW5kIG1fcGVuZGluZ0FwcGVuZHMuCi0gICAg ICAgIC8vIFdoZW4gbV9wZW5kaW5nQXBwZW5kcyBpcyBjbGVhcmVkLCB0aGUgb2JqZWN0IHdpbGwg YmUgaGVsZCBvbmx5IGJ5IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC4KLSAgICAgICAgQVNTRVJUX1VO VVNFRChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPnJlZkNvdW50KCkgPT0g Mik7CisgICAgICAgIC8vIFdoZW4gbV9wZW5kaW5nQXBwZW5kcyBpcyBjbGVhcmVkLCB0aGUgb2Jq ZWN0IHdpbGwgYmUgaGVsZCBvbmx5IGJ5IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC4gVGhlIGV4Y2Vw dGlvbiBpcyB0aGUgcm9vdCBub2RlIHdob3NlIHJlZmVyZW5jZSBjb3VudCBpcyAzLgorICAgICAg ICBBU1NFUlRfVU5VU0VEKGFkZFJlc3VsdCwgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+cmVm Q291bnQoKSA9PSAyCisgICAgICAgICAgICB8fCAoYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS5w dHIoKSA9PSBtX3Jvb3ROb2RlLmdldCgpICYmIG1fcm9vdE5vZGUtPnJlZkNvdW50KCkgPT0gMykp OwogICAgIH0KICAgICBtX3BlbmRpbmdBcHBlbmRzLmNsZWFyKCk7CisKKyAgICBmb3IgKGF1dG8m IHVwZGF0ZSA6IG1fcGVuZGluZ0NoaWxkcmVuVXBkYXRlcykgeworICAgICAgICBBWExPRyhtYWtl U3RyaW5nKCJ1cGRhdGluZyBjaGlsZHJlbiBmb3IgYXhJRCAiLCB1cGRhdGUuZmlyc3QpKTsKKyAg ICAgICAgaWYgKGF1dG8gb2JqZWN0ID0gbm9kZUZvcklEKHVwZGF0ZS5maXJzdCkpCisgICAgICAg ICAgICBvYmplY3QtPnNldENoaWxkcmVuSURzKFdURk1vdmUodXBkYXRlLnNlY29uZCkpOworICAg IH0KKyAgICBtX3BlbmRpbmdDaGlsZHJlblVwZGF0ZXMuY2xlYXIoKTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggNTEzNDYxZTgzMmEyNjdiYmFm YjZlNDEyMzFkZmVmNWUwYTgyYjk1OC4uMzZiODdkZjkzMTlhNzNmYTg3YmJkMGQ5MmY1YzNlNGY4 ZjYwYzk0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCkBAIC02Myw3ICs2Myw2IEBAIHB1YmxpYzoK ICAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gcm9vdE5vZGUoKTsKICAgICBSZWZQdHI8QVhJ c29sYXRlZE9iamVjdD4gZm9jdXNlZE5vZGUoKTsKICAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVj dD4gbm9kZUZvcklEKEFYSUQpIGNvbnN0OwotICAgIHN0YXRpYyBSZWZQdHI8QVhJc29sYXRlZE9i amVjdD4gbm9kZUluVHJlZUZvcklEKEFYSXNvbGF0ZWRUcmVlSUQsIEFYSUQpOwogICAgIFZlY3Rv cjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gb2JqZWN0c0ZvcklEcyhWZWN0b3I8QVhJRD4pIGNvbnN0 OwogCiAgICAgc3RydWN0IE5vZGVDaGFuZ2UgewpAQCAtODYsNyArODUsNyBAQCBwdWJsaWM6CiAg ICAgLy8gQm90aCBzZXRSb290Tm9kZUlEIGFuZCBzZXRGb2N1c2VkTm9kZUlEIGFyZSBjYWxsZWQg ZHVyaW5nIHRoZSBnZW5lcmF0aW9uCiAgICAgLy8gb2YgdGhlIElzb2xhdGVkVHJlZS4KICAgICAv LyBGb2N1c2VkIG5vZGUgdXBkYXRlcyBpbiBBWE9iamVjdENhY2hlIHVzZSBzZXRGb2N1c05vZGVJ RC4KLSAgICB2b2lkIHNldFJvb3ROb2RlSUQoQVhJRCk7CisgICAgdm9pZCBzZXRSb290Tm9kZShB WElzb2xhdGVkT2JqZWN0Kik7CiAgICAgdm9pZCBzZXRGb2N1c2VkTm9kZUlEKEFYSUQpOwogCiAg ICAgLy8gQ2FsbGVkIG9uIEFYIHRocmVhZCBmcm9tIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyIG1ldGhvZHMuCkBAIC05Nyw2ICs5Niw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBB WElzb2xhdGVkVHJlZSgpOworICAgIHZvaWQgY2xlYXIoKTsKIAogICAgIHN0YXRpYyBIYXNoTWFw PEFYSXNvbGF0ZWRUcmVlSUQsIFJlZjxBWElzb2xhdGVkVHJlZT4+JiB0cmVlSURDYWNoZSgpOwog ICAgIHN0YXRpYyBIYXNoTWFwPFBhZ2VJZGVudGlmaWVyLCBSZWY8QVhJc29sYXRlZFRyZWU+PiYg dHJlZVBhZ2VDYWNoZSgpOwpAQCAtMTA4LDE4ICsxMDgsMjEgQEAgcHJpdmF0ZToKIAogICAgIEFY T2JqZWN0Q2FjaGUqIG1fYXhPYmplY3RDYWNoZSB7IG51bGxwdHIgfTsKIAotICAgIC8vIE9ubHkg YWNjZXNzIG9uIEFYIHRocmVhZCByZXF1ZXN0aW5nIGRhdGEuCisgICAgLy8gT25seSBhY2Nlc3Nl ZCBvbiBtYWluIHRocmVhZC4KKyAgICBIYXNoTWFwPEFYSUQsIFZlY3RvcjxBWElEPj4gbV9ub2Rl TWFwOworICAgIC8vIE9ubHkgYWNjZXNzZWQgb24gQVggdGhyZWFkIHJlcXVlc3RpbmcgZGF0YS4K ICAgICBIYXNoTWFwPEFYSUQsIFJlZjxBWElzb2xhdGVkT2JqZWN0Pj4gbV9yZWFkZXJUaHJlYWRO b2RlTWFwOwogCiAgICAgLy8gV3JpdHRlbiB0byBieSBtYWluIHRocmVhZCB1bmRlciBsb2NrLCBh Y2Nlc3NlZCBhbmQgYXBwbGllZCBieSBBWCB0aHJlYWQuCisgICAgUmVmUHRyPEFYSXNvbGF0ZWRP YmplY3Q+IG1fcm9vdE5vZGU7CiAgICAgVmVjdG9yPE5vZGVDaGFuZ2U+IG1fcGVuZGluZ0FwcGVu ZHM7IC8vIE5vZGVzIHRvIGJlIGFkZGVkIHRvIHRoZSB0cmVlIGFuZCBwbGF0Zm9ybS13cmFwcGVk LgogICAgIFZlY3RvcjxBWElEPiBtX3BlbmRpbmdOb2RlUmVtb3ZhbHM7IC8vIE5vZGVzIHRvIGJl IHJlbW92ZWQgZnJvbSB0aGUgdHJlZS4KICAgICBWZWN0b3I8QVhJRD4gbV9wZW5kaW5nU3VidHJl ZVJlbW92YWxzOyAvLyBOb2RlcyB3aG9zZSBzdWJ0cmVlcyBhcmUgdG8gYmUgcmVtb3ZlZCBmcm9t IHRoZSB0cmVlLgorICAgIFZlY3RvcjxzdGQ6OnBhaXI8QVhJRCwgVmVjdG9yPEFYSUQ+Pj4gbV9w ZW5kaW5nQ2hpbGRyZW5VcGRhdGVzOwogICAgIEFYSUQgbV9wZW5kaW5nRm9jdXNlZE5vZGVJRCB7 IEludmFsaWRBWElEIH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7CiAKICAgICBBWElzb2xh dGVkVHJlZUlEIG1fdHJlZUlEOwotICAgIEFYSUQgbV9yb290Tm9kZUlEIHsgSW52YWxpZEFYSUQg fTsKICAgICBBWElEIG1fZm9jdXNlZE5vZGVJRCB7IEludmFsaWRBWElEIH07CiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KaW5kZXggMjJjOTA5Njc3OThiZDBk NjRjOWU1MTJmMWE1YzY1Y2EwNDFhNGQzOS4uZTRjMWJhZDk0OTI5OThhMWYzMDc5OWQ2YTJlZmQx MTU4MWE0NTU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQpA QCAtMzA2LDggKzMwNiw2IEBAIE5TQXJyYXkgKmNvbnZlcnRUb05TQXJyYXkoY29uc3QgV2ViQ29y ZTo6QVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0CiAtICh2b2lkKWF0dGFj aElzb2xhdGVkT2JqZWN0OihBWENvcmVPYmplY3QqKWlzb2xhdGVkT2JqZWN0CiB7CiAgICAgQVNT RVJUKGlzb2xhdGVkT2JqZWN0ICYmIChfaWRlbnRpZmllciA9PSBJbnZhbGlkQVhJRCB8fCBfaWRl bnRpZmllciA9PSBpc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSkpOwotICAgIEFTU0VSVChtX2F4 T2JqZWN0KTsKLSAgICBBU1NFUlQoaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCkgPT0gbV9heE9i amVjdC0+b2JqZWN0SUQoKSk7CiAgICAgbV9pc29sYXRlZE9iamVjdCA9IGlzb2xhdGVkT2JqZWN0 OwogICAgIGlmIChfaWRlbnRpZmllciA9PSBJbnZhbGlkQVhJRCkKICAgICAgICAgX2lkZW50aWZp ZXIgPSBtX2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpOwo=