219662 2020-12-08 18:07:12 -0800 Fix for focus tracking in isolated tree mode. 2020-12-09 16:36:15 -0800 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 1712991 0 andresg_22 2020-12-08 18:07:12 -0800 Fix for focus tracking in isolated tree mode. 1712994 1 415697 andresg_22 2020-12-08 18:20:18 -0800 Created attachment 415697 Patch 1712996 2 415697 cfleizach 2020-12-08 18:25:39 -0800 Comment on attachment 415697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415697&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:482 > + if (!backingObject) Can this code here be moved into AccessibilityObject? It seems like a lot of core work in the platform wrapper 1713188 3 415767 andresg_22 2020-12-09 09:12:11 -0800 Created attachment 415767 Patch 1713190 4 andresg_22 2020-12-09 09:13:21 -0800 (In reply to chris fleizach from comment #2) > Comment on attachment 415697 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=415697&action=review > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:482 > > + if (!backingObject) > > Can this code here be moved into AccessibilityObject? It seems like a lot of > core work in the platform wrapper Done. Thanks! 1713369 5 ews-feeder 2020-12-09 16:35:54 -0800 Committed r270609: <https://trac.webkit.org/changeset/270609> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415767. 1713370 6 webkit-bug-importer 2020-12-09 16:36:15 -0800 <rdar://problem/72158498> 415697 2020-12-08 18:20:18 -0800 2020-12-09 09:12:08 -0800 Patch bug-219662-20201208212017.patch text/plain 8982 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzkwNzk2ZjgwYTI0Yzk4 ZWRmMWE4MGViMTY3YjAxMGM4OTcyOTQ4OS4uOWUwZjU3ZjQ1ODUzOGFiMzk3MjBlZjk2OTZlODgy ZmVlZTY2NTBmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTEyLTA4ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGZv Y3VzIHRyYWNraW5nIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY2MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisK KyAgICAgICAgLSBBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5vZGVJRCBhbmQgYXBwbHlQZW5k aW5nQ2hhbmdlcyBub3cgcHJvcGVybHkKKyAgICAgICAgaGFuZGxlIHRoZSBmb2N1c2VkIG5vZGUg SUQgdXBkYXRlIHdoZW4gdGhlIGZvY3VzZWQgb2JqZWN0IGNoYW5nZXMuCisgICAgICAgIC0gV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlIGJhc2VBY2Nlc3NpYmlsaXR5U2V0Rm9jdXMg ZGlzcGF0Y2hlcworICAgICAgICB0byB0aGUgbWFpbiB0aHJlYWQgdGhlIGNhbGxzIHRoYXQgaW52 b2x2ZSBET00gZWxlbWVudHMuCisgICAgICAgIC0gU29tZSBjb2RlIGNsZWFudXAsIEFTU0VSVCBj aGVja3Mgb2YgYXBwcm9wcmlhdGUgdGhyZWFkLCBhbmQgYWRkaXRpb25hbAorICAgICAgICBsb2dn aW5nLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpwYWdlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmRvY3VtZW50IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmRvY3VtZW50RnJhbWVWaWV3IGNv bnN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5vZGVJ RCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdl cyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJCYXNlLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJh c2UgYmFzZUFjY2Vzc2liaWxpdHlTZXRGb2N1czpdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0p OgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0 eVNldFZhbHVlOmZvckF0dHJpYnV0ZTpdKToKKwogMjAyMC0xMi0wOCAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU2V0IGh5cGhlbiBvbiB0aGUg bGFzdCB0ZXh0IHJ1bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAppbmRleCAxZjM3MjQ0YzY1 YzNkMmQyNjU2ZGNlMGY0NGE0ZmNlOWQwZDVhY2EzLi4yZTljMmZiNjQ1ZDQwN2Y4NjNjNmQ0Y2Vi ZGUzZDJlMjljYzI2M2FhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtMTkwNSwy NCArMTkwNSwzNCBAQCBXaWRnZXQqIEFYSXNvbGF0ZWRPYmplY3Q6OndpZGdldEZvckF0dGFjaG1l bnRWaWV3KCkgY29uc3QKIAogUGFnZSogQVhJc29sYXRlZE9iamVjdDo6cGFnZSgpIGNvbnN0CiB7 Ci0gICAgaWYgKGF1dG8qIG9iamVjdCA9IGFzc29jaWF0ZWRBWE9iamVjdCgpKQotICAgICAgICBy ZXR1cm4gb2JqZWN0LT5wYWdlKCk7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAg IGlmIChhdXRvKiBheE9iamVjdCA9IGFzc29jaWF0ZWRBWE9iamVjdCgpKQorICAgICAgICByZXR1 cm4gYXhPYmplY3QtPnBhZ2UoKTsKKwogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJl dHVybiBudWxscHRyOwogfQogCiBEb2N1bWVudCogQVhJc29sYXRlZE9iamVjdDo6ZG9jdW1lbnQo KSBjb25zdAogewotICAgIGlmIChhdXRvKiBvYmplY3QgPSBhc3NvY2lhdGVkQVhPYmplY3QoKSkK LSAgICAgICAgcmV0dXJuIG9iamVjdC0+ZG9jdW1lbnQoKTsKKyAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOworCisgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCkp CisgICAgICAgIHJldHVybiBheE9iamVjdC0+ZG9jdW1lbnQoKTsKKwogICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgIHJldHVybiBudWxscHRyOwogfQogCiBGcmFtZVZpZXcqIEFYSXNvbGF0 ZWRPYmplY3Q6OmRvY3VtZW50RnJhbWVWaWV3KCkgY29uc3QKIHsKLSAgICBpZiAoYXV0byogb2Jq ZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCkpCi0gICAgICAgIHJldHVybiBvYmplY3QtPmRvY3Vt ZW50RnJhbWVWaWV3KCk7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAgIGlmIChh dXRvKiBheE9iamVjdCA9IGFzc29jaWF0ZWRBWE9iamVjdCgpKQorICAgICAgICByZXR1cm4gYXhP YmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDgw ZGU1YzkyZDE5NjBlYjdmZTEyYjU2ZGQwNjA3NDQxODkyMzBlMGMuLmUzOTA3NzBiYzIyM2EzOGY3 OGQyZjQwODM0NTkwYTNjOGI3M2JmY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTM4 OCw4ICszODgsMTMgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5vZGVJRChBWElE IGF4SUQpCiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnNldEZvY3VzZWROb2RlSUQiKTsK ICAgICBBWExPRyhtYWtlU3RyaW5nKCJheElEICIsIGF4SUQpKTsKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOworCiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsK ICAgICBtX3BlbmRpbmdGb2N1c2VkTm9kZUlEID0gYXhJRDsKKworICAgIEFYUHJvcGVydHlNYXAg cHJvcGVydHlNYXA7CisgICAgcHJvcGVydHlNYXAuc2V0KEFYUHJvcGVydHlOYW1lOjpJc0ZvY3Vz ZWQsIHRydWUpOworICAgIG1fcGVuZGluZ1Byb3BlcnR5Q2hhbmdlcy5hcHBlbmQoeyBheElELCBw cm9wZXJ0eU1hcCB9KTsKIH0KIAogdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlTm9kZShBWElE IGF4SUQpCkBAIC00MzYsOCArNDQxLDE3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVu ZGluZ0NoYW5nZXMoKQogCiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sg fTsKIAotICAgIEFYTE9HKG1ha2VTdHJpbmcoImZvY3VzZWROb2RlSUQgIiwgbV9mb2N1c2VkTm9k ZUlELCAiIHBlbmRpbmdGb2N1c2VkTm9kZUlEICIsIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQpKTsK LSAgICBtX2ZvY3VzZWROb2RlSUQgPSBtX3BlbmRpbmdGb2N1c2VkTm9kZUlEOworICAgIGlmICht X3BlbmRpbmdGb2N1c2VkTm9kZUlEICE9IG1fZm9jdXNlZE5vZGVJRCkgeworICAgICAgICBBWExP RyhtYWtlU3RyaW5nKCJmb2N1c2VkTm9kZUlEICIsIG1fZm9jdXNlZE5vZGVJRCwgIiBwZW5kaW5n Rm9jdXNlZE5vZGVJRCAiLCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlEKSk7CisKKyAgICAgICAgaWYg KG1fZm9jdXNlZE5vZGVJRCAhPSBJbnZhbGlkQVhJRCkgeworICAgICAgICAgICAgLy8gU2V0IHRo ZSBvbGQgZm9jdXNlZCBvYmplY3QncyBJc0ZvY3VzZWQgcHJvcGVydHkgdG8gZmFsc2UuCisgICAg ICAgICAgICBBWFByb3BlcnR5TWFwIHByb3BlcnR5TWFwOworICAgICAgICAgICAgcHJvcGVydHlN YXAuc2V0KEFYUHJvcGVydHlOYW1lOjpJc0ZvY3VzZWQsIGZhbHNlKTsKKyAgICAgICAgICAgIG1f cGVuZGluZ1Byb3BlcnR5Q2hhbmdlcy5hcHBlbmQoeyBtX2ZvY3VzZWROb2RlSUQsIHByb3BlcnR5 TWFwIH0pOworICAgICAgICB9CisgICAgICAgIG1fZm9jdXNlZE5vZGVJRCA9IG1fcGVuZGluZ0Zv Y3VzZWROb2RlSUQ7CisgICAgfQogCiAgICAgd2hpbGUgKG1fcGVuZGluZ05vZGVSZW1vdmFscy5z aXplKCkpIHsKICAgICAgICAgYXV0byBheElEID0gbV9wZW5kaW5nTm9kZVJlbW92YWxzLnRha2VM YXN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KaW5kZXggNGM5 MWM2MGI2YTJhYTgxMTEzZjZiOTM1NDZiZmIwZTMxMTNiYmEyOS4uYjE2YmI3ZGUzMWYzMjEzYWNl ZTFjOWQyMmU0YWM5MzlhNzA4OTdhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZS5tbQpAQCAtNDcxLDIzICs0NzEsMzkgQEAgc3RhdGljIHZvaWQgY29udmVydFBhdGhU b1NjcmVlblNwYWNlRnVuY3Rpb24oUGF0aENvbnZlcnNpb25JbmZvJiBjb252ZXJzaW9uLCBjb24K IAogLSAodm9pZCliYXNlQWNjZXNzaWJpbGl0eVNldEZvY3VzOihCT09MKWZvY3VzCiB7CisgICAg YXV0byogYmFja2luZ09iamVjdCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0OworICAgIGlmICghYmFj a2luZ09iamVjdCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gSWYgZm9jdXMgaXMganVzdCBz ZXQgd2l0aG91dCBtYWtpbmcgdGhlIHZpZXcgdGhlIGZpcnN0IHJlc3BvbmRlciwgdGhlbiBrZXli b2FyZCBmb2N1cyB3b24ndCBtb3ZlIHRvIHRoZSByaWdodCBwbGFjZS4KLSAgICBpZiAoZm9jdXMg JiYgIXNlbGYuYXhCYWNraW5nT2JqZWN0LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24o KS5pc0ZvY3VzZWRBbmRBY3RpdmUoKSkgewotICAgICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9 IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5kb2N1bWVudEZyYW1lVmlldygpOwotICAgICAgICBQYWdl KiBwYWdlID0gc2VsZi5heEJhY2tpbmdPYmplY3QtPnBhZ2UoKTsKLSAgICAgICAgaWYgKHBhZ2Ug JiYgZnJhbWVWaWV3KSB7Ci0gICAgICAgICAgICBDaHJvbWVDbGllbnQmIGNocm9tZUNsaWVudCA9 IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpOwotICAgICAgICAgICAgY2hyb21lQ2xpZW50LmZvY3Vz KCk7Ci0KLSAgICAgICAgICAgIC8vIExlZ2FjeSBXZWJLaXQxIGNhc2UuCi0gICAgICAgICAgICBp ZiAoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKQotICAgICAgICAgICAgICAgIGNocm9tZUNs aWVudC5tYWtlRmlyc3RSZXNwb25kZXIoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKTsKLSAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQuYXNzaXN0aXZlVGVj aG5vbG9neU1ha2VGaXJzdFJlc3BvbmRlcigpOwotICAgICAgICB9CisgICAgaWYgKGZvY3VzKSB7 CisgICAgICAgIEFjY2Vzc2liaWxpdHk6OnBlcmZvcm1GdW5jdGlvbk9uTWFpblRocmVhZChbcHJv dGVjdGVkU2VsZiA9IHJldGFpblB0cihzZWxmKV0gKCkgeworICAgICAgICAgICAgYXV0byogYmFj a2luZ09iamVjdCA9IHByb3RlY3RlZFNlbGYuZ2V0KCkuYXhCYWNraW5nT2JqZWN0OworICAgICAg ICAgICAgaWYgKCFiYWNraW5nT2JqZWN0KQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICAgICAgaWYgKCFiYWNraW5nT2JqZWN0LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rp b24oKS5pc0ZvY3VzZWRBbmRBY3RpdmUoKSkgeworICAgICAgICAgICAgICAgIGF1dG8qIGZyYW1l VmlldyA9IGJhY2tpbmdPYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CisgICAgICAgICAgICAg ICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICAgICAgICAgIFBhZ2UqIHBhZ2UgPSBiYWNraW5nT2JqZWN0LT5wYWdlKCk7CisgICAgICAgICAg ICAgICAgaWYgKCFwYWdlKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg ICAgICAgICBDaHJvbWVDbGllbnQmIGNocm9tZUNsaWVudCA9IHBhZ2UtPmNocm9tZSgpLmNsaWVu dCgpOworICAgICAgICAgICAgICAgIGNocm9tZUNsaWVudC5mb2N1cygpOworCisgICAgICAgICAg ICAgICAgLy8gTGVnYWN5IFdlYktpdDEgY2FzZS4KKyAgICAgICAgICAgICAgICBpZiAoZnJhbWVW aWV3LT5wbGF0Zm9ybVdpZGdldCgpKQorICAgICAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQu bWFrZUZpcnN0UmVzcG9uZGVyKGZyYW1lVmlldy0+cGxhdGZvcm1XaWRnZXQoKSk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQuYXNzaXN0aXZl VGVjaG5vbG9neU1ha2VGaXJzdFJlc3BvbmRlcigpOworICAgICAgICAgICAgfQorICAgICAgICB9 KTsKICAgICB9CiAKLSAgICBzZWxmLmF4QmFja2luZ09iamVjdC0+c2V0Rm9jdXNlZChmb2N1cyk7 CisgICAgYmFja2luZ09iamVjdC0+c2V0Rm9jdXNlZChmb2N1cyk7CiB9CiAKIC0gKE5TU3RyaW5n ICopYWNjZXNzaWJpbGl0eVBsYXRmb3JtTWF0aFN1YnNjcmlwdEtleQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCA4M2Y1MTc5YWM3MjcyZDg0NTgyMjhmMmMyMDdj YjEyYTJiMDFkZWYzLi44N2M0OTgwZjczYWE0YzNlOTEwNzg3NmUyYmVmOTg4NzE2OWIwMWM4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjEzOSw5ICsyMTM5 LDEyIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0JFR0lOCiBBTExPV19ERVBS RUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIHsKICAgICBBWFRSQUNFKG1ha2VTdHJpbmcoIldl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZToi LCBTdHJpbmcoYXR0cmlidXRlTmFtZSkpKTsKKwogICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBz ZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKLSAgICBpZiAoIWJhY2tpbmdPYmplY3QpCisg ICAgaWYgKCFiYWNraW5nT2JqZWN0KSB7CisgICAgICAgIEFYTE9HKCJObyBiYWNraW5nT2JqZWN0 ISEhIik7CiAgICAgICAgIHJldHVybiBuaWw7CisgICAgfQogCiAgICAgaWYgKGJhY2tpbmdPYmpl Y3QtPmlzRGV0YWNoZWRGcm9tUGFyZW50KCkpIHsKICAgICAgICAgQVhMT0coImJhY2tpbmdPYmpl Y3QgaXMgZGV0YWNoZWQgZnJvbSBwYXJlbnQhISEiKTsKQEAgLTMzNjAsMTEgKzMzNjMsMTUgQEAg QUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAjZW5kaWYKIH0KIAotLSAodm9p ZClfYWNjZXNzaWJpbGl0eVNldFZhbHVlOihpZCl2YWx1ZSBmb3JBdHRyaWJ1dGU6KE5TU3RyaW5n KilhdHRyaWJ1dGVOYW1lCistICh2b2lkKV9hY2Nlc3NpYmlsaXR5U2V0VmFsdWU6KGlkKXZhbHVl IGZvckF0dHJpYnV0ZTooTlNTdHJpbmcgKilhdHRyaWJ1dGVOYW1lCiB7CisgICAgQVhUUkFDRSht YWtlU3RyaW5nKCJXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNl dFZhbHVlOiBmb3JBdHRyaWJ1dGU6IiwgU3RyaW5nKGF0dHJpYnV0ZU5hbWUpKSk7CisKICAgICBh dXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi51cGRhdGVPYmplY3RCYWNraW5nU3RvcmU7Ci0gICAg aWYgKCFiYWNraW5nT2JqZWN0KQorICAgIGlmICghYmFja2luZ09iamVjdCkgeworICAgICAgICBB WExPRygiTm8gYmFja2luZ09iamVjdCEhISIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAg ICAgQVhUZXh0TWFya2VyUmFuZ2VSZWYgdGV4dE1hcmtlclJhbmdlID0gbmlsOwogICAgIE5TTnVt YmVyKiAgICAgICAgICAgICAgIG51bWJlciA9IG5pbDsK 415767 2020-12-09 09:12:11 -0800 2020-12-09 16:35:54 -0800 Patch bug-219662-20201209121210.patch text/plain 15844 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzkwNzk2ZjgwYTI0Yzk4 ZWRmMWE4MGViMTY3YjAxMGM4OTcyOTQ4OS4uMjAzZDJiZDIwY2ZkNGRhMGZhNzJhNTRiZjlmMTk1 ZGRlMTZlZDc4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIwLTEyLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGZv Y3VzIHRyYWNraW5nIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY2MgorCisgICAgICAgIFJldmlld2VkIGJ5 IENocmlzIEZsZWl6YWNoLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisK KyAgICAgICAgLSBBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5vZGVJRCBhbmQgYXBwbHlQZW5k aW5nQ2hhbmdlcyBub3cgcHJvcGVybHkKKyAgICAgICAgaGFuZGxlIHRoZSBmb2N1c2VkIG5vZGUg SUQgdXBkYXRlIHdoZW4gdGhlIGZvY3VzZWQgb2JqZWN0IGNoYW5nZXMuCisgICAgICAgIC0gQWNj ZXNzaWJpbGl0eU9iamVjdDo6c2V0Rm9jdXNlZCBzZXRzIGZvY3VzIGFuZCBhY3RpdmF0ZXMgdGhl CisgICAgICAgIGNvcnJlc3BvbmRpbmcgdmlldy4gVGhpcyB3YXMgZG9uZSBpbiB0aGUgd3JhcHBl ciBiYXNlQWNjZXNzaWJpbGl0eVNldEZvY3VzCisgICAgICAgIG1ldGhvZCwgYnV0IHRoaXMgaXMg YSBtb3JlIGFwcHJvcHJpYXRlIHBsYWNlIGZvciB0aGlzIGNvcmUgZnVuY3Rpb25hbGl0eS4KKyAg ICAgICAgLSBTb21lIGNvZGUgY2xlYW51cCwgQVNTRVJUIGNoZWNrcyBvZiBhcHByb3ByaWF0ZSB0 aHJlYWQsIGFuZCBhZGRpdGlvbmFsCisgICAgICAgIGxvZ2dpbmcuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6c2V0Rm9jdXNlZCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OnNldEZvY3VzZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVNjcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVNjcm9s bFZpZXc6OnNldEZvY3VzZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNldEZvY3VzOl0pOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QVhJc29sYXRlZE9iamVjdDo6cGFnZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpB WElzb2xhdGVkT2JqZWN0Ojpkb2N1bWVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWElz b2xhdGVkT2JqZWN0Ojpkb2N1bWVudEZyYW1lVmlldyBjb25zdCk6CisgICAgICAgICogYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QVhJc29sYXRlZFRyZWU6OnNldEZvY3VzZWROb2RlSUQpOgorICAgICAgICAoV2ViQ29yZTo6 QVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMpOgorICAgICAgICAqIGFjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbToK KyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlIGJhc2VBY2Nlc3Np YmlsaXR5U2V0Rm9jdXM6XSk6CisgICAgICAgIERlbGV0ZWQsIG5vdCBuZWVkZWQgc2luY2UgY29y ZSBmdW5jdGlvbmFsaXR5IGlzIG5vdyBpbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZXRGb2N1c2Vk LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nl c3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6XSk6CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyIF9hY2Nlc3NpYmlsaXR5U2V0VmFsdWU6Zm9yQXR0cmlidXRlOl0pOgorCiAy MDIwLTEyLTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bSUZDXSBTZXQgaHlwaGVuIG9uIHRoZSBsYXN0IHRleHQgcnVuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCBlNzQ5 YjA3NDZhNDY2OWJkMTIyYzgwODI1Y2U3ODYyYzYzNWMyNjUyLi43ZWM2MzIxZmNiMDM3Y2EwYjJj NzU0NzIxZTEyODNkOWVlOWExYWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTI1NjEsNyArMjU2MSw0MCBAQCBB WENvcmVPYmplY3QqIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmZvY3VzZWRVSUVsZW1lbnQoKSBjb25z dAogICAgIGF1dG8qIGF4T2JqZWN0Q2FjaGUgPSB0aGlzLT5heE9iamVjdENhY2hlKCk7CiAgICAg cmV0dXJuIHBhZ2UgJiYgYXhPYmplY3RDYWNoZSA/IGF4T2JqZWN0Q2FjaGUtPmZvY3VzZWRPYmpl Y3RGb3JQYWdlKHBhZ2UpIDogbnVsbHB0cjsKIH0KLSAgICAKKwordm9pZCBBY2Nlc3NpYmlsaXR5 T2JqZWN0OjpzZXRGb2N1c2VkKGJvb2wgZm9jdXMpCit7CisgICAgaWYgKGZvY3VzKSB7CisgICAg ICAgIC8vIEVuc3VyZSB0aGF0IHRoZSB2aWV3IGlzIGZvY3VzZWQgYW5kIGFjdGl2ZSwgb3RoZXJ3 aXNlLCBhbnkgYXR0ZW1wdCB0byBzZXQgZm9jdXMgdG8gYW4gb2JqZWN0IGluc2lkZSBpdCB3aWxs IGZhaWwuCisgICAgICAgIGF1dG8qIGRvY3VtZW50ID0gdGhpcy0+ZG9jdW1lbnQoKTsKKyAgICAg ICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvKiBm cmFtZSA9IGRvY3VtZW50LT5mcmFtZSgpOworICAgICAgICBpZiAoZnJhbWUgJiYgZnJhbWUtPnNl bGVjdGlvbigpLmlzRm9jdXNlZEFuZEFjdGl2ZSgpKQorICAgICAgICAgICAgcmV0dXJuOyAvLyBO b3RoaW5nIHRvIGRvLCBhbHJlYWR5IGZvY3VzZWQgYW5kIGFjdGl2ZS4KKworICAgICAgICBhdXRv KiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKTsKKyAgICAgICAgaWYgKCFwYWdlKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIENocm9tZUNsaWVudCYgY2hyb21lQ2xpZW50ID0gcGFnZS0+ Y2hyb21lKCkuY2xpZW50KCk7CisgICAgICAgIGNocm9tZUNsaWVudC5mb2N1cygpOworCisjaWYg UExBVEZPUk0oQ09DT0EpCisgICAgICAgIGF1dG8qIGZyYW1lVmlldyA9IGRvY3VtZW50RnJhbWVW aWV3KCk7CisgICAgICAgIGlmICghZnJhbWVWaWV3KQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIC8vIExlZ2FjeSBXZWJLaXQxIGNhc2UuCisgICAgICAgIGlmIChmcmFtZVZpZXctPnBs YXRmb3JtV2lkZ2V0KCkpCisgICAgICAgICAgICBjaHJvbWVDbGllbnQubWFrZUZpcnN0UmVzcG9u ZGVyKChOU1Jlc3BvbmRlciAqKWZyYW1lVmlldy0+cGxhdGZvcm1XaWRnZXQoKSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGNocm9tZUNsaWVudC5hc3Npc3RpdmVUZWNobm9sb2d5TWFrZUZp cnN0UmVzcG9uZGVyKCk7CisjZW5kaWYKKyAgICB9Cit9CisKIEFjY2Vzc2liaWxpdHlTb3J0RGly ZWN0aW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNvcnREaXJlY3Rpb24oKSBjb25zdAogewogICAg IEFjY2Vzc2liaWxpdHlSb2xlIHJvbGUgPSByb2xlVmFsdWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggMTdiZGFlMTEy MGQyMjk3YTY4NWRmOWYwZWQ3ZjE1ZGNjMzA3NmNmNC4uNTRlNGMyZTFjMzhmYTljYzJmNjJhMzMw YmU0NDkyMjNiZTJkNzRjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTQ1Nyw3ICs0NTcsMTAgQEAgcHVibGljOgogICAg IHVuc2lnbmVkIGhpZXJhcmNoaWNhbExldmVsKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gMDsg fQogICAgIGJvb2wgaXNJbmxpbmVUZXh0KCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIHNl dEZvY3VzZWQoYm9vbCkgb3ZlcnJpZGUgeyB9CisgICAgLy8gRW5zdXJlcyB0aGF0IHRoZSB2aWV3 IGlzIGZvY3VzZWQgYW5kIGFjdGl2ZSBiZWZvcmUgYXR0ZW1wdGluZyB0byBzZXQgZm9jdXMgdG8g YW4gQWNjZXNzaWJpbGl0eU9iamVjdC4KKyAgICAvLyBTdWJjbGFzc2VzIHRoYXQgb3ZlcnJpZGUg c2V0Rm9jdXNlZCBzaG91bGQgY2FsbCB0aGlzIGJhc2UgaW1wbGVtZW50YXRpb24gZmlyc3QuCisg ICAgdm9pZCBzZXRGb2N1c2VkKGJvb2wpIG92ZXJyaWRlOworCiAgICAgdm9pZCBzZXRTZWxlY3Rl ZFRleHQoY29uc3QgU3RyaW5nJikgb3ZlcnJpZGUgeyB9CiAgICAgdm9pZCBzZXRTZWxlY3RlZFRl eHRSYW5nZShjb25zdCBQbGFpblRleHRSYW5nZSYpIG92ZXJyaWRlIHsgfQogICAgIGJvb2wgc2V0 VmFsdWUoY29uc3QgU3RyaW5nJikgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCmluZGV4IDdmMmJkYThiZTEzYzk1OGUxYTA4YTdhMGZiODUzMmJlOWM1Y2NlZGIu LjAyMzAwZDk4Nzg1MWFiYTA0ZDdkMzNkNTZkMDBiYzY5MDBmZTVhY2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcApAQCAtMTg0OSw3ICsxODQ5LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjpzZXRGb2N1c2VkKGJvb2wgb24pCiB7CiAgICAgaWYgKCFjYW5TZXRGb2N1c0F0dHJpYnV0 ZSgpKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSB0 aGlzLT5kb2N1bWVudCgpOwogICAgIE5vZGUqIG5vZGUgPSB0aGlzLT5ub2RlKCk7CiAKQEAgLTE4 NTgsMTEgKzE4NTgsMTQgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRGb2N1 c2VkKGJvb2wgb24pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICAvLyBDYWxsIHRoZSBi YXNlIGNsYXNzIHNldEZvY3VzZWQgdG8gZW5zdXJlIHRoZSB2aWV3IGlzIGZvY3VzZWQgYW5kIGFj dGl2ZS4KKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZXRGb2N1c2VkKG9uKTsKKwogICAgIC8v IFdoZW4gYSBub2RlIGlzIHRvbGQgdG8gc2V0IGZvY3VzLCB0aGF0IGNhbiBjYXVzZSBpdCB0byBi ZSBkZWFsbG9jYXRlZCwgd2hpY2ggbWVhbnMgdGhhdCBkb2luZwogICAgIC8vIGFueXRoaW5nIGVs c2UgaW5zaWRlIHRoaXMgb2JqZWN0IHdpbGwgY3Jhc2guIFRvIGZpeCB0aGlzLCB3ZSBhZGRlZCBh IFJlZlB0ciB0byBwcm90ZWN0IHRoaXMgb2JqZWN0CiAgICAgLy8gbG9uZyBlbm91Z2ggZm9yIGR1 cmF0aW9uLgogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBwcm90ZWN0ZWRUaGlzKHRo aXMpOwotICAgIAorCiAgICAgLy8gSWYgdGhpcyBub2RlIGlzIGFscmVhZHkgdGhlIGN1cnJlbnRs eSBmb2N1c2VkIG5vZGUsIHRoZW4gY2FsbGluZyBmb2N1cygpIHdvbid0IGRvIGFueXRoaW5nLgog ICAgIC8vIFRoYXQgaXMgYSBwcm9ibGVtIHdoZW4gZm9jdXMgaXMgcmVtb3ZlZCBmcm9tIHRoZSB3 ZWJwYWdlIHRvIGNocm9tZSwgYW5kIHRoZW4gcmV0dXJucy4KICAgICAvLyBJbiB0aGVzZSBjYXNl cywgd2UgbmVlZCB0byBkbyB3aGF0IGtleWJvYXJkIGFuZCBtb3VzZSBmb2N1cyBkbywgd2hpY2gg aXMgcmVzZXQgZm9jdXMgZmlyc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCmluZGV4IGZjYWMyOTIyOTMzMzI0 NGIwYmRhNGNhMGNhZGFkNjI1OTNhYzBiNTAuLjkyYjBkZWZkMmYyZGI3Yzc1ZTYwZGQyZGVlZDNh YWMxOWU5NTBhNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCkBAIC0xMDQsOSArMTA0LDEyIEBAIGJvb2wg QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmlzRm9jdXNlZCgpIGNvbnN0CiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogd2ViQXJlYSA9IHdlYkFyZWFPYmplY3QoKTsKICAgICByZXR1cm4gd2ViQXJl YSAmJiB3ZWJBcmVhLT5pc0ZvY3VzZWQoKTsKIH0KLSAgICAKKwogdm9pZCBBY2Nlc3NpYmlsaXR5 U2Nyb2xsVmlldzo6c2V0Rm9jdXNlZChib29sIGZvY3VzZWQpCiB7CisgICAgLy8gQ2FsbCB0aGUg YmFzZSBjbGFzcyBzZXRGb2N1c2VkIHRvIGVuc3VyZSB0aGUgdmlldyBpcyBmb2N1c2VkIGFuZCBh Y3RpdmUuCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0Rm9jdXNlZChmb2N1c2VkKTsKKwog ICAgIGlmIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiB3ZWJBcmVhID0gd2ViQXJlYU9iamVjdCgpKQog ICAgICAgICB3ZWJBcmVhLT5zZXRGb2N1c2VkKGZvY3VzZWQpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlcklPUy5tbQppbmRleCBkYjkzZDY2NjNkNTg2NmY1MzFlYzU1MTJjOGJh MWRjMmJkMDYwNzc5Li40OGY1ZGVmYTkwOGU5Njc2MmY4MmY0MmRlOTE5Yzg0YjZhMzhkMWY5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQpAQCAtMjA4MSw3ICsyMDgx LDggQEAgc3RhdGljIFJlbmRlck9iamVjdCogcmVuZGVyZXJGb3JWaWV3KFdBS1ZpZXcqIHZpZXcp CiAKIC0gKHZvaWQpX2FjY2Vzc2liaWxpdHlTZXRGb2N1czooQk9PTClmb2N1cwogewotICAgIFtz ZWxmIGJhc2VBY2Nlc3NpYmlsaXR5U2V0Rm9jdXM6Zm9jdXNdOworICAgIGlmIChhdXRvKiBiYWNr aW5nT2JqZWN0ID0gc2VsZi5heEJhY2tpbmdPYmplY3QpCisgICAgICAgIGJhY2tpbmdPYmplY3Qt PnNldEZvY3VzZWQoZm9jdXMpOwogfQogCiAtICh2b2lkKWFjY2Vzc2liaWxpdHlEZWNyZWFzZVNl bGVjdGlvbjooVGV4dEdyYW51bGFyaXR5KWdyYW51bGFyaXR5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCmluZGV4IDFmMzcyNDRjNjVjM2QyZDI2NTZkY2UwZjQ0YTRmY2U5ZDBkNWFjYTMuLjJl OWMyZmI2NDVkNDA3Zjg2M2M2ZDRjZWJkZTNkMmUyOWNjMjYzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCkBAIC0xOTA1LDI0ICsxOTA1LDM0IEBAIFdpZGdldCogQVhJc29sYXRlZE9i amVjdDo6d2lkZ2V0Rm9yQXR0YWNobWVudFZpZXcoKSBjb25zdAogCiBQYWdlKiBBWElzb2xhdGVk T2JqZWN0OjpwYWdlKCkgY29uc3QKIHsKLSAgICBpZiAoYXV0byogb2JqZWN0ID0gYXNzb2NpYXRl ZEFYT2JqZWN0KCkpCi0gICAgICAgIHJldHVybiBvYmplY3QtPnBhZ2UoKTsKKyAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOworCisgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFY T2JqZWN0KCkpCisgICAgICAgIHJldHVybiBheE9iamVjdC0+cGFnZSgpOworCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKIERvY3VtZW50KiBBWElz b2xhdGVkT2JqZWN0Ojpkb2N1bWVudCgpIGNvbnN0CiB7Ci0gICAgaWYgKGF1dG8qIG9iamVjdCA9 IGFzc29jaWF0ZWRBWE9iamVjdCgpKQotICAgICAgICByZXR1cm4gb2JqZWN0LT5kb2N1bWVudCgp OworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisKKyAgICBpZiAoYXV0byogYXhPYmplY3Qg PSBhc3NvY2lhdGVkQVhPYmplY3QoKSkKKyAgICAgICAgcmV0dXJuIGF4T2JqZWN0LT5kb2N1bWVu dCgpOworCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9 CiAKIEZyYW1lVmlldyogQVhJc29sYXRlZE9iamVjdDo6ZG9jdW1lbnRGcmFtZVZpZXcoKSBjb25z dAogewotICAgIGlmIChhdXRvKiBvYmplY3QgPSBhc3NvY2lhdGVkQVhPYmplY3QoKSkKLSAgICAg ICAgcmV0dXJuIG9iamVjdC0+ZG9jdW1lbnRGcmFtZVZpZXcoKTsKKyAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOworCisgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0 KCkpCisgICAgICAgIHJldHVybiBheE9iamVjdC0+ZG9jdW1lbnRGcmFtZVZpZXcoKTsKKworICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBudWxscHRyOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5jcHAKaW5kZXggODBkZTVjOTJkMTk2MGViN2ZlMTJiNTZkZDA2MDc0NDE4OTIz MGUwYy4uZTM5MDc3MGJjMjIzYTM4Zjc4ZDJmNDA4MzQ1OTBhM2M4YjczYmZjZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcApAQCAtMzg4LDggKzM4OCwxMyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVl OjpzZXRGb2N1c2VkTm9kZUlEKEFYSUQgYXhJRCkKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJl ZTo6c2V0Rm9jdXNlZE5vZGVJRCIpOwogICAgIEFYTE9HKG1ha2VTdHJpbmcoImF4SUQgIiwgYXhJ RCkpOwogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisKICAgICBMb2NrSG9sZGVyIGxvY2tl ciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgPSBheElE OworCisgICAgQVhQcm9wZXJ0eU1hcCBwcm9wZXJ0eU1hcDsKKyAgICBwcm9wZXJ0eU1hcC5zZXQo QVhQcm9wZXJ0eU5hbWU6OklzRm9jdXNlZCwgdHJ1ZSk7CisgICAgbV9wZW5kaW5nUHJvcGVydHlD aGFuZ2VzLmFwcGVuZCh7IGF4SUQsIHByb3BlcnR5TWFwIH0pOwogfQogCiB2b2lkIEFYSXNvbGF0 ZWRUcmVlOjpyZW1vdmVOb2RlKEFYSUQgYXhJRCkKQEAgLTQzNiw4ICs0NDEsMTcgQEAgdm9pZCBB WElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygpCiAKICAgICBMb2NrSG9sZGVyIGxv Y2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogCi0gICAgQVhMT0cobWFrZVN0cmluZygiZm9jdXNl ZE5vZGVJRCAiLCBtX2ZvY3VzZWROb2RlSUQsICIgcGVuZGluZ0ZvY3VzZWROb2RlSUQgIiwgbV9w ZW5kaW5nRm9jdXNlZE5vZGVJRCkpOwotICAgIG1fZm9jdXNlZE5vZGVJRCA9IG1fcGVuZGluZ0Zv Y3VzZWROb2RlSUQ7CisgICAgaWYgKG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgIT0gbV9mb2N1c2Vk Tm9kZUlEKSB7CisgICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoImZvY3VzZWROb2RlSUQgIiwgbV9m b2N1c2VkTm9kZUlELCAiIHBlbmRpbmdGb2N1c2VkTm9kZUlEICIsIG1fcGVuZGluZ0ZvY3VzZWRO b2RlSUQpKTsKKworICAgICAgICBpZiAobV9mb2N1c2VkTm9kZUlEICE9IEludmFsaWRBWElEKSB7 CisgICAgICAgICAgICAvLyBTZXQgdGhlIG9sZCBmb2N1c2VkIG9iamVjdCdzIElzRm9jdXNlZCBw cm9wZXJ0eSB0byBmYWxzZS4KKyAgICAgICAgICAgIEFYUHJvcGVydHlNYXAgcHJvcGVydHlNYXA7 CisgICAgICAgICAgICBwcm9wZXJ0eU1hcC5zZXQoQVhQcm9wZXJ0eU5hbWU6OklzRm9jdXNlZCwg ZmFsc2UpOworICAgICAgICAgICAgbV9wZW5kaW5nUHJvcGVydHlDaGFuZ2VzLmFwcGVuZCh7IG1f Zm9jdXNlZE5vZGVJRCwgcHJvcGVydHlNYXAgfSk7CisgICAgICAgIH0KKyAgICAgICAgbV9mb2N1 c2VkTm9kZUlEID0gbV9wZW5kaW5nRm9jdXNlZE5vZGVJRDsKKyAgICB9CiAKICAgICB3aGlsZSAo bV9wZW5kaW5nTm9kZVJlbW92YWxzLnNpemUoKSkgewogICAgICAgICBhdXRvIGF4SUQgPSBtX3Bl bmRpbmdOb2RlUmVtb3ZhbHMudGFrZUxhc3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJCYXNlLmgKaW5kZXggMDkyYzdkYjNmMjBiYWI2ZTU3N2E3ZDIxYTg4NWNhY2UyODVjNTY5 My4uZTcyODE4MTQzOGU2MGRiY2QxNjRhYzU1NTUwNTVjOGE3NjEyMmM3NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmgKQEAgLTc0LDcgKzc0LDYgQEAgY2xhc3MgVmlz aWJsZVBvc2l0aW9uOwogLSAoTlNTdHJpbmcgKiliYXNlQWNjZXNzaWJpbGl0eUhlbHBUZXh0Owog LSAoTlNBcnJheTxOU1N0cmluZyAqPiAqKWJhc2VBY2Nlc3NpYmlsaXR5U3BlZWNoSGludDsKIAot LSAodm9pZCliYXNlQWNjZXNzaWJpbGl0eVNldEZvY3VzOihCT09MKWZvY3VzOwogLSAoTlNTdHJp bmcgKilhcmlhTGFuZG1hcmtSb2xlRGVzY3JpcHRpb247CiAKIC0gKGlkKWF0dGFjaG1lbnRWaWV3 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCmluZGV4IDRjOTFjNjBi NmEyYWE4MTExM2Y2YjkzNTQ2YmZiMGUzMTEzYmJhMjkuLjVmYmU5Zjk3NTNmNzBmNjE5ZDNmYmQ0 YmU1NTYyYTdjNTdmODg2NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJh c2UubW0KQEAgLTQzLDggKzQzLDYgQEAKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlUYWJsZUNlbGwu aCIKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlUYWJsZUNvbHVtbi5oIgogI2ltcG9ydCAiQWNjZXNz aWJpbGl0eVRhYmxlUm93LmgiCi0jaW1wb3J0ICJDaHJvbWUuaCIKLSNpbXBvcnQgIkNocm9tZUNs aWVudC5oIgogI2ltcG9ydCAiQ29sb3JNYWMuaCIKICNpbXBvcnQgIkNvbnRleHRNZW51Q29udHJv bGxlci5oIgogI2ltcG9ydCAiRWRpdGluZy5oIgpAQCAtNDY5LDI3ICs0NjcsNiBAQCBzdGF0aWMg dm9pZCBjb252ZXJ0UGF0aFRvU2NyZWVuU3BhY2VGdW5jdGlvbihQYXRoQ29udmVyc2lvbkluZm8m IGNvbnZlcnNpb24sIGNvbgogICAgIHJldHVybiBzZWxmLmF4QmFja2luZ09iamVjdC0+YXJpYUxh bmRtYXJrUm9sZURlc2NyaXB0aW9uKCk7CiB9CiAKLS0gKHZvaWQpYmFzZUFjY2Vzc2liaWxpdHlT ZXRGb2N1czooQk9PTClmb2N1cwotewotICAgIC8vIElmIGZvY3VzIGlzIGp1c3Qgc2V0IHdpdGhv dXQgbWFraW5nIHRoZSB2aWV3IHRoZSBmaXJzdCByZXNwb25kZXIsIHRoZW4ga2V5Ym9hcmQgZm9j dXMgd29uJ3QgbW92ZSB0byB0aGUgcmlnaHQgcGxhY2UuCi0gICAgaWYgKGZvY3VzICYmICFzZWxm LmF4QmFja2luZ09iamVjdC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCkuaXNGb2N1 c2VkQW5kQWN0aXZlKCkpIHsKLSAgICAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBzZWxmLmF4 QmFja2luZ09iamVjdC0+ZG9jdW1lbnRGcmFtZVZpZXcoKTsKLSAgICAgICAgUGFnZSogcGFnZSA9 IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5wYWdlKCk7Ci0gICAgICAgIGlmIChwYWdlICYmIGZyYW1l VmlldykgewotICAgICAgICAgICAgQ2hyb21lQ2xpZW50JiBjaHJvbWVDbGllbnQgPSBwYWdlLT5j aHJvbWUoKS5jbGllbnQoKTsKLSAgICAgICAgICAgIGNocm9tZUNsaWVudC5mb2N1cygpOwotCi0g ICAgICAgICAgICAvLyBMZWdhY3kgV2ViS2l0MSBjYXNlLgotICAgICAgICAgICAgaWYgKGZyYW1l Vmlldy0+cGxhdGZvcm1XaWRnZXQoKSkKLSAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQubWFr ZUZpcnN0UmVzcG9uZGVyKGZyYW1lVmlldy0+cGxhdGZvcm1XaWRnZXQoKSk7Ci0gICAgICAgICAg ICBlbHNlCi0gICAgICAgICAgICAgICAgY2hyb21lQ2xpZW50LmFzc2lzdGl2ZVRlY2hub2xvZ3lN YWtlRmlyc3RSZXNwb25kZXIoKTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHNlbGYuYXhCYWNr aW5nT2JqZWN0LT5zZXRGb2N1c2VkKGZvY3VzKTsKLX0KLQogLSAoTlNTdHJpbmcgKilhY2Nlc3Np YmlsaXR5UGxhdGZvcm1NYXRoU3Vic2NyaXB0S2V5CiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCmluZGV4IDgzZjUxNzlh YzcyNzJkODQ1ODIyOGYyYzIwN2NiMTJhMmIwMWRlZjMuLjA1YzMyZWU0YTJiZmU4ZDYyODUwMThh N2ViNGZkMWFjNDAwYzQxMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFj Lm1tCkBAIC0yMTM5LDkgKzIxMzksMTIgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElP TlNfQkVHSU4KIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogewogICAgIEFY VFJBQ0UobWFrZVN0cmluZygiV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJp bGl0eUF0dHJpYnV0ZVZhbHVlOiIsIFN0cmluZyhhdHRyaWJ1dGVOYW1lKSkpOworCiAgICAgYXV0 byogYmFja2luZ09iamVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOwotICAgIGlm ICghYmFja2luZ09iamVjdCkKKyAgICBpZiAoIWJhY2tpbmdPYmplY3QpIHsKKyAgICAgICAgQVhM T0coIk5vIGJhY2tpbmdPYmplY3QhISEiKTsKICAgICAgICAgcmV0dXJuIG5pbDsKKyAgICB9CiAK ICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNEZXRhY2hlZEZyb21QYXJlbnQoKSkgewogICAgICAg ICBBWExPRygiYmFja2luZ09iamVjdCBpcyBkZXRhY2hlZCBmcm9tIHBhcmVudCEhISIpOwpAQCAt MzM2MCwxMSArMzM2MywxNSBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQK ICNlbmRpZgogfQogCi0tICh2b2lkKV9hY2Nlc3NpYmlsaXR5U2V0VmFsdWU6KGlkKXZhbHVlIGZv ckF0dHJpYnV0ZTooTlNTdHJpbmcqKWF0dHJpYnV0ZU5hbWUKKy0gKHZvaWQpX2FjY2Vzc2liaWxp dHlTZXRWYWx1ZTooaWQpdmFsdWUgZm9yQXR0cmlidXRlOihOU1N0cmluZyAqKWF0dHJpYnV0ZU5h bWUKIHsKKyAgICBBWFRSQUNFKG1ha2VTdHJpbmcoIldlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyIF9hY2Nlc3NpYmlsaXR5U2V0VmFsdWU6IGZvckF0dHJpYnV0ZToiLCBTdHJpbmcoYXR0cmli dXRlTmFtZSkpKTsKKwogICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLnVwZGF0ZU9iamVj dEJhY2tpbmdTdG9yZTsKLSAgICBpZiAoIWJhY2tpbmdPYmplY3QpCisgICAgaWYgKCFiYWNraW5n T2JqZWN0KSB7CisgICAgICAgIEFYTE9HKCJObyBiYWNraW5nT2JqZWN0ISEhIik7CiAgICAgICAg IHJldHVybjsKKyAgICB9CiAKICAgICBBWFRleHRNYXJrZXJSYW5nZVJlZiB0ZXh0TWFya2VyUmFu Z2UgPSBuaWw7CiAgICAgTlNOdW1iZXIqICAgICAgICAgICAgICAgbnVtYmVyID0gbmlsOwpAQCAt MzM5Miw3ICszMzk5LDcgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAg ICAgICAgICAgICAgICAgYmFja2luZ09iamVjdC0+c2V0U2VsZWN0ZWRWaXNpYmxlUG9zaXRpb25S YW5nZSh2aXNpYmxlUG9zaXRpb25SYW5nZUZvclRleHRNYXJrZXJSYW5nZShiYWNraW5nT2JqZWN0 LT5heE9iamVjdENhY2hlKCksIHRleHRNYXJrZXJSYW5nZSkpOwogICAgICAgICB9KTsKICAgICB9 IGVsc2UgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5 Rm9jdXNlZEF0dHJpYnV0ZV0pIHsKLSAgICAgICAgW3NlbGYgYmFzZUFjY2Vzc2liaWxpdHlTZXRG b2N1czpbbnVtYmVyIGJvb2xWYWx1ZV1dOworICAgICAgICBiYWNraW5nT2JqZWN0LT5zZXRGb2N1 c2VkKFtudW1iZXIgYm9vbFZhbHVlXSk7CiAgICAgfSBlbHNlIGlmIChbYXR0cmlidXRlTmFtZSBp c0VxdWFsVG9TdHJpbmc6IE5TQWNjZXNzaWJpbGl0eVZhbHVlQXR0cmlidXRlXSkgewogICAgICAg ICBpZiAobnVtYmVyICYmIGJhY2tpbmdPYmplY3QtPmNhblNldE51bWVyaWNWYWx1ZSgpKQogICAg ICAgICAgICAgYmFja2luZ09iamVjdC0+c2V0VmFsdWUoW251bWJlciBmbG9hdFZhbHVlXSk7Cg==