225553 2021-05-07 20:03:42 -0700 Introduce JSObject::getIfPropertyExists helper 2021-05-08 00:33:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling ashvayka ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1758145 0 ross.kirsling 2021-05-07 20:03:42 -0700 Introduce JSObject::getIfPropertyExists helper 1758146 1 428074 ross.kirsling 2021-05-07 20:07:31 -0700 Created attachment 428074 Patch 1758153 2 428074 ashvayka 2021-05-07 20:41:26 -0700 Comment on attachment 428074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428074&action=review Sweet! Thank you for the follow-up. I presume there might be more usages for getIfPropertyExists() in future (like around GetBindingValue). r=me with error handling suggestion. > Source/JavaScriptCore/runtime/JSObjectInlines.h:205 > + Since getIfPropertyExists() call sites should check exception either way, I think we can completely drop exception handling from this helper. At this point (hasProperty: true), we are guaranteed to be exception-free, and can just return the ternary expression. 1758167 3 428081 ross.kirsling 2021-05-07 23:43:04 -0700 Created attachment 428081 Patch for landing 1758168 4 428082 ross.kirsling 2021-05-07 23:47:00 -0700 Created attachment 428082 Patch for landing 1758169 5 ews-feeder 2021-05-08 00:23:00 -0700 Patch 428081 does not build 1758170 6 ews-feeder 2021-05-08 00:32:54 -0700 Committed r277224 (237495@main): <https://commits.webkit.org/237495@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428082. 1758171 7 webkit-bug-importer 2021-05-08 00:33:14 -0700 <rdar://problem/77690047> 428074 2021-05-07 20:07:31 -0700 2021-05-07 23:43:02 -0700 Patch bug-225553-20210507200729.patch text/plain 6793 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZmNhYWI0ODliZDAxZDg4NDZhMjM3YjY5YzBhNjRhYzUwYjI3ODVmLi40YjRiZTI4MjVhNGNkOTg1 MGFjMGRlNzE0M2U5OGNkNWE3N2NjNzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgSW50cm9kdWNlIEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3Rz IGhlbHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1NTUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U3VnZ2VzdGVkIGJ5IEFsZXhleSBkdXJpbmcgcmV2aWV3IG9mIHIyNzcyMjEuCisgICAgICAgIEFy cmF5UHJvdG90eXBlIGFsc28gaGFzIGEgIkhhcy1ndWFyZGVkIEdldCIsIHNvIGl0J3MgaGVscGZ1 bCBmb3IgSlNPYmplY3QgdG8gaG91c2UgdGhpcyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cnVudGltZS9BcnJheVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OmdldFByb3BlcnR5KToK KyAgICAgICAgKiBydW50aW1lL0Vycm9ySW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpFcnJv ckluc3RhbmNlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5o OgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpT T2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKToKKwogMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGlu ZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgW0pTQ10gRXJyb3IjY2F1c2Ug bXVzdCByZWNvZ25pemUgZXhwbGljaXQgdW5kZWZpbmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAKaW5kZXggZjQzM2FhMTEzMjA2NWU3YjZh MWJjNGU0NzlmMDM2NGQwNGY1MGIyOC4uZjI0NGIyOTdiZmY2ZjhmYmRiNjIwMGJkYmYyODcwNmRk Y2I1Y2JiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQ cm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJv dG90eXBlLmNwcApAQCAtMTQ3LDIyICsxNDcsMTQgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUgSlNW YWx1ZSBnZXRQcm9wZXJ0eShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU09iamVjdCoK IHsKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIAorCiAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0g b2JqZWN0LT50cnlHZXRJbmRleFF1aWNrbHkoaW5kZXgpKQogICAgICAgICByZXR1cm4gcmVzdWx0 OwotICAgIC8vIFdlIHdhbnQgdG8gcGVyZm9ybSBnZXQgYW5kIGhhcyBpbiB0aGUgc2FtZSBvcGVy YXRpb24uCi0gICAgLy8gV2UgY2FuIG9ubHkgZG8gc28gd2hlbiB0aGlzIGJlaGF2aW9yIGlzIG5v dCBvYnNlcnZhYmxlLiBUaGUKLSAgICAvLyBvbmx5IHRpbWUgaXQgaXMgb2JzZXJ2YWJsZSBpcyB3 aGVuIHdlIGVuY291bnRlciBhbiBvcGFxdWUgb2JqZWN0cyAoUHJveHlPYmplY3QgYW5kIEpTTW9k dWxlTmFtZXNwYWNlT2JqZWN0KQotICAgIC8vIHNvbWV3aGVyZSBpbiB0aGUgcHJvdG90eXBlIGNo YWluLgotICAgIFByb3BlcnR5U2xvdCBzbG90KG9iamVjdCwgUHJvcGVydHlTbG90OjpJbnRlcm5h bE1ldGhvZFR5cGU6Okhhc1Byb3BlcnR5KTsKLSAgICBib29sIGhhc1Byb3BlcnR5ID0gb2JqZWN0 LT5nZXRQcm9wZXJ0eVNsb3QoZ2xvYmFsT2JqZWN0LCBpbmRleCwgc2xvdCk7Ci0gICAgRVhDRVBU SU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkgfHwgIWhhc1Byb3BlcnR5KTsKLSAgICBpZiAo IWhhc1Byb3BlcnR5KQotICAgICAgICByZXR1cm4geyB9OwotICAgIGlmIChVTkxJS0VMWShzbG90 LmlzVGFpbnRlZEJ5T3BhcXVlT2JqZWN0KCkpKQotICAgICAgICBSRUxFQVNFX0FORF9SRVRVUk4o c2NvcGUsIG9iamVjdC0+Z2V0KGdsb2JhbE9iamVjdCwgaW5kZXgpKTsKIAotICAgIFJFTEVBU0Vf QU5EX1JFVFVSTihzY29wZSwgc2xvdC5nZXRWYWx1ZShnbG9iYWxPYmplY3QsIGluZGV4KSk7Cisg ICAgLy8gRG9uJ3QgcmV0dXJuIHVuZGVmaW5lZCBpZiB0aGUgcHJvcGVydHkgaXMgbm90IGZvdW5k LgorICAgIGF1dG8gcHJvcGVydHkgPSBvYmplY3QtPmdldElmUHJvcGVydHlFeGlzdHMoZ2xvYmFs T2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tKHZtLCBpbmRleCkpOworICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIHsgfSk7CisgICAgcmV0dXJuIHByb3BlcnR5LnZhbHVlT3IoSlNWYWx1ZSgp KTsKIH0KIAogc3RhdGljIEFMV0FZU19JTkxJTkUgdm9pZCBzZXRMZW5ndGgoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgVk0mIHZtLCBKU09iamVjdCogb2JqLCB1aW50NjRfdCB2YWx1ZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySW5zdGFuY2Uu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKaW5k ZXggZDBkMDQwNjg0ZjgzYjE1NmNmODVlN2M2NmRjOGJmOWQwZDM4Mjg4NC4uNjM5OTI3NjViZWQ1 ODRhN2JmOGU4MDM3NWFkYTQ4YzA1MWEwY2FkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKQEAgLTEzNSwyMiArMTM1LDEyIEBAIHZvaWQg RXJyb3JJbnN0YW5jZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBjb25zdCBTCiAgICAgaWYgKCFtZXNzYWdlV2l0aFNvdXJjZS5pc051bGwoKSkK ICAgICAgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5tZXNzYWdlLCBqc1N0cmlu Zyh2bSwgbWVzc2FnZVdpdGhTb3VyY2UpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlB dHRyaWJ1dGU6OkRvbnRFbnVtKSk7CiAKLSAgICAvLyBTaW5jZSBgdGhyb3cgdW5kZWZpbmVkO2Ag aXMgdmFsaWQsIHRoZSBzcGVjIHNwZWNpYWxseSByZWNvZ25pemVzIHRoZSBjYXNlIHdoZXJlIGBj YXVzZWAgaXMgYW4gZXhwbGljaXQgdW5kZWZpbmVkLgogICAgIGlmIChvcHRpb25zLmlzT2JqZWN0 KCkpIHsKLSAgICAgICAgYXV0byBvYmplY3QgPSBhc09iamVjdChvcHRpb25zKTsKLQotICAgICAg ICBQcm9wZXJ0eVNsb3Qgc2xvdChvYmplY3QsIFByb3BlcnR5U2xvdDo6SW50ZXJuYWxNZXRob2RU eXBlOjpIYXNQcm9wZXJ0eSk7Ci0gICAgICAgIGJvb2wgaGFzUHJvcGVydHkgPSBvYmplY3QtPmdl dFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBzbG90 KTsKKyAgICAgICAgLy8gU2luY2UgYHRocm93IHVuZGVmaW5lZDtgIGlzIHZhbGlkLCB3ZSBuZWVk IHRvIGRpc3Rpbmd1aXNoIHRoZSBjYXNlIHdoZXJlIGBjYXVzZWAgaXMgYW4gZXhwbGljaXQgdW5k ZWZpbmVkLgorICAgICAgICBhdXRvIGNhdXNlID0gYXNPYmplY3Qob3B0aW9ucyktPmdldElmUHJv cGVydHlFeGlzdHMoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7CiAgICAg ICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7Ci0KLSAgICAgICAgaWYgKGhh c1Byb3BlcnR5KSB7Ci0gICAgICAgICAgICBKU1ZhbHVlIGNhdXNlID0gVU5MSUtFTFkoc2xvdC5p c1RhaW50ZWRCeU9wYXF1ZU9iamVjdCgpKQotICAgICAgICAgICAgICAgID8gb2JqZWN0LT5nZXQo Z2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSkKLSAgICAgICAgICAgICAgICA6 IHNsb3QuZ2V0VmFsdWUoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7Ci0g ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwotCi0gICAgICAg ICAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBjYXVzZSwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSkpOwotICAgICAgICB9 CisgICAgICAgIGlmIChjYXVzZSkKKyAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgdm0ucHJvcGVy dHlOYW1lcy0+Y2F1c2UsIGNhdXNlLnZhbHVlKCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9w ZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0pKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCmluZGV4IDQ0YTIwODMzMTllNDBjOTYyY2FlM2QyNWZlMTM0 OTkwMjJiNTQwZTYuLjAzZTQ2NWMxZGY0NGE4ZDQ1N2YwYmFmOWVkMTZiNjgxZWRmZmIyOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApAQCAtMTYyLDYgKzE2Miw4 IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDYWxsYmFja1doZW5Ob0V4Y2VwdGlv bj4gdHlwZW5hbWUgc3RkOjpyZXN1bHRfb2Y8Q2FsbGJhY2tXaGVuTm9FeGNlcHRpb24oYm9vbCwg UHJvcGVydHlTbG90Jik+Ojp0eXBlIGdldFByb3BlcnR5U2xvdChKU0dsb2JhbE9iamVjdCosIFBy b3BlcnR5TmFtZSwgQ2FsbGJhY2tXaGVuTm9FeGNlcHRpb24pIGNvbnN0OwogICAgIHRlbXBsYXRl PHR5cGVuYW1lIENhbGxiYWNrV2hlbk5vRXhjZXB0aW9uPiB0eXBlbmFtZSBzdGQ6OnJlc3VsdF9v ZjxDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbihib29sLCBQcm9wZXJ0eVNsb3QmKT46OnR5cGUgZ2V0 UHJvcGVydHlTbG90KEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3Qm LCBDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbikgY29uc3Q7CiAKKyAgICBPcHRpb25hbDxKU1ZhbHVl PiBnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lKTsKKwog cHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3RJbXBsKEpTT2JqZWN0 KiwgSlNHbG9iYWxPYmplY3QqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogcHVibGlj OgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxp bmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApp bmRleCBmMGE4YTMwMjBjOWY4MTJiZGQ4ZjI2ZDg1NmU3MWMyMjA2Y2ZkZDg3Li43OTg4ZjY4ODhh Y2NmYTQ3NWRjZDU2OTUyMWRiNGUxZWYyNWM2ZDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApAQCAtMTkxLDYgKzE5MSwyNiBAQCBpbmxp bmUgYm9vbCBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlTbG90SW5saW5lKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIFBybwogICAgIHJldHVybiBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlT bG90KHRoaXMsIGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KTsKIH0KIAoraW5saW5l IE9wdGlvbmFsPEpTVmFsdWU+IEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCit7CisgICAg Vk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RI Uk9XX1NDT1BFKHZtKTsKKworICAgIFByb3BlcnR5U2xvdCBzbG90KHRoaXMsIFByb3BlcnR5U2xv dDo6SW50ZXJuYWxNZXRob2RUeXBlOjpIYXNQcm9wZXJ0eSk7CisgICAgYm9vbCBoYXNQcm9wZXJ0 eSA9IGdldFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCk7Cisg ICAgRVhDRVBUSU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkgfHwgIWhhc1Byb3BlcnR5KTsK KworICAgIGlmICghaGFzUHJvcGVydHkpCisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisK KyAgICBKU1ZhbHVlIGNhdXNlID0gVU5MSUtFTFkoc2xvdC5pc1RhaW50ZWRCeU9wYXF1ZU9iamVj dCgpKQorICAgICAgICA/IGdldChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSkKKyAgICAgICAg OiBzbG90LmdldFZhbHVlKGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lKTsKKyAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCBXVEY6Om51bGxvcHQpOworCisgICAgcmV0dXJuIGNhdXNlOwor fQorCiBpbmxpbmUgYm9vbCBKU09iamVjdDo6bWF5SW50ZXJjZXB0SW5kZXhlZEFjY2Vzc2VzKFZN JiB2bSkKIHsKICAgICByZXR1cm4gc3RydWN0dXJlKHZtKS0+bWF5SW50ZXJjZXB0SW5kZXhlZEFj Y2Vzc2VzKCk7Cg== 428081 2021-05-07 23:43:04 -0700 2021-05-08 00:23:01 -0700 Patch for landing bug-225553-20210507234302.patch text/plain 6716 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZmNhYWI0ODliZDAxZDg4NDZhMjM3YjY5YzBhNjRhYzUwYjI3ODVmLi5mNjQ3Yjk4MzVjZTJhMDQ1 MDFmY2VkNmMwMGEwNDk3ZGM1Yzg4M2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgSW50cm9kdWNlIEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3Rz IGhlbHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1NTUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFNodmF5a2EuCisKKyAgICAgICAg U3VnZ2VzdGVkIGJ5IEFsZXhleSBkdXJpbmcgcmV2aWV3IG9mIHIyNzcyMjEuCisgICAgICAgIEFy cmF5UHJvdG90eXBlIGFsc28gaGFzIGEgIkhhcy1ndWFyZGVkIEdldCIsIHNvIGl0J3MgaGVscGZ1 bCBmb3IgSlNPYmplY3QgdG8gaG91c2UgdGhpcyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cnVudGltZS9BcnJheVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OmdldFByb3BlcnR5KToK KyAgICAgICAgKiBydW50aW1lL0Vycm9ySW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpFcnJv ckluc3RhbmNlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5o OgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpT T2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKToKKwogMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGlu ZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgW0pTQ10gRXJyb3IjY2F1c2Ug bXVzdCByZWNvZ25pemUgZXhwbGljaXQgdW5kZWZpbmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAKaW5kZXggZjQzM2FhMTEzMjA2NWU3YjZh MWJjNGU0NzlmMDM2NGQwNGY1MGIyOC4uZjI0NGIyOTdiZmY2ZjhmYmRiNjIwMGJkYmYyODcwNmRk Y2I1Y2JiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQ cm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJv dG90eXBlLmNwcApAQCAtMTQ3LDIyICsxNDcsMTQgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUgSlNW YWx1ZSBnZXRQcm9wZXJ0eShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU09iamVjdCoK IHsKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIAorCiAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0g b2JqZWN0LT50cnlHZXRJbmRleFF1aWNrbHkoaW5kZXgpKQogICAgICAgICByZXR1cm4gcmVzdWx0 OwotICAgIC8vIFdlIHdhbnQgdG8gcGVyZm9ybSBnZXQgYW5kIGhhcyBpbiB0aGUgc2FtZSBvcGVy YXRpb24uCi0gICAgLy8gV2UgY2FuIG9ubHkgZG8gc28gd2hlbiB0aGlzIGJlaGF2aW9yIGlzIG5v dCBvYnNlcnZhYmxlLiBUaGUKLSAgICAvLyBvbmx5IHRpbWUgaXQgaXMgb2JzZXJ2YWJsZSBpcyB3 aGVuIHdlIGVuY291bnRlciBhbiBvcGFxdWUgb2JqZWN0cyAoUHJveHlPYmplY3QgYW5kIEpTTW9k dWxlTmFtZXNwYWNlT2JqZWN0KQotICAgIC8vIHNvbWV3aGVyZSBpbiB0aGUgcHJvdG90eXBlIGNo YWluLgotICAgIFByb3BlcnR5U2xvdCBzbG90KG9iamVjdCwgUHJvcGVydHlTbG90OjpJbnRlcm5h bE1ldGhvZFR5cGU6Okhhc1Byb3BlcnR5KTsKLSAgICBib29sIGhhc1Byb3BlcnR5ID0gb2JqZWN0 LT5nZXRQcm9wZXJ0eVNsb3QoZ2xvYmFsT2JqZWN0LCBpbmRleCwgc2xvdCk7Ci0gICAgRVhDRVBU SU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkgfHwgIWhhc1Byb3BlcnR5KTsKLSAgICBpZiAo IWhhc1Byb3BlcnR5KQotICAgICAgICByZXR1cm4geyB9OwotICAgIGlmIChVTkxJS0VMWShzbG90 LmlzVGFpbnRlZEJ5T3BhcXVlT2JqZWN0KCkpKQotICAgICAgICBSRUxFQVNFX0FORF9SRVRVUk4o c2NvcGUsIG9iamVjdC0+Z2V0KGdsb2JhbE9iamVjdCwgaW5kZXgpKTsKIAotICAgIFJFTEVBU0Vf QU5EX1JFVFVSTihzY29wZSwgc2xvdC5nZXRWYWx1ZShnbG9iYWxPYmplY3QsIGluZGV4KSk7Cisg ICAgLy8gRG9uJ3QgcmV0dXJuIHVuZGVmaW5lZCBpZiB0aGUgcHJvcGVydHkgaXMgbm90IGZvdW5k LgorICAgIGF1dG8gcHJvcGVydHkgPSBvYmplY3QtPmdldElmUHJvcGVydHlFeGlzdHMoZ2xvYmFs T2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tKHZtLCBpbmRleCkpOworICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIHsgfSk7CisgICAgcmV0dXJuIHByb3BlcnR5LnZhbHVlT3IoSlNWYWx1ZSgp KTsKIH0KIAogc3RhdGljIEFMV0FZU19JTkxJTkUgdm9pZCBzZXRMZW5ndGgoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgVk0mIHZtLCBKU09iamVjdCogb2JqLCB1aW50NjRfdCB2YWx1ZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySW5zdGFuY2Uu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKaW5k ZXggZDBkMDQwNjg0ZjgzYjE1NmNmODVlN2M2NmRjOGJmOWQwZDM4Mjg4NC4uNjM5OTI3NjViZWQ1 ODRhN2JmOGU4MDM3NWFkYTQ4YzA1MWEwY2FkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKQEAgLTEzNSwyMiArMTM1LDEyIEBAIHZvaWQg RXJyb3JJbnN0YW5jZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBjb25zdCBTCiAgICAgaWYgKCFtZXNzYWdlV2l0aFNvdXJjZS5pc051bGwoKSkK ICAgICAgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5tZXNzYWdlLCBqc1N0cmlu Zyh2bSwgbWVzc2FnZVdpdGhTb3VyY2UpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlB dHRyaWJ1dGU6OkRvbnRFbnVtKSk7CiAKLSAgICAvLyBTaW5jZSBgdGhyb3cgdW5kZWZpbmVkO2Ag aXMgdmFsaWQsIHRoZSBzcGVjIHNwZWNpYWxseSByZWNvZ25pemVzIHRoZSBjYXNlIHdoZXJlIGBj YXVzZWAgaXMgYW4gZXhwbGljaXQgdW5kZWZpbmVkLgogICAgIGlmIChvcHRpb25zLmlzT2JqZWN0 KCkpIHsKLSAgICAgICAgYXV0byBvYmplY3QgPSBhc09iamVjdChvcHRpb25zKTsKLQotICAgICAg ICBQcm9wZXJ0eVNsb3Qgc2xvdChvYmplY3QsIFByb3BlcnR5U2xvdDo6SW50ZXJuYWxNZXRob2RU eXBlOjpIYXNQcm9wZXJ0eSk7Ci0gICAgICAgIGJvb2wgaGFzUHJvcGVydHkgPSBvYmplY3QtPmdl dFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBzbG90 KTsKKyAgICAgICAgLy8gU2luY2UgYHRocm93IHVuZGVmaW5lZDtgIGlzIHZhbGlkLCB3ZSBuZWVk IHRvIGRpc3Rpbmd1aXNoIHRoZSBjYXNlIHdoZXJlIGBjYXVzZWAgaXMgYW4gZXhwbGljaXQgdW5k ZWZpbmVkLgorICAgICAgICBhdXRvIGNhdXNlID0gYXNPYmplY3Qob3B0aW9ucyktPmdldElmUHJv cGVydHlFeGlzdHMoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7CiAgICAg ICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7Ci0KLSAgICAgICAgaWYgKGhh c1Byb3BlcnR5KSB7Ci0gICAgICAgICAgICBKU1ZhbHVlIGNhdXNlID0gVU5MSUtFTFkoc2xvdC5p c1RhaW50ZWRCeU9wYXF1ZU9iamVjdCgpKQotICAgICAgICAgICAgICAgID8gb2JqZWN0LT5nZXQo Z2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSkKLSAgICAgICAgICAgICAgICA6 IHNsb3QuZ2V0VmFsdWUoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7Ci0g ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwotCi0gICAgICAg ICAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBjYXVzZSwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSkpOwotICAgICAgICB9 CisgICAgICAgIGlmIChjYXVzZSkKKyAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgdm0ucHJvcGVy dHlOYW1lcy0+Y2F1c2UsIGNhdXNlLnZhbHVlKCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9w ZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0pKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCmluZGV4IDQ0YTIwODMzMTllNDBjOTYyY2FlM2QyNWZlMTM0 OTkwMjJiNTQwZTYuLjAzZTQ2NWMxZGY0NGE4ZDQ1N2YwYmFmOWVkMTZiNjgxZWRmZmIyOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApAQCAtMTYyLDYgKzE2Miw4 IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDYWxsYmFja1doZW5Ob0V4Y2VwdGlv bj4gdHlwZW5hbWUgc3RkOjpyZXN1bHRfb2Y8Q2FsbGJhY2tXaGVuTm9FeGNlcHRpb24oYm9vbCwg UHJvcGVydHlTbG90Jik+Ojp0eXBlIGdldFByb3BlcnR5U2xvdChKU0dsb2JhbE9iamVjdCosIFBy b3BlcnR5TmFtZSwgQ2FsbGJhY2tXaGVuTm9FeGNlcHRpb24pIGNvbnN0OwogICAgIHRlbXBsYXRl PHR5cGVuYW1lIENhbGxiYWNrV2hlbk5vRXhjZXB0aW9uPiB0eXBlbmFtZSBzdGQ6OnJlc3VsdF9v ZjxDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbihib29sLCBQcm9wZXJ0eVNsb3QmKT46OnR5cGUgZ2V0 UHJvcGVydHlTbG90KEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3Qm LCBDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbikgY29uc3Q7CiAKKyAgICBPcHRpb25hbDxKU1ZhbHVl PiBnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lKTsKKwog cHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3RJbXBsKEpTT2JqZWN0 KiwgSlNHbG9iYWxPYmplY3QqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogcHVibGlj OgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxp bmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApp bmRleCBmMGE4YTMwMjBjOWY4MTJiZGQ4ZjI2ZDg1NmU3MWMyMjA2Y2ZkZDg3Li4xOWI5MDYyYzA4 ODE5ZGMyM2U2NDcxZmI0YzZiYTdlNTM0NDQ0ZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApAQCAtMTkxLDYgKzE5MSwyMyBAQCBpbmxp bmUgYm9vbCBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlTbG90SW5saW5lKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIFBybwogICAgIHJldHVybiBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlT bG90KHRoaXMsIGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KTsKIH0KIAoraW5saW5l IE9wdGlvbmFsPEpTVmFsdWU+IEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCit7CisgICAg Vk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RI Uk9XX1NDT1BFKHZtKTsKKworICAgIFByb3BlcnR5U2xvdCBzbG90KHRoaXMsIFByb3BlcnR5U2xv dDo6SW50ZXJuYWxNZXRob2RUeXBlOjpIYXNQcm9wZXJ0eSk7CisgICAgYm9vbCBoYXNQcm9wZXJ0 eSA9IGdldFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCk7Cisg ICAgRVhDRVBUSU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkgfHwgIWhhc1Byb3BlcnR5KTsK KworICAgIGlmICghaGFzUHJvcGVydHkpCisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisK KyAgICByZXR1cm4gVU5MSUtFTFkoc2xvdC5pc1RhaW50ZWRCeU9wYXF1ZU9iamVjdCgpKQorICAg ICAgICA/IGdldChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSkKKyAgICAgICAgOiBzbG90Lmdl dFZhbHVlKGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lKTsKK30KKwogaW5saW5lIGJvb2wgSlNP YmplY3Q6Om1heUludGVyY2VwdEluZGV4ZWRBY2Nlc3NlcyhWTSYgdm0pCiB7CiAgICAgcmV0dXJu IHN0cnVjdHVyZSh2bSktPm1heUludGVyY2VwdEluZGV4ZWRBY2Nlc3NlcygpOwo= 428082 2021-05-07 23:47:00 -0700 2021-05-08 00:32:55 -0700 Patch for landing bug-225553-20210507234658.patch text/plain 6730 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZmNhYWI0ODliZDAxZDg4NDZhMjM3YjY5YzBhNjRhYzUwYjI3ODVmLi5mNjQ3Yjk4MzVjZTJhMDQ1 MDFmY2VkNmMwMGEwNDk3ZGM1Yzg4M2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgSW50cm9kdWNlIEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3Rz IGhlbHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1NTUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFNodmF5a2EuCisKKyAgICAgICAg U3VnZ2VzdGVkIGJ5IEFsZXhleSBkdXJpbmcgcmV2aWV3IG9mIHIyNzcyMjEuCisgICAgICAgIEFy cmF5UHJvdG90eXBlIGFsc28gaGFzIGEgIkhhcy1ndWFyZGVkIEdldCIsIHNvIGl0J3MgaGVscGZ1 bCBmb3IgSlNPYmplY3QgdG8gaG91c2UgdGhpcyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cnVudGltZS9BcnJheVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OmdldFByb3BlcnR5KToK KyAgICAgICAgKiBydW50aW1lL0Vycm9ySW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpFcnJv ckluc3RhbmNlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5o OgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpT T2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKToKKwogMjAyMS0wNS0wNyAgUm9zcyBLaXJzbGlu ZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgW0pTQ10gRXJyb3IjY2F1c2Ug bXVzdCByZWNvZ25pemUgZXhwbGljaXQgdW5kZWZpbmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAKaW5kZXggZjQzM2FhMTEzMjA2NWU3YjZh MWJjNGU0NzlmMDM2NGQwNGY1MGIyOC4uZjI0NGIyOTdiZmY2ZjhmYmRiNjIwMGJkYmYyODcwNmRk Y2I1Y2JiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQ cm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJv dG90eXBlLmNwcApAQCAtMTQ3LDIyICsxNDcsMTQgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUgSlNW YWx1ZSBnZXRQcm9wZXJ0eShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU09iamVjdCoK IHsKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIAorCiAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0g b2JqZWN0LT50cnlHZXRJbmRleFF1aWNrbHkoaW5kZXgpKQogICAgICAgICByZXR1cm4gcmVzdWx0 OwotICAgIC8vIFdlIHdhbnQgdG8gcGVyZm9ybSBnZXQgYW5kIGhhcyBpbiB0aGUgc2FtZSBvcGVy YXRpb24uCi0gICAgLy8gV2UgY2FuIG9ubHkgZG8gc28gd2hlbiB0aGlzIGJlaGF2aW9yIGlzIG5v dCBvYnNlcnZhYmxlLiBUaGUKLSAgICAvLyBvbmx5IHRpbWUgaXQgaXMgb2JzZXJ2YWJsZSBpcyB3 aGVuIHdlIGVuY291bnRlciBhbiBvcGFxdWUgb2JqZWN0cyAoUHJveHlPYmplY3QgYW5kIEpTTW9k dWxlTmFtZXNwYWNlT2JqZWN0KQotICAgIC8vIHNvbWV3aGVyZSBpbiB0aGUgcHJvdG90eXBlIGNo YWluLgotICAgIFByb3BlcnR5U2xvdCBzbG90KG9iamVjdCwgUHJvcGVydHlTbG90OjpJbnRlcm5h bE1ldGhvZFR5cGU6Okhhc1Byb3BlcnR5KTsKLSAgICBib29sIGhhc1Byb3BlcnR5ID0gb2JqZWN0 LT5nZXRQcm9wZXJ0eVNsb3QoZ2xvYmFsT2JqZWN0LCBpbmRleCwgc2xvdCk7Ci0gICAgRVhDRVBU SU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkgfHwgIWhhc1Byb3BlcnR5KTsKLSAgICBpZiAo IWhhc1Byb3BlcnR5KQotICAgICAgICByZXR1cm4geyB9OwotICAgIGlmIChVTkxJS0VMWShzbG90 LmlzVGFpbnRlZEJ5T3BhcXVlT2JqZWN0KCkpKQotICAgICAgICBSRUxFQVNFX0FORF9SRVRVUk4o c2NvcGUsIG9iamVjdC0+Z2V0KGdsb2JhbE9iamVjdCwgaW5kZXgpKTsKIAotICAgIFJFTEVBU0Vf QU5EX1JFVFVSTihzY29wZSwgc2xvdC5nZXRWYWx1ZShnbG9iYWxPYmplY3QsIGluZGV4KSk7Cisg ICAgLy8gRG9uJ3QgcmV0dXJuIHVuZGVmaW5lZCBpZiB0aGUgcHJvcGVydHkgaXMgbm90IGZvdW5k LgorICAgIGF1dG8gcHJvcGVydHkgPSBvYmplY3QtPmdldElmUHJvcGVydHlFeGlzdHMoZ2xvYmFs T2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tKHZtLCBpbmRleCkpOworICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIHsgfSk7CisgICAgcmV0dXJuIHByb3BlcnR5LnZhbHVlT3IoSlNWYWx1ZSgp KTsKIH0KIAogc3RhdGljIEFMV0FZU19JTkxJTkUgdm9pZCBzZXRMZW5ndGgoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgVk0mIHZtLCBKU09iamVjdCogb2JqLCB1aW50NjRfdCB2YWx1ZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySW5zdGFuY2Uu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKaW5k ZXggZDBkMDQwNjg0ZjgzYjE1NmNmODVlN2M2NmRjOGJmOWQwZDM4Mjg4NC4uNjM5OTI3NjViZWQ1 ODRhN2JmOGU4MDM3NWFkYTQ4YzA1MWEwY2FkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHAKQEAgLTEzNSwyMiArMTM1LDEyIEBAIHZvaWQg RXJyb3JJbnN0YW5jZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBjb25zdCBTCiAgICAgaWYgKCFtZXNzYWdlV2l0aFNvdXJjZS5pc051bGwoKSkK ICAgICAgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5tZXNzYWdlLCBqc1N0cmlu Zyh2bSwgbWVzc2FnZVdpdGhTb3VyY2UpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlB dHRyaWJ1dGU6OkRvbnRFbnVtKSk7CiAKLSAgICAvLyBTaW5jZSBgdGhyb3cgdW5kZWZpbmVkO2Ag aXMgdmFsaWQsIHRoZSBzcGVjIHNwZWNpYWxseSByZWNvZ25pemVzIHRoZSBjYXNlIHdoZXJlIGBj YXVzZWAgaXMgYW4gZXhwbGljaXQgdW5kZWZpbmVkLgogICAgIGlmIChvcHRpb25zLmlzT2JqZWN0 KCkpIHsKLSAgICAgICAgYXV0byBvYmplY3QgPSBhc09iamVjdChvcHRpb25zKTsKLQotICAgICAg ICBQcm9wZXJ0eVNsb3Qgc2xvdChvYmplY3QsIFByb3BlcnR5U2xvdDo6SW50ZXJuYWxNZXRob2RU eXBlOjpIYXNQcm9wZXJ0eSk7Ci0gICAgICAgIGJvb2wgaGFzUHJvcGVydHkgPSBvYmplY3QtPmdl dFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBzbG90 KTsKKyAgICAgICAgLy8gU2luY2UgYHRocm93IHVuZGVmaW5lZDtgIGlzIHZhbGlkLCB3ZSBuZWVk IHRvIGRpc3Rpbmd1aXNoIHRoZSBjYXNlIHdoZXJlIGBjYXVzZWAgaXMgYW4gZXhwbGljaXQgdW5k ZWZpbmVkLgorICAgICAgICBhdXRvIGNhdXNlID0gYXNPYmplY3Qob3B0aW9ucyktPmdldElmUHJv cGVydHlFeGlzdHMoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7CiAgICAg ICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7Ci0KLSAgICAgICAgaWYgKGhh c1Byb3BlcnR5KSB7Ci0gICAgICAgICAgICBKU1ZhbHVlIGNhdXNlID0gVU5MSUtFTFkoc2xvdC5p c1RhaW50ZWRCeU9wYXF1ZU9iamVjdCgpKQotICAgICAgICAgICAgICAgID8gb2JqZWN0LT5nZXQo Z2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSkKLSAgICAgICAgICAgICAgICA6 IHNsb3QuZ2V0VmFsdWUoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5jYXVzZSk7Ci0g ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwotCi0gICAgICAg ICAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmNhdXNlLCBjYXVzZSwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSkpOwotICAgICAgICB9 CisgICAgICAgIGlmIChjYXVzZSkKKyAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgdm0ucHJvcGVy dHlOYW1lcy0+Y2F1c2UsIGNhdXNlLnZhbHVlKCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9w ZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0pKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCmluZGV4IDQ0YTIwODMzMTllNDBjOTYyY2FlM2QyNWZlMTM0 OTkwMjJiNTQwZTYuLjAzZTQ2NWMxZGY0NGE4ZDQ1N2YwYmFmOWVkMTZiNjgxZWRmZmIyOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApAQCAtMTYyLDYgKzE2Miw4 IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDYWxsYmFja1doZW5Ob0V4Y2VwdGlv bj4gdHlwZW5hbWUgc3RkOjpyZXN1bHRfb2Y8Q2FsbGJhY2tXaGVuTm9FeGNlcHRpb24oYm9vbCwg UHJvcGVydHlTbG90Jik+Ojp0eXBlIGdldFByb3BlcnR5U2xvdChKU0dsb2JhbE9iamVjdCosIFBy b3BlcnR5TmFtZSwgQ2FsbGJhY2tXaGVuTm9FeGNlcHRpb24pIGNvbnN0OwogICAgIHRlbXBsYXRl PHR5cGVuYW1lIENhbGxiYWNrV2hlbk5vRXhjZXB0aW9uPiB0eXBlbmFtZSBzdGQ6OnJlc3VsdF9v ZjxDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbihib29sLCBQcm9wZXJ0eVNsb3QmKT46OnR5cGUgZ2V0 UHJvcGVydHlTbG90KEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3Qm LCBDYWxsYmFja1doZW5Ob0V4Y2VwdGlvbikgY29uc3Q7CiAKKyAgICBPcHRpb25hbDxKU1ZhbHVl PiBnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFsT2JqZWN0KiwgUHJvcGVydHlOYW1lKTsKKwog cHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3RJbXBsKEpTT2JqZWN0 KiwgSlNHbG9iYWxPYmplY3QqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogcHVibGlj OgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxp bmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApp bmRleCBmMGE4YTMwMjBjOWY4MTJiZGQ4ZjI2ZDg1NmU3MWMyMjA2Y2ZkZDg3Li4yNjZkYjZkYjQ0 OTk0ZjcwZTE4N2U3NDI1OTFkNmMzNGI5ZGQ2MDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApAQCAtMTkxLDYgKzE5MSwyMyBAQCBpbmxp bmUgYm9vbCBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlTbG90SW5saW5lKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIFBybwogICAgIHJldHVybiBKU09iamVjdDo6Z2V0T3duUHJvcGVydHlT bG90KHRoaXMsIGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KTsKIH0KIAoraW5saW5l IE9wdGlvbmFsPEpTVmFsdWU+IEpTT2JqZWN0OjpnZXRJZlByb3BlcnR5RXhpc3RzKEpTR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCit7CisgICAg Vk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RI Uk9XX1NDT1BFKHZtKTsKKworICAgIFByb3BlcnR5U2xvdCBzbG90KHRoaXMsIFByb3BlcnR5U2xv dDo6SW50ZXJuYWxNZXRob2RUeXBlOjpIYXNQcm9wZXJ0eSk7CisgICAgYm9vbCBoYXNQcm9wZXJ0 eSA9IGdldFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCk7Cisg ICAgRVhDRVBUSU9OX0FTU0VSVF9VTlVTRUQoc2NvcGUsICFzY29wZS5leGNlcHRpb24oKSB8fCAh aGFzUHJvcGVydHkpOworCisgICAgaWYgKCFoYXNQcm9wZXJ0eSkKKyAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKKworICAgIHJldHVybiBVTkxJS0VMWShzbG90LmlzVGFpbnRlZEJ5T3BhcXVl T2JqZWN0KCkpCisgICAgICAgID8gZ2V0KGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lKQorICAg ICAgICA6IHNsb3QuZ2V0VmFsdWUoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUpOworfQorCiBp bmxpbmUgYm9vbCBKU09iamVjdDo6bWF5SW50ZXJjZXB0SW5kZXhlZEFjY2Vzc2VzKFZNJiB2bSkK IHsKICAgICByZXR1cm4gc3RydWN0dXJlKHZtKS0+bWF5SW50ZXJjZXB0SW5kZXhlZEFjY2Vzc2Vz KCk7Cg==