232749 2021-11-05 03:22:15 -0700 [GTK][a11y] Add implementation of action interface when building with ATSPI 2021-11-19 06:30:44 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 232708 230253 232755 1 cgarcia webkit-unassigned aboxhall andresg_22 aperez apinheiro bugs-noreply cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white oldest_to_newest 1812094 0 cgarcia 2021-11-05 03:22:15 -0700 Implement action 1812097 1 443384 cgarcia 2021-11-05 03:26:48 -0700 Created attachment 443384 Patch This won't apply because it depends on other bugs not fixed yet 1816787 2 444793 cgarcia 2021-11-19 02:05:15 -0800 Created attachment 444793 Patch 1816817 3 444808 cgarcia 2021-11-19 05:36:24 -0800 Created attachment 444808 Patch 1816833 4 cgarcia 2021-11-19 06:30:44 -0800 Committed r286056 (244443@main): <https://commits.webkit.org/244443@main> 443384 2021-11-05 03:26:48 -0700 2021-11-19 02:05:15 -0800 Patch wcore-atspi-action.diff text/plain 15823 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZmI3MWI2ZjU2NWEuLjk2Yjk5N2Y1ZTFjOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDIxLTExLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2Yg YWN0aW9uIGludGVyZmFjZSB3aGVuIGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlc0dUSy50eHQ6CisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QWN0aW9uQXRzcGku Y3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6 YWN0aW9uTmFtZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0 QXRzcGk6OmxvY2FsaXplZEFjdGlvbk5hbWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6ZG9BY3Rpb24gY29uc3QpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6aW50ZXJmYWNlc0Zv ck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OnBh dGgpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZElu dGVyZmFjZXMgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmg6CisKIDIwMjEtMTEtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW2ExMXldIEFkZCBpbXBsZW1lbnRh dGlvbiBvZiBoeXBlcnRleHQgaW50ZXJmYWNlIHdoZW4gYnVpbGRpbmcgd2l0aCBBVFNQSQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQgYi9Tb3VyY2UvV2ViQ29yZS9T b3VyY2VzR1RLLnR4dAppbmRleCA2ZTQ0MTRkNTgwMmEuLjQwN2YzZDY0ZDk3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvU291 cmNlc0dUSy50eHQKQEAgLTQxLDYgKzQxLDcgQEAgYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVV0aWwuY3BwCiAKIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3Bp LmNwcAogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCith Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RBY3Rpb25BdHNwaS5jcHAKIGFj Y2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdENvbXBvbmVudEF0c3BpLmNwcAog YWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0SHlwZXJsaW5rQXRzcGkuY3Bw CiBhY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RIeXBlcnRleHRBdHNwaS5j cHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmJiYzEzMDI1NDU2OAotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEFjdGlvbkF0c3BpLmNwcApAQCAtMCwwICsxLDEwNyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAyMSBJZ2FsaWEgUy5MLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxp c2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24g MiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4K KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3 aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVu IHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorICogYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4g IElmIG5vdCwgd3JpdGUgdG8KKyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4s IDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEz MDEsIFVTQS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmgiCisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWSkgJiYgVVNFKEFU U1BJKQorCisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oIgorI2luY2x1ZGUgPGdp by9naW8uaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNlIFdl YkNvcmUgeworCitHREJ1c0ludGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6 OnNfYWN0aW9uRnVuY3Rpb25zID0geworICAgIC8vIG1ldGhvZF9jYWxsCisgICAgW10oR0RCdXND b25uZWN0aW9uKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29u c3QgZ2NoYXIqIG1ldGhvZE5hbWUsIEdWYXJpYW50KiBwYXJhbWV0ZXJzLCBHREJ1c01ldGhvZElu dm9jYXRpb24qIGludm9jYXRpb24sIGdwb2ludGVyIHVzZXJEYXRhKSB7CisgICAgICAgIFJFTEVB U0VfQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBS ZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07 CisgICAgICAgIGF0c3BpT2JqZWN0LT51cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBp ZiAoIWdfc3RyY21wMChtZXRob2ROYW1lLCAiR2V0RGVzY3JpcHRpb24iKSkKKyAgICAgICAgICAg IGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJp YW50X25ldygiKHMpIiwgIiIpKTsKKyAgICAgICAgZWxzZSBpZiAoIWdfc3RyY21wMChtZXRob2RO YW1lLCAiR2V0TmFtZSIpKSB7CisgICAgICAgICAgICBpbnQgaW5kZXg7CisgICAgICAgICAgICBn X3ZhcmlhbnRfZ2V0KHBhcmFtZXRlcnMsICIoaSkiLCAmaW5kZXgpOworICAgICAgICAgICAgZ19k YnVzX21ldGhvZF9pbnZvY2F0aW9uX3JldHVybl92YWx1ZShpbnZvY2F0aW9uLCBnX3ZhcmlhbnRf bmV3KCIocykiLCAhaW5kZXggPyBhdHNwaU9iamVjdC0+YWN0aW9uTmFtZSgpLnV0ZjgoKS5kYXRh KCkgOiAiIikpOworICAgICAgICB9IGVsc2UgaWYgKCFnX3N0cmNtcDAobWV0aG9kTmFtZSwgIkdl dExvY2FsaXplZE5hbWUiKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAgICAgICAg Z192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAgICAgIGdf ZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJpYW50 X25ldygiKHMpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmxvY2FsaXplZEFjdGlvbk5hbWUoKS51 dGY4KCkuZGF0YSgpIDogIiIpKTsKKyAgICAgICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhv ZE5hbWUsICJHZXRLZXlCaW5kaW5nIikpIHsKKyAgICAgICAgICAgIGludCBpbmRleDsKKyAgICAg ICAgICAgIGdfdmFyaWFudF9nZXQocGFyYW1ldGVycywgIihpKSIsICZpbmRleCk7CisgICAgICAg ICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIGdf dmFyaWFudF9uZXcoIihzKSIsICFpbmRleCA/IGF0c3BpT2JqZWN0LT5hY3Rpb25LZXlCaW5kaW5n KCkudXRmOCgpLmRhdGEoKSA6ICIiKSk7CisgICAgICAgIH0gZWxzZSBpZiAoIWdfc3RyY21wMCht ZXRob2ROYW1lLCAiRG9BY3Rpb24iKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAg ICAgICAgZ192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAg ICAgIGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192 YXJpYW50X25ldygiKGIpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmRvQWN0aW9uKCkgOiBGQUxT RSkpOworICAgICAgICB9CisgICAgfSwKKyAgICAvLyBnZXRfcHJvcGVydHkKKyAgICBbXShHREJ1 c0Nvbm5lY3Rpb24qLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBj b25zdCBnY2hhciogcHJvcGVydHlOYW1lLCBHRXJyb3IqKiBlcnJvciwgZ3BvaW50ZXIgdXNlckRh dGEpIC0+IEdWYXJpYW50KiB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFpc01haW5UaHJlYWQo KSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBSZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07CisgICAgICAgIGF0c3BpT2JqZWN0LT51 cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBpZiAoIWdfc3RyY21wMChwcm9wZXJ0eU5h bWUsICJOQWN0aW9ucyIpKQorICAgICAgICAgICAgcmV0dXJuIGdfdmFyaWFudF9uZXdfaW50MzIo MSk7CisKKyAgICAgICAgZ19zZXRfZXJyb3IoZXJyb3IsIEdfSU9fRVJST1IsIEdfSU9fRVJST1Jf Tk9UX1NVUFBPUlRFRCwgIlVua25vd24gcHJvcGVydHkgJyVzJyIsIHByb3BlcnR5TmFtZSk7Cisg ICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0sCisgICAgLy8gc2V0X3Byb3BlcnR5LAorICAg IG51bGxwdHIsCisgICAgLy8gcGFkZGluZworICAgIG51bGxwdHIKK307CisKK1N0cmluZyBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmFjdGlvbk5hbWUoKSBjb25zdAoreworICAgIEFYQ29yZU9i amVjdCogYXhPYmplY3QgPSBpc01haW5UaHJlYWQoKSA/IG1fY29yZU9iamVjdCA6IG1fYXhPYmpl Y3Q7CisgICAgcmV0dXJuIGF4T2JqZWN0ID8gYXhPYmplY3QtPmFjdGlvblZlcmIoKSA6IFN0cmlu ZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpsb2NhbGl6ZWRBY3Rp b25OYW1lKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9heE9iamVjdCA/IG1fYXhPYmplY3QtPmxv Y2FsaXplZEFjdGlvblZlcmIoKSA6IFN0cmluZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0 eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9h eE9iamVjdCA/IG1fYXhPYmplY3QtPmFjY2Vzc0tleSgpIDogU3RyaW5nKCk7Cit9CisKK2Jvb2wg QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpkb0FjdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJu IEFjY2Vzc2liaWxpdHk6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxib29sPihbdGhpc10o KSAtPiBib29sIHsKKyAgICAgICAgaWYgKG1fY29yZU9iamVjdCkKKyAgICAgICAgICAgIG1fY29y ZU9iamVjdC0+dXBkYXRlQmFja2luZ1N0b3JlKCk7CisKKyAgICAgICAgaWYgKCFtX2NvcmVPYmpl Y3QpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIG1fY29yZU9i amVjdC0+cGVyZm9ybURlZmF1bHRBY3Rpb24oKTsKKyAgICB9KTsKK30KKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gRU5BQkxFKEFDQ0VTU0lCSUxJVFkpICYmIFVTRShBVFNQ SSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcAppbmRleCBjMzgxYmEzY2IxNTIuLjUwNzk3 YmQ0NzUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcApAQCAtNjAsNyArNjAsNyBA QCBzdGF0aWMgaW5saW5lIGJvb2wgcm9sZUlzVGV4dFR5cGUoQWNjZXNzaWJpbGl0eVJvbGUgcm9s ZSkKIAogT3B0aW9uU2V0PEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6SW50ZXJmYWNlPiBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmludGVyZmFjZXNGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiBj b3JlT2JqZWN0KQogewotICAgIE9wdGlvblNldDxJbnRlcmZhY2U+IGludGVyZmFjZXMgPSB7IElu dGVyZmFjZTo6QWNjZXNzaWJsZSwgSW50ZXJmYWNlOjpDb21wb25lbnQgfTsKKyAgICBPcHRpb25T ZXQ8SW50ZXJmYWNlPiBpbnRlcmZhY2VzID0geyBJbnRlcmZhY2U6OkFjY2Vzc2libGUsIEludGVy ZmFjZTo6Q29tcG9uZW50LCBJbnRlcmZhY2U6OkFjdGlvbiB9OwogCiAgICAgUmVuZGVyT2JqZWN0 KiByZW5kZXJlciA9IGNvcmVPYmplY3QuaXNBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkgPyBj b3JlT2JqZWN0LnJlbmRlcmVyKCkgOiBudWxscHRyOwogICAgIGlmIChjb3JlT2JqZWN0LnJvbGVW YWx1ZSgpID09IEFjY2Vzc2liaWxpdHlSb2xlOjpTdGF0aWNUZXh0IHx8IGNvcmVPYmplY3Qucm9s ZVZhbHVlKCkgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OkNvbG9yV2VsbCkKQEAgLTQ4Myw2ICs0ODMs OCBAQCBjb25zdCBTdHJpbmcmIEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6cGF0aCgpCiAgICAg ICAgICAgICBpbnRlcmZhY2VzLmFwcGVuZCh7IGNvbnN0X2Nhc3Q8R0RCdXNJbnRlcmZhY2VJbmZv Kj4oJndlYmtpdF9oeXBlcmxpbmtfaW50ZXJmYWNlKSwgJnNfaHlwZXJsaW5rRnVuY3Rpb25zIH0p OwogICAgICAgICBpZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0 KSkKICAgICAgICAgICAgIGludGVyZmFjZXMuYXBwZW5kKHsgY29uc3RfY2FzdDxHREJ1c0ludGVy ZmFjZUluZm8qPigmd2Via2l0X2h5cGVydGV4dF9pbnRlcmZhY2UpLCAmc19oeXBlcnRleHRGdW5j dGlvbnMgfSk7CisgICAgICAgIGlmIChtX2ludGVyZmFjZXMuY29udGFpbnMoSW50ZXJmYWNlOjpB Y3Rpb24pKQorICAgICAgICAgICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBjb25zdF9jYXN0PEdEQnVz SW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfYWN0aW9uX2ludGVyZmFjZSksICZzX2FjdGlvbkZ1bmN0 aW9ucyB9KTsKICAgICAgICAgbV9wYXRoID0gYXRzcGlSb290LT5hdHNwaSgpLnJlZ2lzdGVyT2Jq ZWN0KCp0aGlzLCBXVEZNb3ZlKGludGVyZmFjZXMpKTsKICAgICB9CiAKQEAgLTExMTUsNiArMTEx Nyw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZEludGVyZmFjZXMoR1Zh cmlhbnRCdWlsZGVyKiBidWlsZGVyKSBjb25zdAogICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgInMiLCB3ZWJraXRfaHlwZXJsaW5rX2ludGVyZmFjZS5uYW1lKTsKICAgICBp ZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0KSkKICAgICAgICAg Z192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIsICJzIiwgd2Via2l0X2h5cGVydGV4dF9pbnRl cmZhY2UubmFtZSk7CisgICAgaWYgKG1faW50ZXJmYWNlcy5jb250YWlucyhJbnRlcmZhY2U6OkFj dGlvbikpCisgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVyLCAicyIsIHdlYmtp dF9hY3Rpb25faW50ZXJmYWNlLm5hbWUpOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaTo6c2VyaWFsaXplKEdWYXJpYW50QnVpbGRlciogYnVpbGRlcikgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEF0c3BpLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxp dHlPYmplY3RBdHNwaS5oCmluZGV4IDA3ZTY4MDJjYTE5Mi4uMDQzYWIyYjI3ZmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmpl Y3RBdHNwaS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmgKQEAgLTQ4LDcgKzQ4LDggQEAgcHVibGljOgogICAgICAgICBU ZXh0ID0gMSA8PCAyLAogICAgICAgICBWYWx1ZSA9IDEgPDwgMywKICAgICAgICAgSHlwZXJsaW5r ID0gMSA8PCA0LAotICAgICAgICBIeXBlcnRleHQgPSAxIDw8IDUKKyAgICAgICAgSHlwZXJ0ZXh0 ID0gMSA8PCA1LAorICAgICAgICBBY3Rpb24gPSAxIDw8IDYKICAgICB9OwogICAgIGNvbnN0IE9w dGlvblNldDxJbnRlcmZhY2U+JiBpbnRlcmZhY2VzKCkgY29uc3QgeyByZXR1cm4gbV9pbnRlcmZh Y2VzOyB9CiAKQEAgLTEyMiw2ICsxMjMsOSBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9S VCBVUkwgdXJsKCkgY29uc3Q7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgYWN0aW9uTmFt ZSgpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgZG9BY3Rpb24oKSBjb25zdDsKKwog cHJpdmF0ZToKICAgICBleHBsaWNpdCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkoQVhDb3JlT2Jq ZWN0Kik7CiAKQEAgLTE2MSw2ICsxNjUsOSBAQCBwcml2YXRlOgogICAgIEFjY2Vzc2liaWxpdHlP YmplY3RBdHNwaSogaHlwZXJsaW5rKHVuc2lnbmVkKSBjb25zdDsKICAgICBzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkPiBoeXBlcmxpbmtJbmRleCh1bnNpZ25lZCkgY29uc3Q7CiAKKyAgICBTdHJpbmcg bG9jYWxpemVkQWN0aW9uTmFtZSgpIGNvbnN0OworICAgIFN0cmluZyBhY3Rpb25LZXlCaW5kaW5n KCkgY29uc3Q7CisKICAgICBzdGF0aWMgT3B0aW9uU2V0PEludGVyZmFjZT4gaW50ZXJmYWNlc0Zv ck9iamVjdChBWENvcmVPYmplY3QmKTsKIAogICAgIHN0YXRpYyBHREJ1c0ludGVyZmFjZVZUYWJs ZSBzX2FjY2Vzc2libGVGdW5jdGlvbnM7CkBAIC0xNjksNiArMTc2LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc192YWx1ZUZ1bmN0aW9uczsKICAgICBzdGF0 aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc19oeXBlcmxpbmtGdW5jdGlvbnM7CiAgICAgc3RhdGlj IEdEQnVzSW50ZXJmYWNlVlRhYmxlIHNfaHlwZXJ0ZXh0RnVuY3Rpb25zOworICAgIHN0YXRpYyBH REJ1c0ludGVyZmFjZVZUYWJsZSBzX2FjdGlvbkZ1bmN0aW9uczsKIAogICAgIEFYQ29yZU9iamVj dCogbV9heE9iamVjdCB7IG51bGxwdHIgfTsKICAgICBBWENvcmVPYmplY3QqIG1fY29yZU9iamVj dCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCBhNWQzYjE4ODE3YTQuLmY1MGNjZGVlOTI0NiAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEx LTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2YgYWN0aW9uIGludGVyZmFjZSB3aGVu IGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIHVuaXQgdGVzdCBmb3IgdGhlIGFjdGlvbiBpbnRlcmZhY2UgYW5k IFdUUiBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAgICAgICAgKHRlc3RBY3Rpb25C YXNpYyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvYXRzcGkvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0c3BpLmNwcDoKKyAg ICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNQcmVzc0FjdGlvblN1cHBvcnRl ZCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnByZXNzKToKKwogMjAy MS0xMS0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bYTExeV0gQWRkIGltcGxlbWVudGF0aW9uIG9mIGh5cGVydGV4dCBpbnRlcmZh Y2Ugd2hlbiBidWlsZGluZyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAK aW5kZXggNWRmMTc4ZTRkMDNiLi5iNTY1MGFkOTQ2NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJp bGl0eS5jcHAKQEAgLTE4NDIsNiArMTg0Miw1NyBAQCBzdGF0aWMgdm9pZCB0ZXN0SHlwZXJ0ZXh0 QmFzaWMoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3Nl cnRfY21waW50KGF0c3BpX2h5cGVydGV4dF9nZXRfbGlua19pbmRleChBVFNQSV9IWVBFUlRFWFQo cC5nZXQoKSksIDE1LCBudWxscHRyKSwgPT0sIC0xKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEFj dGlvbkJhc2ljKEFjY2Vzc2liaWxpdHlUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAg IHRlc3QtPnNob3dJbldpbmRvdyg4MDAsIDYwMCk7CisgICAgdGVzdC0+bG9hZEh0bWwoCisgICAg ICAgICI8aHRtbD4iCisgICAgICAgICIgIDxib2R5PiIKKyAgICAgICAgIiAgICA8cD5UaGlzIGlz IDxidXR0b24gYWNjZXNzS2V5PSdwJz5idXR0b248L2J1dHRvbj4gYW5kIDxhIGhyZWY9J2h0dHBz Oi8vd3d3LndlYmtpdGd0ay5vcmcnPmxpbms8L2E+IGluIGEgcGFyYWdyYXBoPC9wPiIKKyAgICAg ICAgIiAgPC9ib2R5PiIKKyAgICAgICAgIjwvaHRtbD4iLAorICAgICAgICBudWxscHRyKTsKKyAg ICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIGF1dG8gdGVzdEFwcCA9IHRl c3QtPmZpbmRUZXN0QXBwbGljYXRpb24oKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FD Q0VTU0lCTEUodGVzdEFwcC5nZXQoKSkpOworCisgICAgYXV0byBkb2N1bWVudFdlYiA9IHRlc3Qt PmZpbmREb2N1bWVudFdlYih0ZXN0QXBwLmdldCgpKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJ X0lTX0FDQ0VTU0lCTEUoZG9jdW1lbnRXZWIuZ2V0KCkpKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQo YXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQoZG9jdW1lbnRXZWIuZ2V0KCksIG51bGxw dHIpLCA9PSwgMSk7CisKKyAgICBhdXRvIHAgPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgoZG9jdW1lbnRXZWIuZ2V0KCksIDAsIG51bGxwdHIpKTsKKyAgICBn X2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDVElPTihwLmdldCgpKSk7CisgICAgLy8gUGFyYWdyYXBo IGltcGxlbWVudHMgYWN0aW9uIGludGVyZmFjZSwgYnV0IGl0IGRvZXMgbm90aGluZy4KKyAgICBn X2Fzc2VydF9jbXBpbnQoYXRzcGlfYWN0aW9uX2dldF9uX2FjdGlvbnMoQVRTUElfQUNUSU9OKHAu Z2V0KCkpLCBudWxscHRyKSwgPT0sIDEpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmFtZShhdHNw aV9hY3Rpb25fZ2V0X2FjdGlvbl9uYW1lKEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0 cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihuYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlx dWVQdHI8Y2hhcj4gbG9jYWxpemVkTmFtZShhdHNwaV9hY3Rpb25fZ2V0X2xvY2FsaXplZF9uYW1l KEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0 cihsb2NhbGl6ZWROYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4ga2V5 QmluZGluZyhhdHNwaV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihwLmdldCgp KSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9 PSwgIiIpOworCisgICAgYXV0byBidXR0b24gPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgocC5nZXQoKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X3Ry dWUoQVRTUElfSVNfQUNUSU9OKGJ1dHRvbi5nZXQoKSkpOworICAgIGdfYXNzZXJ0X2NtcGludChh dHNwaV9hY3Rpb25fZ2V0X25fYWN0aW9ucyhBVFNQSV9BQ1RJT04oYnV0dG9uLmdldCgpKSwgbnVs bHB0ciksID09LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25h bWUoQVRTUElfQUNUSU9OKGJ1dHRvbi5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2Vy dF9jbXBzdHIobmFtZS5nZXQoKSwgPT0sICJwcmVzcyIpOworICAgIGxvY2FsaXplZE5hbWUucmVz ZXQoYXRzcGlfYWN0aW9uX2dldF9sb2NhbGl6ZWRfbmFtZShBVFNQSV9BQ1RJT04oYnV0dG9uLmdl dCgpKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihsb2NhbGl6ZWROYW1lLmdl dCgpLCA9PSwgInByZXNzIik7CisgICAga2V5QmluZGluZy5yZXNldChhdHNwaV9hY3Rpb25fZ2V0 X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihidXR0b24uZ2V0KCkpLCAwLCBudWxscHRyKSk7Cisg ICAgZ19hc3NlcnRfY21wc3RyKGtleUJpbmRpbmcuZ2V0KCksID09LCAicCIpOworCisgICAgYXV0 byBhID0gYWRvcHRHUmVmKGF0c3BpX2FjY2Vzc2libGVfZ2V0X2NoaWxkX2F0X2luZGV4KHAuZ2V0 KCksIDEsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDVElPTihhLmdl dCgpKSk7CisgICAgZ19hc3NlcnRfY21waW50KGF0c3BpX2FjdGlvbl9nZXRfbl9hY3Rpb25zKEFU U1BJX0FDVElPTihhLmdldCgpKSwgbnVsbHB0ciksID09LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0 c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25hbWUoQVRTUElfQUNUSU9OKGEuZ2V0KCkpLCAwLCBudWxs cHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKG5hbWUuZ2V0KCksID09LCAianVtcCIpOworICAg IGxvY2FsaXplZE5hbWUucmVzZXQoYXRzcGlfYWN0aW9uX2dldF9sb2NhbGl6ZWRfbmFtZShBVFNQ SV9BQ1RJT04oYS5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIobG9j YWxpemVkTmFtZS5nZXQoKSwgPT0sICJqdW1wIik7CisgICAga2V5QmluZGluZy5yZXNldChhdHNw aV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihhLmdldCgpKSwgMCwgbnVsbHB0 cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9PSwgIiIpOworfQor CiB2b2lkIGJlZm9yZUFsbCgpCiB7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0 QWNjZXNzaWJpbGl0eSIsICJhY2Nlc3NpYmxlL2Jhc2ljLWhpZXJhcmNoeSIsIHRlc3RBY2Nlc3Np YmxlQmFzaWNIaWVyYXJjaHkpOwpAQCAtMTg2NSw2ICsxOTE2LDcgQEAgdm9pZCBiZWZvcmVBbGwo KQogICAgIEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAidmFs dWUvYmFzaWMiLCB0ZXN0VmFsdWVCYXNpYyk7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgi V2ViS2l0QWNjZXNzaWJpbGl0eSIsICJoeXBlcmxpbmsvYmFzaWMiLCB0ZXN0SHlwZXJsaW5rQmFz aWMpOwogICAgIEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAi aHlwZXJ0ZXh0L2Jhc2ljIiwgdGVzdEh5cGVydGV4dEJhc2ljKTsKKyAgICBBY2Nlc3NpYmlsaXR5 VGVzdDo6YWRkKCJXZWJLaXRBY2Nlc3NpYmlsaXR5IiwgImFjdGlvbi9iYXNpYyIsIHRlc3RBY3Rp b25CYXNpYyk7CiB9CiAKIHZvaWQgYWZ0ZXJBbGwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRz cGkuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nl c3NpYmlsaXR5VUlFbGVtZW50QXRzcGkuY3BwCmluZGV4IGQ0N2E2YzFkZGE2NC4uOWIwNzNhMzk5 ZDg5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0 c3BpL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdHNwaS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRzcGku Y3BwCkBAIC04NzIsNyArODcyLDEyIEBAIGludCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjppbnNl cnRpb25Qb2ludExpbmVOdW1iZXIoKQogCiBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Omlz UHJlc3NBY3Rpb25TdXBwb3J0ZWQoKQogewotICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIW1f ZWxlbWVudCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbV9lbGVtZW50LT51cGRhdGVC YWNraW5nU3RvcmUoKTsKKyAgICBhdXRvIG5hbWUgPSBtX2VsZW1lbnQtPmFjdGlvbk5hbWUoKTsK KyAgICByZXR1cm4gbmFtZSA9PSAicHJlc3MiIHx8IG5hbWUgPT0gImp1bXAiOwogfQogCiBib29s IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmlzSW5jcmVtZW50QWN0aW9uU3VwcG9ydGVkKCkKQEAg LTExODEsNiArMTE4NiwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNob3dNZW51 KCkKIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpwcmVzcygpCiB7CisgICAgaWYgKCFt X2VsZW1lbnQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZWxlbWVudC0+ZG9BY3Rpb24oKTsK IH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzZXRTZWxlY3RlZENoaWxkKEFjY2Vz c2liaWxpdHlVSUVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0Cg== 444793 2021-11-19 02:05:15 -0800 2021-11-19 05:36:24 -0800 Patch wcore-atspi-action.diff text/plain 15783 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZDkyNzY1Nzk2ODcuLmI0MmZiZGE1NjZkZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDIxLTExLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2Yg YWN0aW9uIGludGVyZmFjZSB3aGVuIGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlc0dUSy50eHQ6CisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QWN0aW9uQXRzcGku Y3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6 YWN0aW9uTmFtZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0 QXRzcGk6OmxvY2FsaXplZEFjdGlvbk5hbWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6ZG9BY3Rpb24gY29uc3QpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6aW50ZXJmYWNlc0Zv ck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OnBh dGgpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZElu dGVyZmFjZXMgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmg6CisKIDIwMjEtMTEtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW2ExMXldIEFkZCBpbXBsZW1lbnRh dGlvbiBvZiBoeXBlcnRleHQgaW50ZXJmYWNlIHdoZW4gYnVpbGRpbmcgd2l0aCBBVFNQSQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQgYi9Tb3VyY2UvV2ViQ29yZS9T b3VyY2VzR1RLLnR4dAppbmRleCA2ZTQ0MTRkNTgwMmEuLjQwN2YzZDY0ZDk3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvU291 cmNlc0dUSy50eHQKQEAgLTQxLDYgKzQxLDcgQEAgYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVV0aWwuY3BwCiAKIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3Bp LmNwcAogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCith Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RBY3Rpb25BdHNwaS5jcHAKIGFj Y2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdENvbXBvbmVudEF0c3BpLmNwcAog YWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0SHlwZXJsaW5rQXRzcGkuY3Bw CiBhY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RIeXBlcnRleHRBdHNwaS5j cHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmJiYzEzMDI1NDU2OAotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEFjdGlvbkF0c3BpLmNwcApAQCAtMCwwICsxLDEwNyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAyMSBJZ2FsaWEgUy5MLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxp c2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24g MiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4K KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3 aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVu IHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorICogYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4g IElmIG5vdCwgd3JpdGUgdG8KKyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4s IDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEz MDEsIFVTQS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmgiCisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWSkgJiYgVVNFKEFU U1BJKQorCisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oIgorI2luY2x1ZGUgPGdp by9naW8uaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNlIFdl YkNvcmUgeworCitHREJ1c0ludGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6 OnNfYWN0aW9uRnVuY3Rpb25zID0geworICAgIC8vIG1ldGhvZF9jYWxsCisgICAgW10oR0RCdXND b25uZWN0aW9uKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29u c3QgZ2NoYXIqIG1ldGhvZE5hbWUsIEdWYXJpYW50KiBwYXJhbWV0ZXJzLCBHREJ1c01ldGhvZElu dm9jYXRpb24qIGludm9jYXRpb24sIGdwb2ludGVyIHVzZXJEYXRhKSB7CisgICAgICAgIFJFTEVB U0VfQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBS ZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07 CisgICAgICAgIGF0c3BpT2JqZWN0LT51cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBp ZiAoIWdfc3RyY21wMChtZXRob2ROYW1lLCAiR2V0RGVzY3JpcHRpb24iKSkKKyAgICAgICAgICAg IGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJp YW50X25ldygiKHMpIiwgIiIpKTsKKyAgICAgICAgZWxzZSBpZiAoIWdfc3RyY21wMChtZXRob2RO YW1lLCAiR2V0TmFtZSIpKSB7CisgICAgICAgICAgICBpbnQgaW5kZXg7CisgICAgICAgICAgICBn X3ZhcmlhbnRfZ2V0KHBhcmFtZXRlcnMsICIoaSkiLCAmaW5kZXgpOworICAgICAgICAgICAgZ19k YnVzX21ldGhvZF9pbnZvY2F0aW9uX3JldHVybl92YWx1ZShpbnZvY2F0aW9uLCBnX3ZhcmlhbnRf bmV3KCIocykiLCAhaW5kZXggPyBhdHNwaU9iamVjdC0+YWN0aW9uTmFtZSgpLnV0ZjgoKS5kYXRh KCkgOiAiIikpOworICAgICAgICB9IGVsc2UgaWYgKCFnX3N0cmNtcDAobWV0aG9kTmFtZSwgIkdl dExvY2FsaXplZE5hbWUiKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAgICAgICAg Z192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAgICAgIGdf ZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJpYW50 X25ldygiKHMpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmxvY2FsaXplZEFjdGlvbk5hbWUoKS51 dGY4KCkuZGF0YSgpIDogIiIpKTsKKyAgICAgICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhv ZE5hbWUsICJHZXRLZXlCaW5kaW5nIikpIHsKKyAgICAgICAgICAgIGludCBpbmRleDsKKyAgICAg ICAgICAgIGdfdmFyaWFudF9nZXQocGFyYW1ldGVycywgIihpKSIsICZpbmRleCk7CisgICAgICAg ICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIGdf dmFyaWFudF9uZXcoIihzKSIsICFpbmRleCA/IGF0c3BpT2JqZWN0LT5hY3Rpb25LZXlCaW5kaW5n KCkudXRmOCgpLmRhdGEoKSA6ICIiKSk7CisgICAgICAgIH0gZWxzZSBpZiAoIWdfc3RyY21wMCht ZXRob2ROYW1lLCAiRG9BY3Rpb24iKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAg ICAgICAgZ192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAg ICAgIGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192 YXJpYW50X25ldygiKGIpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmRvQWN0aW9uKCkgOiBGQUxT RSkpOworICAgICAgICB9CisgICAgfSwKKyAgICAvLyBnZXRfcHJvcGVydHkKKyAgICBbXShHREJ1 c0Nvbm5lY3Rpb24qLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBj b25zdCBnY2hhciogcHJvcGVydHlOYW1lLCBHRXJyb3IqKiBlcnJvciwgZ3BvaW50ZXIgdXNlckRh dGEpIC0+IEdWYXJpYW50KiB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFpc01haW5UaHJlYWQo KSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBSZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07CisgICAgICAgIGF0c3BpT2JqZWN0LT51 cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBpZiAoIWdfc3RyY21wMChwcm9wZXJ0eU5h bWUsICJOQWN0aW9ucyIpKQorICAgICAgICAgICAgcmV0dXJuIGdfdmFyaWFudF9uZXdfaW50MzIo MSk7CisKKyAgICAgICAgZ19zZXRfZXJyb3IoZXJyb3IsIEdfSU9fRVJST1IsIEdfSU9fRVJST1Jf Tk9UX1NVUFBPUlRFRCwgIlVua25vd24gcHJvcGVydHkgJyVzJyIsIHByb3BlcnR5TmFtZSk7Cisg ICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0sCisgICAgLy8gc2V0X3Byb3BlcnR5LAorICAg IG51bGxwdHIsCisgICAgLy8gcGFkZGluZworICAgIG51bGxwdHIKK307CisKK1N0cmluZyBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmFjdGlvbk5hbWUoKSBjb25zdAoreworICAgIEFYQ29yZU9i amVjdCogYXhPYmplY3QgPSBpc01haW5UaHJlYWQoKSA/IG1fY29yZU9iamVjdCA6IG1fYXhPYmpl Y3Q7CisgICAgcmV0dXJuIGF4T2JqZWN0ID8gYXhPYmplY3QtPmFjdGlvblZlcmIoKSA6IFN0cmlu ZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpsb2NhbGl6ZWRBY3Rp b25OYW1lKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9heE9iamVjdCA/IG1fYXhPYmplY3QtPmxv Y2FsaXplZEFjdGlvblZlcmIoKSA6IFN0cmluZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0 eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9h eE9iamVjdCA/IG1fYXhPYmplY3QtPmFjY2Vzc0tleSgpIDogU3RyaW5nKCk7Cit9CisKK2Jvb2wg QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpkb0FjdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJu IEFjY2Vzc2liaWxpdHk6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxib29sPihbdGhpc10o KSAtPiBib29sIHsKKyAgICAgICAgaWYgKG1fY29yZU9iamVjdCkKKyAgICAgICAgICAgIG1fY29y ZU9iamVjdC0+dXBkYXRlQmFja2luZ1N0b3JlKCk7CisKKyAgICAgICAgaWYgKCFtX2NvcmVPYmpl Y3QpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIG1fY29yZU9i amVjdC0+cGVyZm9ybURlZmF1bHRBY3Rpb24oKTsKKyAgICB9KTsKK30KKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gRU5BQkxFKEFDQ0VTU0lCSUxJVFkpICYmIFVTRShBVFNQ SSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcAppbmRleCBiM2I4ZjlkYmVmNGMuLmU4NzVl NDk0NWEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcApAQCAtNjAsNyArNjAsNyBA QCBzdGF0aWMgaW5saW5lIGJvb2wgcm9sZUlzVGV4dFR5cGUoQWNjZXNzaWJpbGl0eVJvbGUgcm9s ZSkKIAogT3B0aW9uU2V0PEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6SW50ZXJmYWNlPiBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmludGVyZmFjZXNGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiBj b3JlT2JqZWN0KQogewotICAgIE9wdGlvblNldDxJbnRlcmZhY2U+IGludGVyZmFjZXMgPSB7IElu dGVyZmFjZTo6QWNjZXNzaWJsZSwgSW50ZXJmYWNlOjpDb21wb25lbnQgfTsKKyAgICBPcHRpb25T ZXQ8SW50ZXJmYWNlPiBpbnRlcmZhY2VzID0geyBJbnRlcmZhY2U6OkFjY2Vzc2libGUsIEludGVy ZmFjZTo6Q29tcG9uZW50LCBJbnRlcmZhY2U6OkFjdGlvbiB9OwogCiAgICAgUmVuZGVyT2JqZWN0 KiByZW5kZXJlciA9IGNvcmVPYmplY3QuaXNBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkgPyBj b3JlT2JqZWN0LnJlbmRlcmVyKCkgOiBudWxscHRyOwogICAgIGlmIChjb3JlT2JqZWN0LnJvbGVW YWx1ZSgpID09IEFjY2Vzc2liaWxpdHlSb2xlOjpTdGF0aWNUZXh0IHx8IGNvcmVPYmplY3Qucm9s ZVZhbHVlKCkgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OkNvbG9yV2VsbCkKQEAgLTQ4Myw2ICs0ODMs OCBAQCBjb25zdCBTdHJpbmcmIEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6cGF0aCgpCiAgICAg ICAgICAgICBpbnRlcmZhY2VzLmFwcGVuZCh7IGNvbnN0X2Nhc3Q8R0RCdXNJbnRlcmZhY2VJbmZv Kj4oJndlYmtpdF9oeXBlcmxpbmtfaW50ZXJmYWNlKSwgJnNfaHlwZXJsaW5rRnVuY3Rpb25zIH0p OwogICAgICAgICBpZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0 KSkKICAgICAgICAgICAgIGludGVyZmFjZXMuYXBwZW5kKHsgY29uc3RfY2FzdDxHREJ1c0ludGVy ZmFjZUluZm8qPigmd2Via2l0X2h5cGVydGV4dF9pbnRlcmZhY2UpLCAmc19oeXBlcnRleHRGdW5j dGlvbnMgfSk7CisgICAgICAgIGlmIChtX2ludGVyZmFjZXMuY29udGFpbnMoSW50ZXJmYWNlOjpB Y3Rpb24pKQorICAgICAgICAgICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBjb25zdF9jYXN0PEdEQnVz SW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfYWN0aW9uX2ludGVyZmFjZSksICZzX2FjdGlvbkZ1bmN0 aW9ucyB9KTsKICAgICAgICAgbV9wYXRoID0gYXRzcGlSb290LT5hdHNwaSgpLnJlZ2lzdGVyT2Jq ZWN0KCp0aGlzLCBXVEZNb3ZlKGludGVyZmFjZXMpKTsKICAgICB9CiAKQEAgLTExMTUsNiArMTEx Nyw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZEludGVyZmFjZXMoR1Zh cmlhbnRCdWlsZGVyKiBidWlsZGVyKSBjb25zdAogICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgInMiLCB3ZWJraXRfaHlwZXJsaW5rX2ludGVyZmFjZS5uYW1lKTsKICAgICBp ZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0KSkKICAgICAgICAg Z192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIsICJzIiwgd2Via2l0X2h5cGVydGV4dF9pbnRl cmZhY2UubmFtZSk7CisgICAgaWYgKG1faW50ZXJmYWNlcy5jb250YWlucyhJbnRlcmZhY2U6OkFj dGlvbikpCisgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVyLCAicyIsIHdlYmtp dF9hY3Rpb25faW50ZXJmYWNlLm5hbWUpOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaTo6c2VyaWFsaXplKEdWYXJpYW50QnVpbGRlciogYnVpbGRlcikgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEF0c3BpLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxp dHlPYmplY3RBdHNwaS5oCmluZGV4IDA3ZTY4MDJjYTE5Mi4uMDQzYWIyYjI3ZmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmpl Y3RBdHNwaS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmgKQEAgLTQ4LDcgKzQ4LDggQEAgcHVibGljOgogICAgICAgICBU ZXh0ID0gMSA8PCAyLAogICAgICAgICBWYWx1ZSA9IDEgPDwgMywKICAgICAgICAgSHlwZXJsaW5r ID0gMSA8PCA0LAotICAgICAgICBIeXBlcnRleHQgPSAxIDw8IDUKKyAgICAgICAgSHlwZXJ0ZXh0 ID0gMSA8PCA1LAorICAgICAgICBBY3Rpb24gPSAxIDw8IDYKICAgICB9OwogICAgIGNvbnN0IE9w dGlvblNldDxJbnRlcmZhY2U+JiBpbnRlcmZhY2VzKCkgY29uc3QgeyByZXR1cm4gbV9pbnRlcmZh Y2VzOyB9CiAKQEAgLTEyMiw2ICsxMjMsOSBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9S VCBVUkwgdXJsKCkgY29uc3Q7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgYWN0aW9uTmFt ZSgpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgZG9BY3Rpb24oKSBjb25zdDsKKwog cHJpdmF0ZToKICAgICBleHBsaWNpdCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkoQVhDb3JlT2Jq ZWN0Kik7CiAKQEAgLTE2MSw2ICsxNjUsOSBAQCBwcml2YXRlOgogICAgIEFjY2Vzc2liaWxpdHlP YmplY3RBdHNwaSogaHlwZXJsaW5rKHVuc2lnbmVkKSBjb25zdDsKICAgICBzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkPiBoeXBlcmxpbmtJbmRleCh1bnNpZ25lZCkgY29uc3Q7CiAKKyAgICBTdHJpbmcg bG9jYWxpemVkQWN0aW9uTmFtZSgpIGNvbnN0OworICAgIFN0cmluZyBhY3Rpb25LZXlCaW5kaW5n KCkgY29uc3Q7CisKICAgICBzdGF0aWMgT3B0aW9uU2V0PEludGVyZmFjZT4gaW50ZXJmYWNlc0Zv ck9iamVjdChBWENvcmVPYmplY3QmKTsKIAogICAgIHN0YXRpYyBHREJ1c0ludGVyZmFjZVZUYWJs ZSBzX2FjY2Vzc2libGVGdW5jdGlvbnM7CkBAIC0xNjksNiArMTc2LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc192YWx1ZUZ1bmN0aW9uczsKICAgICBzdGF0 aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc19oeXBlcmxpbmtGdW5jdGlvbnM7CiAgICAgc3RhdGlj IEdEQnVzSW50ZXJmYWNlVlRhYmxlIHNfaHlwZXJ0ZXh0RnVuY3Rpb25zOworICAgIHN0YXRpYyBH REJ1c0ludGVyZmFjZVZUYWJsZSBzX2FjdGlvbkZ1bmN0aW9uczsKIAogICAgIEFYQ29yZU9iamVj dCogbV9heE9iamVjdCB7IG51bGxwdHIgfTsKICAgICBBWENvcmVPYmplY3QqIG1fY29yZU9iamVj dCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA3NDY3NzZmNDUyMjUuLjY3ODE5NjgyMWZkMyAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEx LTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2YgYWN0aW9uIGludGVyZmFjZSB3aGVu IGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIHVuaXQgdGVzdCBmb3IgdGhlIGFjdGlvbiBpbnRlcmZhY2UgYW5k IFdUUiBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAgICAgICAgKHRlc3RBY3Rpb25C YXNpYyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvYXRzcGkvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0c3BpLmNwcDoKKyAg ICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNQcmVzc0FjdGlvblN1cHBvcnRl ZCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnByZXNzKToKKwogMjAy MS0xMS0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bYTExeV0gQWRkIGltcGxlbWVudGF0aW9uIG9mIGh5cGVydGV4dCBpbnRlcmZh Y2Ugd2hlbiBidWlsZGluZyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAK aW5kZXggNDE3ZmMzNmQ5ZWIwLi45NjU2NjA4YjllNDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJp bGl0eS5jcHAKQEAgLTE4NjksNiArMTg2OSw2MSBAQCBzdGF0aWMgdm9pZCB0ZXN0SHlwZXJ0ZXh0 QmFzaWMoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3Nl cnRfY21waW50KGF0c3BpX2h5cGVydGV4dF9nZXRfbGlua19pbmRleChBVFNQSV9IWVBFUlRFWFQo cC5nZXQoKSksIDE1LCBudWxscHRyKSwgPT0sIC0xKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEFj dGlvbkJhc2ljKEFjY2Vzc2liaWxpdHlUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAg IHRlc3QtPnNob3dJbldpbmRvdyg4MDAsIDYwMCk7CisgICAgdGVzdC0+bG9hZEh0bWwoCisgICAg ICAgICI8aHRtbD4iCisgICAgICAgICIgIDxib2R5PiIKKyAgICAgICAgIiAgICA8cD5UaGlzIGlz IDxidXR0b24gYWNjZXNzS2V5PSdwJz5idXR0b248L2J1dHRvbj4gYW5kIDxhIGhyZWY9J2h0dHBz Oi8vd3d3LndlYmtpdGd0ay5vcmcnPmxpbms8L2E+IGluIGEgcGFyYWdyYXBoPC9wPiIKKyAgICAg ICAgIiAgPC9ib2R5PiIKKyAgICAgICAgIjwvaHRtbD4iLAorICAgICAgICBudWxscHRyKTsKKyAg ICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIGF1dG8gdGVzdEFwcCA9IHRl c3QtPmZpbmRUZXN0QXBwbGljYXRpb24oKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FD Q0VTU0lCTEUodGVzdEFwcC5nZXQoKSkpOworCisgICAgYXV0byBkb2N1bWVudFdlYiA9IHRlc3Qt PmZpbmREb2N1bWVudFdlYih0ZXN0QXBwLmdldCgpKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJ X0lTX0FDQ0VTU0lCTEUoZG9jdW1lbnRXZWIuZ2V0KCkpKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQo YXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQoZG9jdW1lbnRXZWIuZ2V0KCksIG51bGxw dHIpLCA9PSwgMSk7CisKKyAgICBhdXRvIHAgPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgoZG9jdW1lbnRXZWIuZ2V0KCksIDAsIG51bGxwdHIpKTsKKyAgICBn X2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDVElPTihwLmdldCgpKSk7CisgICAgLy8gUGFyYWdyYXBo IGltcGxlbWVudHMgYWN0aW9uIGludGVyZmFjZSwgYnV0IGl0IGRvZXMgbm90aGluZy4KKyAgICBn X2Fzc2VydF9jbXBpbnQoYXRzcGlfYWN0aW9uX2dldF9uX2FjdGlvbnMoQVRTUElfQUNUSU9OKHAu Z2V0KCkpLCBudWxscHRyKSwgPT0sIDEpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmFtZShhdHNw aV9hY3Rpb25fZ2V0X2FjdGlvbl9uYW1lKEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0 cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihuYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlx dWVQdHI8Y2hhcj4gbG9jYWxpemVkTmFtZShhdHNwaV9hY3Rpb25fZ2V0X2xvY2FsaXplZF9uYW1l KEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0 cihsb2NhbGl6ZWROYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4ga2V5 QmluZGluZyhhdHNwaV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihwLmdldCgp KSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9 PSwgIiIpOworCisgICAgYXV0byBidXR0b24gPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgocC5nZXQoKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X3Ry dWUoQVRTUElfSVNfQUNUSU9OKGJ1dHRvbi5nZXQoKSkpOworICAgIGdfYXNzZXJ0X2NtcGludChh dHNwaV9hY3Rpb25fZ2V0X25fYWN0aW9ucyhBVFNQSV9BQ1RJT04oYnV0dG9uLmdldCgpKSwgbnVs bHB0ciksID09LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25h bWUoQVRTUElfQUNUSU9OKGJ1dHRvbi5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2Vy dF9jbXBzdHIobmFtZS5nZXQoKSwgPT0sICJwcmVzcyIpOworI2lmIFVTRShBVFNQSSkKKyAgICBs b2NhbGl6ZWROYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfbG9jYWxpemVkX25hbWUoQVRTUElf QUNUSU9OKGJ1dHRvbi5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIo bG9jYWxpemVkTmFtZS5nZXQoKSwgPT0sICJwcmVzcyIpOworI2VuZGlmCisgICAga2V5QmluZGlu Zy5yZXNldChhdHNwaV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihidXR0b24u Z2V0KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGtleUJpbmRpbmcuZ2V0 KCksID09LCAicCIpOworCisgICAgYXV0byBhID0gYWRvcHRHUmVmKGF0c3BpX2FjY2Vzc2libGVf Z2V0X2NoaWxkX2F0X2luZGV4KHAuZ2V0KCksIDEsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF90 cnVlKEFUU1BJX0lTX0FDVElPTihhLmdldCgpKSk7CisgICAgZ19hc3NlcnRfY21waW50KGF0c3Bp X2FjdGlvbl9nZXRfbl9hY3Rpb25zKEFUU1BJX0FDVElPTihhLmdldCgpKSwgbnVsbHB0ciksID09 LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25hbWUoQVRTUElf QUNUSU9OKGEuZ2V0KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKG5hbWUu Z2V0KCksID09LCAianVtcCIpOworI2lmIFVTRShBVFNQSSkKKyAgICBsb2NhbGl6ZWROYW1lLnJl c2V0KGF0c3BpX2FjdGlvbl9nZXRfbG9jYWxpemVkX25hbWUoQVRTUElfQUNUSU9OKGEuZ2V0KCkp LCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGxvY2FsaXplZE5hbWUuZ2V0KCks ID09LCAianVtcCIpOworI2VuZGlmCisgICAga2V5QmluZGluZy5yZXNldChhdHNwaV9hY3Rpb25f Z2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihhLmdldCgpKSwgMCwgbnVsbHB0cikpOworICAg IGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9PSwgIiIpOworfQorCiB2b2lkIGJl Zm9yZUFsbCgpCiB7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNjZXNzaWJp bGl0eSIsICJhY2Nlc3NpYmxlL2Jhc2ljLWhpZXJhcmNoeSIsIHRlc3RBY2Nlc3NpYmxlQmFzaWNI aWVyYXJjaHkpOwpAQCAtMTg5Miw2ICsxOTQ3LDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIEFj Y2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAidmFsdWUvYmFzaWMi LCB0ZXN0VmFsdWVCYXNpYyk7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNj ZXNzaWJpbGl0eSIsICJoeXBlcmxpbmsvYmFzaWMiLCB0ZXN0SHlwZXJsaW5rQmFzaWMpOwogICAg IEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAiaHlwZXJ0ZXh0 L2Jhc2ljIiwgdGVzdEh5cGVydGV4dEJhc2ljKTsKKyAgICBBY2Nlc3NpYmlsaXR5VGVzdDo6YWRk KCJXZWJLaXRBY2Nlc3NpYmlsaXR5IiwgImFjdGlvbi9iYXNpYyIsIHRlc3RBY3Rpb25CYXNpYyk7 CiB9CiAKIHZvaWQgYWZ0ZXJBbGwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRzcGkuY3BwIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50QXRzcGkuY3BwCmluZGV4IDBkNTg3ZjU5Mzg3MS4uOGZlYzYyZDM4ODMzIDEwMDY0 NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0c3BpL0FjY2Vz c2liaWxpdHlVSUVsZW1lbnRBdHNwaS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRzcGkuY3BwCkBAIC03 OTQsNyArNzk0LDkgQEAgaW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Omluc2VydGlvblBvaW50 TGluZU51bWJlcigpCiAKIGJvb2wgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNQcmVzc0FjdGlv blN1cHBvcnRlZCgpCiB7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIG1fZWxlbWVudC0+dXBkYXRl QmFja2luZ1N0b3JlKCk7CisgICAgYXV0byBuYW1lID0gbV9lbGVtZW50LT5hY3Rpb25OYW1lKCk7 CisgICAgcmV0dXJuIG5hbWUgPT0gInByZXNzIiB8fCBuYW1lID09ICJqdW1wIjsKIH0KIAogYm9v bCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0luY3JlbWVudEFjdGlvblN1cHBvcnRlZCgpCkBA IC0xMDk0LDYgKzEwOTYsNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNob3dNZW51 KCkKIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpwcmVzcygpCiB7CisgICAgbV9lbGVt ZW50LT5kb0FjdGlvbigpOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNldFNl bGVjdGVkQ2hpbGQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudCogZWxlbWVudCkgY29uc3QK 444808 2021-11-19 05:36:24 -0800 2021-11-19 06:27:20 -0800 Patch wcore-atspi-action.diff text/plain 15783 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZDkyNzY1Nzk2ODcuLmI0MmZiZGE1NjZkZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDIxLTExLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2Yg YWN0aW9uIGludGVyZmFjZSB3aGVuIGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlc0dUSy50eHQ6CisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QWN0aW9uQXRzcGku Y3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6 YWN0aW9uTmFtZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0 QXRzcGk6OmxvY2FsaXplZEFjdGlvbk5hbWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6ZG9BY3Rpb24gY29uc3QpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6aW50ZXJmYWNlc0Zv ck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OnBh dGgpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZElu dGVyZmFjZXMgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmg6CisKIDIwMjEtMTEtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW2ExMXldIEFkZCBpbXBsZW1lbnRh dGlvbiBvZiBoeXBlcnRleHQgaW50ZXJmYWNlIHdoZW4gYnVpbGRpbmcgd2l0aCBBVFNQSQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQgYi9Tb3VyY2UvV2ViQ29yZS9T b3VyY2VzR1RLLnR4dAppbmRleCA2ZTQ0MTRkNTgwMmEuLjQwN2YzZDY0ZDk3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0dUSy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvU291 cmNlc0dUSy50eHQKQEAgLTQxLDYgKzQxLDcgQEAgYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVV0aWwuY3BwCiAKIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3Bp LmNwcAogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCith Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RBY3Rpb25BdHNwaS5jcHAKIGFj Y2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdENvbXBvbmVudEF0c3BpLmNwcAog YWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0SHlwZXJsaW5rQXRzcGkuY3Bw CiBhY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RIeXBlcnRleHRBdHNwaS5j cHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEFjdGlvbkF0c3BpLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmJiYzEzMDI1NDU2OAotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEFjdGlvbkF0c3BpLmNwcApAQCAtMCwwICsxLDEwNyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAyMSBJZ2FsaWEgUy5MLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxp c2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24g MiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4K KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3 aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVu IHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorICogYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4g IElmIG5vdCwgd3JpdGUgdG8KKyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4s IDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEz MDEsIFVTQS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpLmgiCisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWSkgJiYgVVNFKEFU U1BJKQorCisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oIgorI2luY2x1ZGUgPGdp by9naW8uaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNlIFdl YkNvcmUgeworCitHREJ1c0ludGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6 OnNfYWN0aW9uRnVuY3Rpb25zID0geworICAgIC8vIG1ldGhvZF9jYWxsCisgICAgW10oR0RCdXND b25uZWN0aW9uKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29u c3QgZ2NoYXIqIG1ldGhvZE5hbWUsIEdWYXJpYW50KiBwYXJhbWV0ZXJzLCBHREJ1c01ldGhvZElu dm9jYXRpb24qIGludm9jYXRpb24sIGdwb2ludGVyIHVzZXJEYXRhKSB7CisgICAgICAgIFJFTEVB U0VfQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBS ZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07 CisgICAgICAgIGF0c3BpT2JqZWN0LT51cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBp ZiAoIWdfc3RyY21wMChtZXRob2ROYW1lLCAiR2V0RGVzY3JpcHRpb24iKSkKKyAgICAgICAgICAg IGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJp YW50X25ldygiKHMpIiwgIiIpKTsKKyAgICAgICAgZWxzZSBpZiAoIWdfc3RyY21wMChtZXRob2RO YW1lLCAiR2V0TmFtZSIpKSB7CisgICAgICAgICAgICBpbnQgaW5kZXg7CisgICAgICAgICAgICBn X3ZhcmlhbnRfZ2V0KHBhcmFtZXRlcnMsICIoaSkiLCAmaW5kZXgpOworICAgICAgICAgICAgZ19k YnVzX21ldGhvZF9pbnZvY2F0aW9uX3JldHVybl92YWx1ZShpbnZvY2F0aW9uLCBnX3ZhcmlhbnRf bmV3KCIocykiLCAhaW5kZXggPyBhdHNwaU9iamVjdC0+YWN0aW9uTmFtZSgpLnV0ZjgoKS5kYXRh KCkgOiAiIikpOworICAgICAgICB9IGVsc2UgaWYgKCFnX3N0cmNtcDAobWV0aG9kTmFtZSwgIkdl dExvY2FsaXplZE5hbWUiKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAgICAgICAg Z192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAgICAgIGdf ZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192YXJpYW50 X25ldygiKHMpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmxvY2FsaXplZEFjdGlvbk5hbWUoKS51 dGY4KCkuZGF0YSgpIDogIiIpKTsKKyAgICAgICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhv ZE5hbWUsICJHZXRLZXlCaW5kaW5nIikpIHsKKyAgICAgICAgICAgIGludCBpbmRleDsKKyAgICAg ICAgICAgIGdfdmFyaWFudF9nZXQocGFyYW1ldGVycywgIihpKSIsICZpbmRleCk7CisgICAgICAg ICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIGdf dmFyaWFudF9uZXcoIihzKSIsICFpbmRleCA/IGF0c3BpT2JqZWN0LT5hY3Rpb25LZXlCaW5kaW5n KCkudXRmOCgpLmRhdGEoKSA6ICIiKSk7CisgICAgICAgIH0gZWxzZSBpZiAoIWdfc3RyY21wMCht ZXRob2ROYW1lLCAiRG9BY3Rpb24iKSkgeworICAgICAgICAgICAgaW50IGluZGV4OworICAgICAg ICAgICAgZ192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKGkpIiwgJmluZGV4KTsKKyAgICAgICAg ICAgIGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlvbiwgZ192 YXJpYW50X25ldygiKGIpIiwgIWluZGV4ID8gYXRzcGlPYmplY3QtPmRvQWN0aW9uKCkgOiBGQUxT RSkpOworICAgICAgICB9CisgICAgfSwKKyAgICAvLyBnZXRfcHJvcGVydHkKKyAgICBbXShHREJ1 c0Nvbm5lY3Rpb24qLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBj b25zdCBnY2hhciogcHJvcGVydHlOYW1lLCBHRXJyb3IqKiBlcnJvciwgZ3BvaW50ZXIgdXNlckRh dGEpIC0+IEdWYXJpYW50KiB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFpc01haW5UaHJlYWQo KSk7CisgICAgICAgIGF1dG8gYXRzcGlPYmplY3QgPSBSZWYgeyAqc3RhdGljX2Nhc3Q8QWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpKj4odXNlckRhdGEpIH07CisgICAgICAgIGF0c3BpT2JqZWN0LT51 cGRhdGVCYWNraW5nU3RvcmUoKTsKKworICAgICAgICBpZiAoIWdfc3RyY21wMChwcm9wZXJ0eU5h bWUsICJOQWN0aW9ucyIpKQorICAgICAgICAgICAgcmV0dXJuIGdfdmFyaWFudF9uZXdfaW50MzIo MSk7CisKKyAgICAgICAgZ19zZXRfZXJyb3IoZXJyb3IsIEdfSU9fRVJST1IsIEdfSU9fRVJST1Jf Tk9UX1NVUFBPUlRFRCwgIlVua25vd24gcHJvcGVydHkgJyVzJyIsIHByb3BlcnR5TmFtZSk7Cisg ICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0sCisgICAgLy8gc2V0X3Byb3BlcnR5LAorICAg IG51bGxwdHIsCisgICAgLy8gcGFkZGluZworICAgIG51bGxwdHIKK307CisKK1N0cmluZyBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmFjdGlvbk5hbWUoKSBjb25zdAoreworICAgIEFYQ29yZU9i amVjdCogYXhPYmplY3QgPSBpc01haW5UaHJlYWQoKSA/IG1fY29yZU9iamVjdCA6IG1fYXhPYmpl Y3Q7CisgICAgcmV0dXJuIGF4T2JqZWN0ID8gYXhPYmplY3QtPmFjdGlvblZlcmIoKSA6IFN0cmlu ZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpsb2NhbGl6ZWRBY3Rp b25OYW1lKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9heE9iamVjdCA/IG1fYXhPYmplY3QtPmxv Y2FsaXplZEFjdGlvblZlcmIoKSA6IFN0cmluZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0 eU9iamVjdEF0c3BpOjphY3Rpb25LZXlCaW5kaW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9h eE9iamVjdCA/IG1fYXhPYmplY3QtPmFjY2Vzc0tleSgpIDogU3RyaW5nKCk7Cit9CisKK2Jvb2wg QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpkb0FjdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJu IEFjY2Vzc2liaWxpdHk6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxib29sPihbdGhpc10o KSAtPiBib29sIHsKKyAgICAgICAgaWYgKG1fY29yZU9iamVjdCkKKyAgICAgICAgICAgIG1fY29y ZU9iamVjdC0+dXBkYXRlQmFja2luZ1N0b3JlKCk7CisKKyAgICAgICAgaWYgKCFtX2NvcmVPYmpl Y3QpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIG1fY29yZU9i amVjdC0+cGVyZm9ybURlZmF1bHRBY3Rpb24oKTsKKyAgICB9KTsKK30KKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gRU5BQkxFKEFDQ0VTU0lCSUxJVFkpICYmIFVTRShBVFNQ SSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcAppbmRleCBiM2I4ZjlkYmVmNGMuLmU4NzVl NDk0NWEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcApAQCAtNjAsNyArNjAsNyBA QCBzdGF0aWMgaW5saW5lIGJvb2wgcm9sZUlzVGV4dFR5cGUoQWNjZXNzaWJpbGl0eVJvbGUgcm9s ZSkKIAogT3B0aW9uU2V0PEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6SW50ZXJmYWNlPiBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmludGVyZmFjZXNGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiBj b3JlT2JqZWN0KQogewotICAgIE9wdGlvblNldDxJbnRlcmZhY2U+IGludGVyZmFjZXMgPSB7IElu dGVyZmFjZTo6QWNjZXNzaWJsZSwgSW50ZXJmYWNlOjpDb21wb25lbnQgfTsKKyAgICBPcHRpb25T ZXQ8SW50ZXJmYWNlPiBpbnRlcmZhY2VzID0geyBJbnRlcmZhY2U6OkFjY2Vzc2libGUsIEludGVy ZmFjZTo6Q29tcG9uZW50LCBJbnRlcmZhY2U6OkFjdGlvbiB9OwogCiAgICAgUmVuZGVyT2JqZWN0 KiByZW5kZXJlciA9IGNvcmVPYmplY3QuaXNBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkgPyBj b3JlT2JqZWN0LnJlbmRlcmVyKCkgOiBudWxscHRyOwogICAgIGlmIChjb3JlT2JqZWN0LnJvbGVW YWx1ZSgpID09IEFjY2Vzc2liaWxpdHlSb2xlOjpTdGF0aWNUZXh0IHx8IGNvcmVPYmplY3Qucm9s ZVZhbHVlKCkgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OkNvbG9yV2VsbCkKQEAgLTQ4Myw2ICs0ODMs OCBAQCBjb25zdCBTdHJpbmcmIEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6cGF0aCgpCiAgICAg ICAgICAgICBpbnRlcmZhY2VzLmFwcGVuZCh7IGNvbnN0X2Nhc3Q8R0RCdXNJbnRlcmZhY2VJbmZv Kj4oJndlYmtpdF9oeXBlcmxpbmtfaW50ZXJmYWNlKSwgJnNfaHlwZXJsaW5rRnVuY3Rpb25zIH0p OwogICAgICAgICBpZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0 KSkKICAgICAgICAgICAgIGludGVyZmFjZXMuYXBwZW5kKHsgY29uc3RfY2FzdDxHREJ1c0ludGVy ZmFjZUluZm8qPigmd2Via2l0X2h5cGVydGV4dF9pbnRlcmZhY2UpLCAmc19oeXBlcnRleHRGdW5j dGlvbnMgfSk7CisgICAgICAgIGlmIChtX2ludGVyZmFjZXMuY29udGFpbnMoSW50ZXJmYWNlOjpB Y3Rpb24pKQorICAgICAgICAgICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBjb25zdF9jYXN0PEdEQnVz SW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfYWN0aW9uX2ludGVyZmFjZSksICZzX2FjdGlvbkZ1bmN0 aW9ucyB9KTsKICAgICAgICAgbV9wYXRoID0gYXRzcGlSb290LT5hdHNwaSgpLnJlZ2lzdGVyT2Jq ZWN0KCp0aGlzLCBXVEZNb3ZlKGludGVyZmFjZXMpKTsKICAgICB9CiAKQEAgLTExMTUsNiArMTEx Nyw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpidWlsZEludGVyZmFjZXMoR1Zh cmlhbnRCdWlsZGVyKiBidWlsZGVyKSBjb25zdAogICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgInMiLCB3ZWJraXRfaHlwZXJsaW5rX2ludGVyZmFjZS5uYW1lKTsKICAgICBp ZiAobV9pbnRlcmZhY2VzLmNvbnRhaW5zKEludGVyZmFjZTo6SHlwZXJ0ZXh0KSkKICAgICAgICAg Z192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIsICJzIiwgd2Via2l0X2h5cGVydGV4dF9pbnRl cmZhY2UubmFtZSk7CisgICAgaWYgKG1faW50ZXJmYWNlcy5jb250YWlucyhJbnRlcmZhY2U6OkFj dGlvbikpCisgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVyLCAicyIsIHdlYmtp dF9hY3Rpb25faW50ZXJmYWNlLm5hbWUpOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaTo6c2VyaWFsaXplKEdWYXJpYW50QnVpbGRlciogYnVpbGRlcikgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVj dEF0c3BpLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxp dHlPYmplY3RBdHNwaS5oCmluZGV4IDA3ZTY4MDJjYTE5Mi4uMDQzYWIyYjI3ZmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmpl Y3RBdHNwaS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpLmgKQEAgLTQ4LDcgKzQ4LDggQEAgcHVibGljOgogICAgICAgICBU ZXh0ID0gMSA8PCAyLAogICAgICAgICBWYWx1ZSA9IDEgPDwgMywKICAgICAgICAgSHlwZXJsaW5r ID0gMSA8PCA0LAotICAgICAgICBIeXBlcnRleHQgPSAxIDw8IDUKKyAgICAgICAgSHlwZXJ0ZXh0 ID0gMSA8PCA1LAorICAgICAgICBBY3Rpb24gPSAxIDw8IDYKICAgICB9OwogICAgIGNvbnN0IE9w dGlvblNldDxJbnRlcmZhY2U+JiBpbnRlcmZhY2VzKCkgY29uc3QgeyByZXR1cm4gbV9pbnRlcmZh Y2VzOyB9CiAKQEAgLTEyMiw2ICsxMjMsOSBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9S VCBVUkwgdXJsKCkgY29uc3Q7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgYWN0aW9uTmFt ZSgpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgZG9BY3Rpb24oKSBjb25zdDsKKwog cHJpdmF0ZToKICAgICBleHBsaWNpdCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkoQVhDb3JlT2Jq ZWN0Kik7CiAKQEAgLTE2MSw2ICsxNjUsOSBAQCBwcml2YXRlOgogICAgIEFjY2Vzc2liaWxpdHlP YmplY3RBdHNwaSogaHlwZXJsaW5rKHVuc2lnbmVkKSBjb25zdDsKICAgICBzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkPiBoeXBlcmxpbmtJbmRleCh1bnNpZ25lZCkgY29uc3Q7CiAKKyAgICBTdHJpbmcg bG9jYWxpemVkQWN0aW9uTmFtZSgpIGNvbnN0OworICAgIFN0cmluZyBhY3Rpb25LZXlCaW5kaW5n KCkgY29uc3Q7CisKICAgICBzdGF0aWMgT3B0aW9uU2V0PEludGVyZmFjZT4gaW50ZXJmYWNlc0Zv ck9iamVjdChBWENvcmVPYmplY3QmKTsKIAogICAgIHN0YXRpYyBHREJ1c0ludGVyZmFjZVZUYWJs ZSBzX2FjY2Vzc2libGVGdW5jdGlvbnM7CkBAIC0xNjksNiArMTc2LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc192YWx1ZUZ1bmN0aW9uczsKICAgICBzdGF0 aWMgR0RCdXNJbnRlcmZhY2VWVGFibGUgc19oeXBlcmxpbmtGdW5jdGlvbnM7CiAgICAgc3RhdGlj IEdEQnVzSW50ZXJmYWNlVlRhYmxlIHNfaHlwZXJ0ZXh0RnVuY3Rpb25zOworICAgIHN0YXRpYyBH REJ1c0ludGVyZmFjZVZUYWJsZSBzX2FjdGlvbkZ1bmN0aW9uczsKIAogICAgIEFYQ29yZU9iamVj dCogbV9heE9iamVjdCB7IG51bGxwdHIgfTsKICAgICBBWENvcmVPYmplY3QqIG1fY29yZU9iamVj dCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA3NDY3NzZmNDUyMjUuLjY3ODE5NjgyMWZkMyAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEx LTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXVthMTF5XSBBZGQgaW1wbGVtZW50YXRpb24gb2YgYWN0aW9uIGludGVyZmFjZSB3aGVu IGJ1aWxkaW5nIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjc0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIHVuaXQgdGVzdCBmb3IgdGhlIGFjdGlvbiBpbnRlcmZhY2UgYW5k IFdUUiBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAgICAgICAgKHRlc3RBY3Rpb25C YXNpYyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvYXRzcGkvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0c3BpLmNwcDoKKyAg ICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNQcmVzc0FjdGlvblN1cHBvcnRl ZCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnByZXNzKToKKwogMjAy MS0xMS0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bYTExeV0gQWRkIGltcGxlbWVudGF0aW9uIG9mIGh5cGVydGV4dCBpbnRlcmZh Y2Ugd2hlbiBidWlsZGluZyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAK aW5kZXggNDE3ZmMzNmQ5ZWIwLi45NjU2NjA4YjllNDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJp bGl0eS5jcHAKQEAgLTE4NjksNiArMTg2OSw2MSBAQCBzdGF0aWMgdm9pZCB0ZXN0SHlwZXJ0ZXh0 QmFzaWMoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3Nl cnRfY21waW50KGF0c3BpX2h5cGVydGV4dF9nZXRfbGlua19pbmRleChBVFNQSV9IWVBFUlRFWFQo cC5nZXQoKSksIDE1LCBudWxscHRyKSwgPT0sIC0xKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEFj dGlvbkJhc2ljKEFjY2Vzc2liaWxpdHlUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAg IHRlc3QtPnNob3dJbldpbmRvdyg4MDAsIDYwMCk7CisgICAgdGVzdC0+bG9hZEh0bWwoCisgICAg ICAgICI8aHRtbD4iCisgICAgICAgICIgIDxib2R5PiIKKyAgICAgICAgIiAgICA8cD5UaGlzIGlz IDxidXR0b24gYWNjZXNzS2V5PSdwJz5idXR0b248L2J1dHRvbj4gYW5kIDxhIGhyZWY9J2h0dHBz Oi8vd3d3LndlYmtpdGd0ay5vcmcnPmxpbms8L2E+IGluIGEgcGFyYWdyYXBoPC9wPiIKKyAgICAg ICAgIiAgPC9ib2R5PiIKKyAgICAgICAgIjwvaHRtbD4iLAorICAgICAgICBudWxscHRyKTsKKyAg ICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIGF1dG8gdGVzdEFwcCA9IHRl c3QtPmZpbmRUZXN0QXBwbGljYXRpb24oKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FD Q0VTU0lCTEUodGVzdEFwcC5nZXQoKSkpOworCisgICAgYXV0byBkb2N1bWVudFdlYiA9IHRlc3Qt PmZpbmREb2N1bWVudFdlYih0ZXN0QXBwLmdldCgpKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJ X0lTX0FDQ0VTU0lCTEUoZG9jdW1lbnRXZWIuZ2V0KCkpKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQo YXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQoZG9jdW1lbnRXZWIuZ2V0KCksIG51bGxw dHIpLCA9PSwgMSk7CisKKyAgICBhdXRvIHAgPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgoZG9jdW1lbnRXZWIuZ2V0KCksIDAsIG51bGxwdHIpKTsKKyAgICBn X2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDVElPTihwLmdldCgpKSk7CisgICAgLy8gUGFyYWdyYXBo IGltcGxlbWVudHMgYWN0aW9uIGludGVyZmFjZSwgYnV0IGl0IGRvZXMgbm90aGluZy4KKyAgICBn X2Fzc2VydF9jbXBpbnQoYXRzcGlfYWN0aW9uX2dldF9uX2FjdGlvbnMoQVRTUElfQUNUSU9OKHAu Z2V0KCkpLCBudWxscHRyKSwgPT0sIDEpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmFtZShhdHNw aV9hY3Rpb25fZ2V0X2FjdGlvbl9uYW1lKEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0 cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihuYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlx dWVQdHI8Y2hhcj4gbG9jYWxpemVkTmFtZShhdHNwaV9hY3Rpb25fZ2V0X2xvY2FsaXplZF9uYW1l KEFUU1BJX0FDVElPTihwLmdldCgpKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0 cihsb2NhbGl6ZWROYW1lLmdldCgpLCA9PSwgIiIpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4ga2V5 QmluZGluZyhhdHNwaV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihwLmdldCgp KSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9 PSwgIiIpOworCisgICAgYXV0byBidXR0b24gPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgocC5nZXQoKSwgMCwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X3Ry dWUoQVRTUElfSVNfQUNUSU9OKGJ1dHRvbi5nZXQoKSkpOworICAgIGdfYXNzZXJ0X2NtcGludChh dHNwaV9hY3Rpb25fZ2V0X25fYWN0aW9ucyhBVFNQSV9BQ1RJT04oYnV0dG9uLmdldCgpKSwgbnVs bHB0ciksID09LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25h bWUoQVRTUElfQUNUSU9OKGJ1dHRvbi5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2Vy dF9jbXBzdHIobmFtZS5nZXQoKSwgPT0sICJwcmVzcyIpOworI2lmIFVTRShBVFNQSSkKKyAgICBs b2NhbGl6ZWROYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfbG9jYWxpemVkX25hbWUoQVRTUElf QUNUSU9OKGJ1dHRvbi5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIo bG9jYWxpemVkTmFtZS5nZXQoKSwgPT0sICJwcmVzcyIpOworI2VuZGlmCisgICAga2V5QmluZGlu Zy5yZXNldChhdHNwaV9hY3Rpb25fZ2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihidXR0b24u Z2V0KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGtleUJpbmRpbmcuZ2V0 KCksID09LCAicCIpOworCisgICAgYXV0byBhID0gYWRvcHRHUmVmKGF0c3BpX2FjY2Vzc2libGVf Z2V0X2NoaWxkX2F0X2luZGV4KHAuZ2V0KCksIDEsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF90 cnVlKEFUU1BJX0lTX0FDVElPTihhLmdldCgpKSk7CisgICAgZ19hc3NlcnRfY21waW50KGF0c3Bp X2FjdGlvbl9nZXRfbl9hY3Rpb25zKEFUU1BJX0FDVElPTihhLmdldCgpKSwgbnVsbHB0ciksID09 LCAxKTsKKyAgICBuYW1lLnJlc2V0KGF0c3BpX2FjdGlvbl9nZXRfYWN0aW9uX25hbWUoQVRTUElf QUNUSU9OKGEuZ2V0KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKG5hbWUu Z2V0KCksID09LCAianVtcCIpOworI2lmIFVTRShBVFNQSSkKKyAgICBsb2NhbGl6ZWROYW1lLnJl c2V0KGF0c3BpX2FjdGlvbl9nZXRfbG9jYWxpemVkX25hbWUoQVRTUElfQUNUSU9OKGEuZ2V0KCkp LCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGxvY2FsaXplZE5hbWUuZ2V0KCks ID09LCAianVtcCIpOworI2VuZGlmCisgICAga2V5QmluZGluZy5yZXNldChhdHNwaV9hY3Rpb25f Z2V0X2tleV9iaW5kaW5nKEFUU1BJX0FDVElPTihhLmdldCgpKSwgMCwgbnVsbHB0cikpOworICAg IGdfYXNzZXJ0X2NtcHN0cihrZXlCaW5kaW5nLmdldCgpLCA9PSwgIiIpOworfQorCiB2b2lkIGJl Zm9yZUFsbCgpCiB7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNjZXNzaWJp bGl0eSIsICJhY2Nlc3NpYmxlL2Jhc2ljLWhpZXJhcmNoeSIsIHRlc3RBY2Nlc3NpYmxlQmFzaWNI aWVyYXJjaHkpOwpAQCAtMTg5Miw2ICsxOTQ3LDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIEFj Y2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAidmFsdWUvYmFzaWMi LCB0ZXN0VmFsdWVCYXNpYyk7CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNj ZXNzaWJpbGl0eSIsICJoeXBlcmxpbmsvYmFzaWMiLCB0ZXN0SHlwZXJsaW5rQmFzaWMpOwogICAg IEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHkiLCAiaHlwZXJ0ZXh0 L2Jhc2ljIiwgdGVzdEh5cGVydGV4dEJhc2ljKTsKKyAgICBBY2Nlc3NpYmlsaXR5VGVzdDo6YWRk KCJXZWJLaXRBY2Nlc3NpYmlsaXR5IiwgImFjdGlvbi9iYXNpYyIsIHRlc3RBY3Rpb25CYXNpYyk7 CiB9CiAKIHZvaWQgYWZ0ZXJBbGwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRzcGkuY3BwIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50QXRzcGkuY3BwCmluZGV4IDBkNTg3ZjU5Mzg3MS4uOGZlYzYyZDM4ODMzIDEwMDY0 NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0c3BpL0FjY2Vz c2liaWxpdHlVSUVsZW1lbnRBdHNwaS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9hdHNwaS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRzcGkuY3BwCkBAIC03 OTQsNyArNzk0LDkgQEAgaW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Omluc2VydGlvblBvaW50 TGluZU51bWJlcigpCiAKIGJvb2wgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNQcmVzc0FjdGlv blN1cHBvcnRlZCgpCiB7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIG1fZWxlbWVudC0+dXBkYXRl QmFja2luZ1N0b3JlKCk7CisgICAgYXV0byBuYW1lID0gbV9lbGVtZW50LT5hY3Rpb25OYW1lKCk7 CisgICAgcmV0dXJuIG5hbWUgPT0gInByZXNzIiB8fCBuYW1lID09ICJqdW1wIjsKIH0KIAogYm9v bCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0luY3JlbWVudEFjdGlvblN1cHBvcnRlZCgpCkBA IC0xMDk0LDYgKzEwOTYsNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNob3dNZW51 KCkKIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpwcmVzcygpCiB7CisgICAgbV9lbGVt ZW50LT5kb0FjdGlvbigpOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNldFNl bGVjdGVkQ2hpbGQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudCogZWxlbWVudCkgY29uc3QK