223263 2021-03-16 10:40:57 -0700 Add a RootMarkReason printer and also add a few additional reasons. 2021-03-16 15:00:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1740021 0 mark.lam 2021-03-16 10:40:57 -0700 ... 1740030 1 423354 mark.lam 2021-03-16 10:49:58 -0700 Created attachment 423354 proposed patch. 1740051 2 423359 mark.lam 2021-03-16 11:09:17 -0700 Created attachment 423359 proposed patch. 1740060 3 423363 mark.lam 2021-03-16 11:15:57 -0700 Created attachment 423363 proposed patch. 1740080 4 423363 msaboff 2021-03-16 11:49:43 -0700 Comment on attachment 423363 proposed patch. r=me 1740214 5 423363 mark.lam 2021-03-16 14:36:02 -0700 Comment on attachment 423363 proposed patch. Thanks for the review. Landing now. 1740231 6 ews-feeder 2021-03-16 14:59:01 -0700 Committed r274522: <https://commits.webkit.org/r274522> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423363. 1740232 7 webkit-bug-importer 2021-03-16 15:00:48 -0700 <rdar://problem/75496071> 423354 2021-03-16 10:49:58 -0700 2021-03-16 11:12:53 -0700 proposed patch. bug-223263.patch text/plain 13408 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc0NDkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDIxLTAzLTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgYSBSb290TWFya1JlYXNvbiBwcmludGVyIGFuZCBhbHNvIGFkZCBhIGZldyBhZGRpdGlvbmFs IHJlYXNvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjMyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEphdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICog aGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6YWRkQ29yZUNvbnN0cmFpbnRzKToK KyAgICAgICAgKiBoZWFwL0hlYXBTbmFwc2hvdEJ1aWxkZXIuY3BwOgorICAgICAgICAoSlNDOjpI ZWFwU25hcHNob3RCdWlsZGVyOjpqc29uKToKKyAgICAgICAgKEpTQzo6cm9vdFR5cGVUb1N0cmlu Zyk6IERlbGV0ZWQuCisgICAgICAgICogaGVhcC9Sb290TWFya1JlYXNvbi5jcHA6IEFkZGVkLgor ICAgICAgICAoSlNDOjpyb290TWFya1JlYXNvbkRlc2NyaXB0aW9uKToKKyAgICAgICAgKFdURjo6 cHJpbnRJbnRlcm5hbCk6CisgICAgICAgICogaGVhcC9Sb290TWFya1JlYXNvbi5oOgorCiAyMDIx LTAzLTE2ICBLaGVtIFJhaiAgPHJhai5raGVtQGdtYWlsLmNvbT4KIAogICAgICAgICBbQ01ha2Vd IEJ1aWxkIGZhaWxzIG9uIFJJU0MtViB3aXRoIEdDQyAxMQpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHJldmlzaW9uIDI3NDQ2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9K YXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBA IC0xOTg3LDYgKzE5ODcsNyBAQAogCQlGRThERTU0RDIzQUMxRTg2MDA1QzkxNDIgLyogQ2FjaGVh YmxlSWRlbnRpZmllcklubGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEZFOERFNTRDMjNBQzFFODYwMDVDOTE0MiAvKiBDYWNoZWFibGVJZGVudGlm aWVySW5saW5lcy5oICovOyB9OwogCQlGRTkxMkI0RjI1MzExOTMzMDBGQUJEREYgLyogQWJzdHJh Y3RTbG90VmlzaXRvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gRkU5MTJCNEUyNTMxMTkzMzAwRkFCRERGIC8qIEFic3RyYWN0U2xvdFZpc2l0b3IuaCAq Lzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRTkxMkI1 MTI1MzExQUQxMDBGQUJEREYgLyogQWJzdHJhY3RTbG90VmlzaXRvcklubGluZXMuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFOTEyQjUwMjUzMTFBRDEw MEZBQkRERiAvKiBBYnN0cmFjdFNsb3RWaXNpdG9ySW5saW5lcy5oICovOyBzZXR0aW5ncyA9IHtB VFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCUZFOTJFMURFMjVGQzAzMUUwMDE4RkNG MCAvKiBSb290TWFya1JlYXNvbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBGRTkyRTFERDI1RkMwMzFEMDAxOEZDRjAgLyogUm9vdE1hcmtSZWFzb24u Y3BwICovOyB9OwogCQlGRTk5QjI0OTFDMjRDM0QzMDBDODIxNTkgLyogSklUTmVnR2VuZXJhdG9y LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRTk5QjI0 ODFDMjRCNkQzMDBDODIxNTkgLyogSklUTmVnR2VuZXJhdG9yLmggKi87IH07CiAJCUZFQTA4NjIw MTgyQjdBMDQwMEY2RDg1MSAvKiBCcmVha3BvaW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUEwODYxRTE4MkI3QTA0MDBGNkQ4NTEgLyogQnJlYWtw b2ludC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJ CUZFQTA4NjIxMTgyQjdBMDQwMEY2RDg1MSAvKiBEZWJ1Z2dlclByaW1pdGl2ZXMuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFQTA4NjFGMTgyQjdBMDQw MEY2RDg1MSAvKiBEZWJ1Z2dlclByaW1pdGl2ZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtNTM1MCw2ICs1MzUxLDcgQEAKIAkJRkU5MEJCM0Ex QjdDRjY0RTAwNkIzRjAzIC8qIFZNSW5saW5lcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBWTUlubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5MTJC NEUyNTMxMTkzMzAwRkFCRERGIC8qIEFic3RyYWN0U2xvdFZpc2l0b3IuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQWJzdHJhY3RTbG90VmlzaXRvci5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQlGRTkxMkI1MDI1MzExQUQxMDBGQUJEREYgLyogQWJzdHJhY3RTbG90 VmlzaXRvcklubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQWJzdHJh Y3RTbG90VmlzaXRvcklubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRkU5 MkUxREQyNUZDMDMxRDAwMThGQ0YwIC8qIFJvb3RNYXJrUmVhc29uLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJvb3RNYXJrUmVhc29uLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJRkU5OEI1QjYxQkI5QUUxMTAwNzNFN0E2IC8qIEpJVFN1YkdlbmVy YXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKSVRTdWJHZW5lcmF0b3Iu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5OUIyNDcxQzI0QjZEMzAwQzgyMTU5 IC8qIEpJVE5lZ0dlbmVyYXRvci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBKSVROZWdHZW5lcmF0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlG RTk5QjI0ODFDMjRCNkQzMDBDODIxNTkgLyogSklUTmVnR2VuZXJhdG9yLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpJVE5lZ0dlbmVyYXRvci5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtNjQ1MCw2ICs2NDUyLDcgQEAKIAkJCQkwRkJCNzNCNjFERUYzQUFDMDAy QzAwOUUgLyogUHJldmVudENvbGxlY3Rpb25TY29wZS5oICovLAogCQkJCTBGRDBFNUVGMUU0NkJG MjMwMDA2QUIwOCAvKiBSZWdpc3RlclN0YXRlLmggKi8sCiAJCQkJMEY3Q0Y5NEUxREJFRUU4NjAw OThDQzEyIC8qIFJlbGVhc2VIZWFwQWNjZXNzU2NvcGUuaCAqLywKKwkJCQlGRTkyRTFERDI1RkMw MzFEMDAxOEZDRjAgLyogUm9vdE1hcmtSZWFzb24uY3BwICovLAogCQkJCUZFM0I2NDJFMjVENkZC NEMwMDFBRERCNCAvKiBSb290TWFya1JlYXNvbi5oICovLAogCQkJCTBGMkM2M0E5MUU0RkE0MkMw MEMxMzgzOSAvKiBSdW5uaW5nU2NvcGUuaCAqLywKIAkJCQkwRjREOEM3NjFGQ0EzQ0YyMDAxRDMy QUMgLyogU2ltcGxlTWFya2luZ0NvbnN0cmFpbnQuY3BwICovLApAQCAtMTE1NjEsNiArMTE1NjQs NyBAQAogCQkJCTUzNkIzMTZGMUY3MUM1OTkwMDM3RkMzMyAvKiBVbmlmaWVkU291cmNlNi5jcHAg aW4gU291cmNlcyAqLywKIAkJCQk1MzZCMzE2RTFGNzFDNTk5MDAzN0ZDMzMgLyogVW5pZmllZFNv dXJjZTcuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTM2QjMxM0MxRjcxQzU5OTAwMzdGQzMzIC8q IFVuaWZpZWRTb3VyY2U4LmNwcCBpbiBTb3VyY2VzICovLAorCQkJCUZFOTJFMURFMjVGQzAzMUUw MDE4RkNGMCAvKiBSb290TWFya1JlYXNvbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk1MzZCMzEz RDFGNzFDNTk5MDAzN0ZDMzMgLyogVW5pZmllZFNvdXJjZTkuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJNTM2QjMxODYxRjcxQzU5OTAwMzdGQzMzIC8qIFVuaWZpZWRTb3VyY2UxMC5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQk1MzZCMzE4MzFGNzFDNTk5MDAzN0ZDMzMgLyogVW5pZmllZFNvdXJjZTEx LmNwcCBpbiBTb3VyY2VzICovLApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJ KHJldmlzaW9uIDI3NDQ2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNzgzLDggKzI3ODMsMTAgQEAgdm9pZCBIZWFwOjphZGRDb3Jl Q29uc3RyYWludHMoKQogICAgIG1fY29uc3RyYWludFNldC0+YWRkKAogICAgICAgICAiTXNyIiwg Ik1pc2MgU21hbGwgUm9vdHMiLAogICAgICAgICBNQUtFX01BUktJTkdfQ09OU1RSQUlOVF9FWEVD VVRPUl9QQUlSKChbdGhpc10gKGF1dG8mIHZpc2l0b3IpIHsKLSAgICAgICAgICAgIGlmIGNvbnN0 ZXhwciAob2JqY0FQSUVuYWJsZWQpCisgICAgICAgICAgICBpZiBjb25zdGV4cHIgKG9iamNBUElF bmFibGVkKSB7CisgICAgICAgICAgICAgICAgU2V0Um9vdE1hcmtSZWFzb25TY29wZSByb290U2Nv cGUodmlzaXRvciwgUm9vdE1hcmtSZWFzb246OkV4dGVybmFsUmVtZW1iZXJlZFNldCk7CiAgICAg ICAgICAgICAgICAgc2NhbkV4dGVybmFsUmVtZW1iZXJlZFNldChtX3ZtLCB2aXNpdG9yKTsKKyAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKG1fdm0uc21hbGxTdHJpbmdzLm5lZWRzVG9C ZVZpc2l0ZWQoKm1fY29sbGVjdGlvblNjb3BlKSkgewogICAgICAgICAgICAgICAgIFNldFJvb3RN YXJrUmVhc29uU2NvcGUgcm9vdFNjb3BlKHZpc2l0b3IsIFJvb3RNYXJrUmVhc29uOjpTdHJvbmdS ZWZlcmVuY2VzKTsKQEAgLTI4MDIsOSArMjgwNCwxMiBAQCB2b2lkIEhlYXA6OmFkZENvcmVDb25z dHJhaW50cygpCiAgICAgICAgICAgICAgICAgTWFya2VkQXJndW1lbnRCdWZmZXI6Om1hcmtMaXN0 cyh2aXNpdG9yLCAqbV9tYXJrTGlzdFNldCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IG1fbWFya2VkSlNWYWx1ZVJlZkFycmF5cy5mb3JFYWNoKFsmXSAoTWFya2VkSlNWYWx1ZVJlZkFy cmF5KiBhcnJheSkgewotICAgICAgICAgICAgICAgIGFycmF5LT52aXNpdEFnZ3JlZ2F0ZSh2aXNp dG9yKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIFNl dFJvb3RNYXJrUmVhc29uU2NvcGUgcm9vdFNjb3BlKHZpc2l0b3IsIFJvb3RNYXJrUmVhc29uOjpN YXJrZWRKU1ZhbHVlUmVmQXJyYXkpOworICAgICAgICAgICAgICAgIG1fbWFya2VkSlNWYWx1ZVJl ZkFycmF5cy5mb3JFYWNoKFsmXSAoTWFya2VkSlNWYWx1ZVJlZkFycmF5KiBhcnJheSkgeworICAg ICAgICAgICAgICAgICAgICBhcnJheS0+dmlzaXRBZ2dyZWdhdGUodmlzaXRvcik7CisgICAgICAg ICAgICAgICAgfSk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJvb3RTY29wZSh2aXNpdG9yLCBSb290TWFya1Jl YXNvbjo6Vk1FeGNlcHRpb25zKTsKQEAgLTI4NjYsMTAgKzI4NzEsMTUgQEAgdm9pZCBIZWFwOjph ZGRDb3JlQ29uc3RyYWludHMoKQogICAgICAgICAgICAgICAgIFJlZlB0cjxTaGFyZWRUYXNrPHZv aWQoVmlzaXRvciYpPj4gdGFzayA9IHNldC50ZW1wbGF0ZSBmb3JFYWNoTWFya2VkQ2VsbEluUGFy YWxsZWw8VmlzaXRvcj4oY2FsbE91dHB1dENvbnN0cmFpbnQpOwogICAgICAgICAgICAgICAgIHZp c2l0b3IuYWRkUGFyYWxsZWxDb25zdHJhaW50VGFzayh0YXNrKTsKICAgICAgICAgICAgIH07Ci0g ICAgICAgICAgICAKLSAgICAgICAgICAgIGFkZCh2bS5leGVjdXRhYmxlVG9Db2RlQmxvY2tFZGdl c1dpdGhDb25zdHJhaW50cyk7Ci0gICAgICAgICAgICBpZiAodm0ubV93ZWFrTWFwU3BhY2UpCisK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJv b3RTY29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNvbjo6RXhlY3V0YWJsZVRvQ29kZUJsb2NrRWRn ZXMpOworICAgICAgICAgICAgICAgIGFkZCh2bS5leGVjdXRhYmxlVG9Db2RlQmxvY2tFZGdlc1dp dGhDb25zdHJhaW50cyk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAodm0ubV93ZWFr TWFwU3BhY2UpIHsKKyAgICAgICAgICAgICAgICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJvb3RT Y29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNvbjo6V2Vha01hcFNwYWNlKTsKICAgICAgICAgICAg ICAgICBhZGQoKnZtLm1fd2Vha01hcFNwYWNlKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSkp LAogICAgICAgICBDb25zdHJhaW50Vm9sYXRpbGl0eTo6R3JleWVkQnlNYXJraW5nLAogICAgICAg ICBDb25zdHJhaW50UGFyYWxsZWxpc206OlBhcmFsbGVsKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL0hlYXBTbmFwc2hvdEJ1aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBTbmFwc2hvdEJ1aWxkZXIuY3BwCShyZXZpc2lvbiAy NzQ0NjUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwU25hcHNob3RCdWlsZGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksOCArMzksNiBAQAogCiBuYW1lc3BhY2UgSlNDIHsK IAotc3RhdGljIGNvbnN0IGNoYXIqIHJvb3RUeXBlVG9TdHJpbmcoUm9vdE1hcmtSZWFzb24pOwot CiBOb2RlSWRlbnRpZmllciBIZWFwU25hcHNob3RCdWlsZGVyOjpuZXh0QXZhaWxhYmxlT2JqZWN0 SWRlbnRpZmllciA9IDE7CiBOb2RlSWRlbnRpZmllciBIZWFwU25hcHNob3RCdWlsZGVyOjpnZXRO ZXh0T2JqZWN0SWRlbnRpZmllcigpIHsgcmV0dXJuIG5leHRBdmFpbGFibGVPYmplY3RJZGVudGlm aWVyKys7IH0KIHZvaWQgSGVhcFNuYXBzaG90QnVpbGRlcjo6cmVzZXROZXh0QXZhaWxhYmxlT2Jq ZWN0SWRlbnRpZmllcigpIHsgSGVhcFNuYXBzaG90QnVpbGRlcjo6bmV4dEF2YWlsYWJsZU9iamVj dElkZW50aWZpZXIgPSAxOyB9CkBAIC0zMDUsNDIgKzMwMyw2IEBAIHN0YXRpYyBjb25zdCBjaGFy KiBzbmFwc2hvdFR5cGVUb1N0cmluZygKICAgICByZXR1cm4gIkluc3BlY3RvciI7CiB9CiAKLXN0 YXRpYyBjb25zdCBjaGFyKiByb290VHlwZVRvU3RyaW5nKFJvb3RNYXJrUmVhc29uIHR5cGUpCi17 Ci0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6Tm9uZToKLSAg ICAgICAgcmV0dXJuICJOb25lIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpDb25zZXJ2YXRp dmVTY2FuOgotICAgICAgICByZXR1cm4gIkNvbnNlcnZhdGl2ZSBzY2FuIjsKLSAgICBjYXNlIFJv b3RNYXJrUmVhc29uOjpTdHJvbmdSZWZlcmVuY2VzOgotICAgICAgICByZXR1cm4gIlN0cm9uZyBy ZWZlcmVuY2VzIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpQcm90ZWN0ZWRWYWx1ZXM6Ci0g ICAgICAgIHJldHVybiAiUHJvdGVjdGVkIHZhbHVlcyI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNv bjo6TWFya0xpc3RTZXQ6Ci0gICAgICAgIHJldHVybiAiTWFyayBsaXN0IHNldCI7Ci0gICAgY2Fz ZSBSb290TWFya1JlYXNvbjo6Vk1FeGNlcHRpb25zOgotICAgICAgICByZXR1cm4gIlZNIGV4Y2Vw dGlvbnMiOwotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246OlN0cm9uZ0hhbmRsZXM6Ci0gICAgICAg IHJldHVybiAiU3Ryb25nIGhhbmRsZXMiOwotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246OkRlYnVn Z2VyOgotICAgICAgICByZXR1cm4gIkRlYnVnZ2VyIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29u OjpKSVRTdHViUm91dGluZXM6Ci0gICAgICAgIHJldHVybiAiSklUIHN0dWIgcm91dGluZXMiOwot ICAgIGNhc2UgUm9vdE1hcmtSZWFzb246OldlYWtTZXRzOgotICAgICAgICByZXR1cm4gIldlYWsg c2V0cyI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6T3V0cHV0OgotICAgICAgICByZXR1cm4g Ik91dHB1dCI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6REZHV29ya0xpc3RzOgotICAgICAg ICByZXR1cm4gIkRGRyB3b3JrIGxpc3RzIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpDb2Rl QmxvY2tzOgotICAgICAgICByZXR1cm4gIkNvZGUgYmxvY2tzIjsKLSAgICBjYXNlIFJvb3RNYXJr UmVhc29uOjpET01HQ091dHB1dDoKLSAgICAgICAgcmV0dXJuICJET00gR0Mgb3V0cHV0IjsKLSAg ICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuICJOb25lIjsKLX0KLQog U3RyaW5nIEhlYXBTbmFwc2hvdEJ1aWxkZXI6Ompzb24oKQogewogICAgIHJldHVybiBqc29uKFtd IChjb25zdCBIZWFwU25hcHNob3ROb2RlJikgeyByZXR1cm4gdHJ1ZTsgfSk7CkBAIC02NTYsNyAr NjE4LDcgQEAgU3RyaW5nIEhlYXBTbmFwc2hvdEJ1aWxkZXI6Ompzb24oRnVuY3RpbwogICAgICAg ICAgICAganNvbi5hcHBlbmROdW1iZXIoc25hcHNob3ROb2RlLnZhbHVlKCkuaWRlbnRpZmllcik7 CiAKICAgICAgICAgICAgIC8vIE1heWJlIHdlIHNob3VsZCBqdXN0IGFsd2F5cyBlbmNvZGUgdGhl IHJvb3QgbmFtZXMuCi0gICAgICAgICAgICBjb25zdCBjaGFyKiByb290TmFtZSA9IHJvb3RUeXBl VG9TdHJpbmcoaXQudmFsdWUubWFya1JlYXNvbik7CisgICAgICAgICAgICBjb25zdCBjaGFyKiBy b290TmFtZSA9IHJvb3RNYXJrUmVhc29uRGVzY3JpcHRpb24oaXQudmFsdWUubWFya1JlYXNvbik7 CiAgICAgICAgICAgICBhdXRvIHJlc3VsdCA9IGxhYmVsSW5kZXhlcy5hZGQocm9vdE5hbWUsIG5l eHRMYWJlbEluZGV4KTsKICAgICAgICAgICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAg ICAgICAgICAgICBuZXh0TGFiZWxJbmRleCsrOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvUm9vdE1hcmtSZWFzb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29uLmNwcAkobm9uZXhpc3RlbnQpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9Sb290TWFya1JlYXNvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSw1NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FS UkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS CisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK KyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJSb290TWFya1JlYXNvbi5oIgorCisjaW5j bHVkZSA8d3RmL1ByaW50U3RyZWFtLmg+CisKK25hbWVzcGFjZSBKU0MgeworCitjb25zdCBjaGFy KiByb290TWFya1JlYXNvbkRlc2NyaXB0aW9uKFJvb3RNYXJrUmVhc29uIHJlYXNvbikKK3sKKyNk ZWZpbmUgQ0FTRV9ST09UX01BUktfUkVBU09OKHJlYXNvbikgXAorICAgIGNhc2UgSlNDOjpSb290 TWFya1JlYXNvbjo6cmVhc29uOiBcCisgICAgICAgIHJldHVybiAjcmVhc29uOyBcCisKKyAgICBz d2l0Y2ggKHJlYXNvbikgeworICAgICAgICBGT1JfRUFDSF9ST09UX01BUktfUkVBU09OKENBU0Vf Uk9PVF9NQVJLX1JFQVNPTikKKyAgICB9CisjdW5kZWYgQ0FTRV9ST09UX01BUktfUkVBU09OCisK KyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gIk5vbmUiOworfQorCit9IC8v IG5hbWVzcGFjZSBKU0MKKworbmFtZXNwYWNlIFdURiB7CisKK3ZvaWQgcHJpbnRJbnRlcm5hbChQ cmludFN0cmVhbSYgb3V0LCBKU0M6OlJvb3RNYXJrUmVhc29uIHJlYXNvbikKK3sKKyAgICBvdXQu cHJpbnQoSlNDOjpyb290TWFya1JlYXNvbkRlc2NyaXB0aW9uKHJlYXNvbikpOworfQorCit9IC8v IG5hbWVzcGFjZSBXVEYKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJr UmVhc29uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUm9vdE1h cmtSZWFzb24uaAkocmV2aXNpb24gMjc0NDY1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvUm9vdE1hcmtSZWFzb24uaAkod29ya2luZyBjb3B5KQpAQCAtMjUsMTkgKzI1LDQ0IEBACiAK ICNwcmFnbWEgb25jZQogCituYW1lc3BhY2UgSlNDIHsKKworI2RlZmluZSBGT1JfRUFDSF9ST09U X01BUktfUkVBU09OKHYpIFwKKyAgICB2KE5vbmUpIFwKKyAgICB2KENvbnNlcnZhdGl2ZVNjYW4p IFwKKyAgICB2KEV4ZWN1dGFibGVUb0NvZGVCbG9ja0VkZ2VzKSBcCisgICAgdihFeHRlcm5hbFJl bWVtYmVyZWRTZXQpIFwKKyAgICB2KFN0cm9uZ1JlZmVyZW5jZXMpIFwKKyAgICB2KFByb3RlY3Rl ZFZhbHVlcykgXAorICAgIHYoTWFya2VkSlNWYWx1ZVJlZkFycmF5KSBcCisgICAgdihNYXJrTGlz dFNldCkgXAorICAgIHYoVk1FeGNlcHRpb25zKSBcCisgICAgdihTdHJvbmdIYW5kbGVzKSBcCisg ICAgdihEZWJ1Z2dlcikgXAorICAgIHYoSklUU3R1YlJvdXRpbmVzKSBcCisgICAgdihXZWFrTWFw U3BhY2UpIFwKKyAgICB2KFdlYWtTZXRzKSBcCisgICAgdihPdXRwdXQpIFwKKyAgICB2KERGR1dv cmtMaXN0cykgXAorICAgIHYoQ29kZUJsb2NrcykgXAorICAgIHYoRE9NR0NPdXRwdXQpCisKKyNk ZWZpbmUgREVDTEFSRV9ST09UX01BUktfUkVBU09OKHJlYXNvbikgcmVhc29uLAorCiBlbnVtIGNs YXNzIFJvb3RNYXJrUmVhc29uIDogdWludDhfdCB7Ci0gICAgTm9uZSwKLSAgICBDb25zZXJ2YXRp dmVTY2FuLAotICAgIFN0cm9uZ1JlZmVyZW5jZXMsCi0gICAgUHJvdGVjdGVkVmFsdWVzLAotICAg IE1hcmtMaXN0U2V0LAotICAgIFZNRXhjZXB0aW9ucywKLSAgICBTdHJvbmdIYW5kbGVzLAotICAg IERlYnVnZ2VyLAotICAgIEpJVFN0dWJSb3V0aW5lcywKLSAgICBXZWFrU2V0cywKLSAgICBPdXRw dXQsCi0gICAgREZHV29ya0xpc3RzLAotICAgIENvZGVCbG9ja3MsCi0gICAgRE9NR0NPdXRwdXQs CisgICAgRk9SX0VBQ0hfUk9PVF9NQVJLX1JFQVNPTihERUNMQVJFX1JPT1RfTUFSS19SRUFTT04p CiB9OworCisjdW5kZWYgREVDTEFSRV9ST09UX01BUktfUkVBU09OCisKK2NvbnN0IGNoYXIqIHJv b3RNYXJrUmVhc29uRGVzY3JpcHRpb24oUm9vdE1hcmtSZWFzb24pOworCit9IC8vIG5hbWVzcGFj ZSBKU0MKKworbmFtZXNwYWNlIFdURiB7CisKK2NsYXNzIFByaW50U3RyZWFtOworCit2b2lkIHBy aW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mLCBKU0M6OlJvb3RNYXJrUmVhc29uKTsKKworfSAvLyBu YW1lc3BhY2UgV1RGCg== 423359 2021-03-16 11:09:17 -0700 2021-03-16 11:27:14 -0700 proposed patch. bug-223263.patch text/plain 13901 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc0NDk1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDIxLTAzLTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgYSBSb290TWFya1JlYXNvbiBwcmludGVyIGFuZCBhbHNvIGFkZCBhIGZldyBhZGRpdGlvbmFs IHJlYXNvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjMyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEphdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICog U291cmNlcy50eHQ6CisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVh cDo6YWRkQ29yZUNvbnN0cmFpbnRzKToKKyAgICAgICAgKiBoZWFwL0hlYXBTbmFwc2hvdEJ1aWxk ZXIuY3BwOgorICAgICAgICAoSlNDOjpIZWFwU25hcHNob3RCdWlsZGVyOjpqc29uKToKKyAgICAg ICAgKEpTQzo6cm9vdFR5cGVUb1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICogaGVhcC9Sb290 TWFya1JlYXNvbi5jcHA6IEFkZGVkLgorICAgICAgICAoSlNDOjpyb290TWFya1JlYXNvbkRlc2Ny aXB0aW9uKToKKyAgICAgICAgKFdURjo6cHJpbnRJbnRlcm5hbCk6CisgICAgICAgICogaGVhcC9S b290TWFya1JlYXNvbi5oOgorCiAyMDIxLTAzLTE2ICBLaGVtIFJhaiAgPHJhai5raGVtQGdtYWls LmNvbT4KIAogICAgICAgICBbQ01ha2VdIEJ1aWxkIGZhaWxzIG9uIFJJU0MtViB3aXRoIEdDQyAx MQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXMudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9Tb3VyY2VzLnR4dAkocmV2aXNpb24gMjc0NDk0KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01NTUs NiArNTU1LDcgQEAgaGVhcC9NYXJraW5nQ29uc3RyYWludFNldC5jcHAKIGhlYXAvTWFya2luZ0Nv bnN0cmFpbnRTb2x2ZXIuY3BwCiBoZWFwL011dGF0b3JTY2hlZHVsZXIuY3BwCiBoZWFwL011dGF0 b3JTdGF0ZS5jcHAKK2hlYXAvUm9vdE1hcmtSZWFzb24uY3BwCiBoZWFwL1NpbXBsZU1hcmtpbmdD b25zdHJhaW50LmNwcAogaGVhcC9TbG90VmlzaXRvci5jcHAKIGhlYXAvU3BhY2VUaW1lTXV0YXRv clNjaGVkdWxlci5jcHAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAyNzQ0OTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTk4Nyw2ICsxOTg3LDcgQEAK IAkJRkU4REU1NEQyM0FDMUU4NjAwNUM5MTQyIC8qIENhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVz LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRThERTU0 QzIzQUMxRTg2MDA1QzkxNDIgLyogQ2FjaGVhYmxlSWRlbnRpZmllcklubGluZXMuaCAqLzsgfTsK IAkJRkU5MTJCNEYyNTMxMTkzMzAwRkFCRERGIC8qIEFic3RyYWN0U2xvdFZpc2l0b3IuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFOTEyQjRFMjUzMTE5 MzMwMEZBQkRERiAvKiBBYnN0cmFjdFNsb3RWaXNpdG9yLmggKi87IHNldHRpbmdzID0ge0FUVFJJ QlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJRkU5MTJCNTEyNTMxMUFEMTAwRkFCRERGIC8q IEFic3RyYWN0U2xvdFZpc2l0b3JJbmxpbmVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBGRTkxMkI1MDI1MzExQUQxMDBGQUJEREYgLyogQWJzdHJhY3RT bG90VmlzaXRvcklubGluZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OworCQlGRTkyRTFERTI1RkMwMzFFMDAxOEZDRjAgLyogUm9vdE1hcmtSZWFzb24u Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkU5MkUx REQyNUZDMDMxRDAwMThGQ0YwIC8qIFJvb3RNYXJrUmVhc29uLmNwcCAqLzsgfTsKIAkJRkU5OUIy NDkxQzI0QzNEMzAwQzgyMTU5IC8qIEpJVE5lZ0dlbmVyYXRvci5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkU5OUIyNDgxQzI0QjZEMzAwQzgyMTU5IC8q IEpJVE5lZ0dlbmVyYXRvci5oICovOyB9OwogCQlGRUEwODYyMDE4MkI3QTA0MDBGNkQ4NTEgLyog QnJlYWtwb2ludC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gRkVBMDg2MUUxODJCN0EwNDAwRjZEODUxIC8qIEJyZWFrcG9pbnQuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRUEwODYyMTE4MkI3QTA0MDBG NkQ4NTEgLyogRGVidWdnZXJQcmltaXRpdmVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBGRUEwODYxRjE4MkI3QTA0MDBGNkQ4NTEgLyogRGVidWdnZXJQ cmltaXRpdmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKQEAgLTUzNTAsNiArNTM1MSw3IEBACiAJCUZFOTBCQjNBMUI3Q0Y2NEUwMDZCM0YwMyAvKiBW TUlubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVk1JbmxpbmVzLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFOTEyQjRFMjUzMTE5MzMwMEZBQkRERiAv KiBBYnN0cmFjdFNsb3RWaXNpdG9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IEFic3RyYWN0U2xvdFZpc2l0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5 MTJCNTAyNTMxMUFEMTAwRkFCRERGIC8qIEFic3RyYWN0U2xvdFZpc2l0b3JJbmxpbmVzLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFic3RyYWN0U2xvdFZpc2l0b3JJbmxpbmVz Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUZFOTJFMUREMjVGQzAzMUQwMDE4RkNG MCAvKiBSb290TWFya1JlYXNvbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBSb290TWFya1JlYXNvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZF OThCNUI2MUJCOUFFMTEwMDczRTdBNiAvKiBKSVRTdWJHZW5lcmF0b3IuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gSklUU3ViR2VuZXJhdG9yLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCUZFOTlCMjQ3MUMyNEI2RDMwMEM4MjE1OSAvKiBKSVROZWdHZW5lcmF0b3Iu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSklUTmVnR2VuZXJhdG9y LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5OUIyNDgxQzI0QjZEMzAwQzgy MTU5IC8qIEpJVE5lZ0dlbmVyYXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBKSVROZWdHZW5lcmF0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTY0NTAs NiArNjQ1Miw3IEBACiAJCQkJMEZCQjczQjYxREVGM0FBQzAwMkMwMDlFIC8qIFByZXZlbnRDb2xs ZWN0aW9uU2NvcGUuaCAqLywKIAkJCQkwRkQwRTVFRjFFNDZCRjIzMDAwNkFCMDggLyogUmVnaXN0 ZXJTdGF0ZS5oICovLAogCQkJCTBGN0NGOTRFMURCRUVFODYwMDk4Q0MxMiAvKiBSZWxlYXNlSGVh cEFjY2Vzc1Njb3BlLmggKi8sCisJCQkJRkU5MkUxREQyNUZDMDMxRDAwMThGQ0YwIC8qIFJvb3RN YXJrUmVhc29uLmNwcCAqLywKIAkJCQlGRTNCNjQyRTI1RDZGQjRDMDAxQUREQjQgLyogUm9vdE1h cmtSZWFzb24uaCAqLywKIAkJCQkwRjJDNjNBOTFFNEZBNDJDMDBDMTM4MzkgLyogUnVubmluZ1Nj b3BlLmggKi8sCiAJCQkJMEY0RDhDNzYxRkNBM0NGMjAwMUQzMkFDIC8qIFNpbXBsZU1hcmtpbmdD b25zdHJhaW50LmNwcCAqLywKQEAgLTExNTYxLDYgKzExNTY0LDcgQEAKIAkJCQk1MzZCMzE2RjFG NzFDNTk5MDAzN0ZDMzMgLyogVW5pZmllZFNvdXJjZTYuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJ NTM2QjMxNkUxRjcxQzU5OTAwMzdGQzMzIC8qIFVuaWZpZWRTb3VyY2U3LmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCTUzNkIzMTNDMUY3MUM1OTkwMDM3RkMzMyAvKiBVbmlmaWVkU291cmNlOC5jcHAg aW4gU291cmNlcyAqLywKKwkJCQlGRTkyRTFERTI1RkMwMzFFMDAxOEZDRjAgLyogUm9vdE1hcmtS ZWFzb24uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTM2QjMxM0QxRjcxQzU5OTAwMzdGQzMzIC8q IFVuaWZpZWRTb3VyY2U5LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTUzNkIzMTg2MUY3MUM1OTkw MDM3RkMzMyAvKiBVbmlmaWVkU291cmNlMTAuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTM2QjMx ODMxRjcxQzU5OTAwMzdGQzMzIC8qIFVuaWZpZWRTb3VyY2UxMS5jcHAgaW4gU291cmNlcyAqLywK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCShyZXZpc2lvbiAyNzQ0OTQpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkod29ya2luZyBjb3B5KQpAQCAt Mjc4Myw4ICsyNzgzLDEwIEBAIHZvaWQgSGVhcDo6YWRkQ29yZUNvbnN0cmFpbnRzKCkKICAgICBt X2NvbnN0cmFpbnRTZXQtPmFkZCgKICAgICAgICAgIk1zciIsICJNaXNjIFNtYWxsIFJvb3RzIiwK ICAgICAgICAgTUFLRV9NQVJLSU5HX0NPTlNUUkFJTlRfRVhFQ1VUT1JfUEFJUigoW3RoaXNdIChh dXRvJiB2aXNpdG9yKSB7Ci0gICAgICAgICAgICBpZiBjb25zdGV4cHIgKG9iamNBUElFbmFibGVk KQorICAgICAgICAgICAgaWYgY29uc3RleHByIChvYmpjQVBJRW5hYmxlZCkgeworICAgICAgICAg ICAgICAgIFNldFJvb3RNYXJrUmVhc29uU2NvcGUgcm9vdFNjb3BlKHZpc2l0b3IsIFJvb3RNYXJr UmVhc29uOjpFeHRlcm5hbFJlbWVtYmVyZWRTZXQpOwogICAgICAgICAgICAgICAgIHNjYW5FeHRl cm5hbFJlbWVtYmVyZWRTZXQobV92bSwgdmlzaXRvcik7CisgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIGlmIChtX3ZtLnNtYWxsU3RyaW5ncy5uZWVkc1RvQmVWaXNpdGVkKCptX2NvbGxlY3Rp b25TY29wZSkpIHsKICAgICAgICAgICAgICAgICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJvb3RT Y29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNvbjo6U3Ryb25nUmVmZXJlbmNlcyk7CkBAIC0yODAy LDkgKzI4MDQsMTIgQEAgdm9pZCBIZWFwOjphZGRDb3JlQ29uc3RyYWludHMoKQogICAgICAgICAg ICAgICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyOjptYXJrTGlzdHModmlzaXRvciwgKm1fbWFya0xp c3RTZXQpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBtX21hcmtlZEpTVmFsdWVSZWZB cnJheXMuZm9yRWFjaChbJl0gKE1hcmtlZEpTVmFsdWVSZWZBcnJheSogYXJyYXkpIHsKLSAgICAg ICAgICAgICAgICBhcnJheS0+dmlzaXRBZ2dyZWdhdGUodmlzaXRvcik7Ci0gICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBTZXRSb290TWFya1JlYXNvblNjb3Bl IHJvb3RTY29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNvbjo6TWFya2VkSlNWYWx1ZVJlZkFycmF5 KTsKKyAgICAgICAgICAgICAgICBtX21hcmtlZEpTVmFsdWVSZWZBcnJheXMuZm9yRWFjaChbJl0g KE1hcmtlZEpTVmFsdWVSZWZBcnJheSogYXJyYXkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXJy YXktPnZpc2l0QWdncmVnYXRlKHZpc2l0b3IpOworICAgICAgICAgICAgICAgIH0pOworICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgU2V0Um9vdE1hcmtSZWFz b25TY29wZSByb290U2NvcGUodmlzaXRvciwgUm9vdE1hcmtSZWFzb246OlZNRXhjZXB0aW9ucyk7 CkBAIC0yODY2LDEwICsyODcxLDE1IEBAIHZvaWQgSGVhcDo6YWRkQ29yZUNvbnN0cmFpbnRzKCkK ICAgICAgICAgICAgICAgICBSZWZQdHI8U2hhcmVkVGFzazx2b2lkKFZpc2l0b3ImKT4+IHRhc2sg PSBzZXQudGVtcGxhdGUgZm9yRWFjaE1hcmtlZENlbGxJblBhcmFsbGVsPFZpc2l0b3I+KGNhbGxP dXRwdXRDb25zdHJhaW50KTsKICAgICAgICAgICAgICAgICB2aXNpdG9yLmFkZFBhcmFsbGVsQ29u c3RyYWludFRhc2sodGFzayk7CiAgICAgICAgICAgICB9OwotICAgICAgICAgICAgCi0gICAgICAg ICAgICBhZGQodm0uZXhlY3V0YWJsZVRvQ29kZUJsb2NrRWRnZXNXaXRoQ29uc3RyYWludHMpOwot ICAgICAgICAgICAgaWYgKHZtLm1fd2Vha01hcFNwYWNlKQorCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgU2V0Um9vdE1hcmtSZWFzb25TY29wZSByb290U2NvcGUodmlzaXRvciwgUm9v dE1hcmtSZWFzb246OkV4ZWN1dGFibGVUb0NvZGVCbG9ja0VkZ2VzKTsKKyAgICAgICAgICAgICAg ICBhZGQodm0uZXhlY3V0YWJsZVRvQ29kZUJsb2NrRWRnZXNXaXRoQ29uc3RyYWludHMpOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgaWYgKHZtLm1fd2Vha01hcFNwYWNlKSB7CisgICAgICAg ICAgICAgICAgU2V0Um9vdE1hcmtSZWFzb25TY29wZSByb290U2NvcGUodmlzaXRvciwgUm9vdE1h cmtSZWFzb246OldlYWtNYXBTcGFjZSk7CiAgICAgICAgICAgICAgICAgYWRkKCp2bS5tX3dlYWtN YXBTcGFjZSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0pKSwKICAgICAgICAgQ29uc3RyYWlu dFZvbGF0aWxpdHk6OkdyZXllZEJ5TWFya2luZywKICAgICAgICAgQ29uc3RyYWludFBhcmFsbGVs aXNtOjpQYXJhbGxlbCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwU25h cHNob3RCdWlsZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwU25hcHNob3RCdWlsZGVyLmNwcAkocmV2aXNpb24gMjc0NDk0KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvSGVhcFNuYXBzaG90QnVpbGRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM5LDggKzM5LDYgQEAKIAogbmFtZXNwYWNlIEpTQyB7CiAKLXN0YXRpYyBjb25zdCBjaGFy KiByb290VHlwZVRvU3RyaW5nKFJvb3RNYXJrUmVhc29uKTsKLQogTm9kZUlkZW50aWZpZXIgSGVh cFNuYXBzaG90QnVpbGRlcjo6bmV4dEF2YWlsYWJsZU9iamVjdElkZW50aWZpZXIgPSAxOwogTm9k ZUlkZW50aWZpZXIgSGVhcFNuYXBzaG90QnVpbGRlcjo6Z2V0TmV4dE9iamVjdElkZW50aWZpZXIo KSB7IHJldHVybiBuZXh0QXZhaWxhYmxlT2JqZWN0SWRlbnRpZmllcisrOyB9CiB2b2lkIEhlYXBT bmFwc2hvdEJ1aWxkZXI6OnJlc2V0TmV4dEF2YWlsYWJsZU9iamVjdElkZW50aWZpZXIoKSB7IEhl YXBTbmFwc2hvdEJ1aWxkZXI6Om5leHRBdmFpbGFibGVPYmplY3RJZGVudGlmaWVyID0gMTsgfQpA QCAtMzA1LDQyICszMDMsNiBAQCBzdGF0aWMgY29uc3QgY2hhciogc25hcHNob3RUeXBlVG9TdHJp bmcoCiAgICAgcmV0dXJuICJJbnNwZWN0b3IiOwogfQogCi1zdGF0aWMgY29uc3QgY2hhciogcm9v dFR5cGVUb1N0cmluZyhSb290TWFya1JlYXNvbiB0eXBlKQotewotICAgIHN3aXRjaCAodHlwZSkg ewotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246Ok5vbmU6Ci0gICAgICAgIHJldHVybiAiTm9uZSI7 Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6Q29uc2VydmF0aXZlU2NhbjoKLSAgICAgICAgcmV0 dXJuICJDb25zZXJ2YXRpdmUgc2NhbiI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6U3Ryb25n UmVmZXJlbmNlczoKLSAgICAgICAgcmV0dXJuICJTdHJvbmcgcmVmZXJlbmNlcyI7Ci0gICAgY2Fz ZSBSb290TWFya1JlYXNvbjo6UHJvdGVjdGVkVmFsdWVzOgotICAgICAgICByZXR1cm4gIlByb3Rl Y3RlZCB2YWx1ZXMiOwotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246Ok1hcmtMaXN0U2V0OgotICAg ICAgICByZXR1cm4gIk1hcmsgbGlzdCBzZXQiOwotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246OlZN RXhjZXB0aW9uczoKLSAgICAgICAgcmV0dXJuICJWTSBleGNlcHRpb25zIjsKLSAgICBjYXNlIFJv b3RNYXJrUmVhc29uOjpTdHJvbmdIYW5kbGVzOgotICAgICAgICByZXR1cm4gIlN0cm9uZyBoYW5k bGVzIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpEZWJ1Z2dlcjoKLSAgICAgICAgcmV0dXJu ICJEZWJ1Z2dlciI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6SklUU3R1YlJvdXRpbmVzOgot ICAgICAgICByZXR1cm4gIkpJVCBzdHViIHJvdXRpbmVzIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVh c29uOjpXZWFrU2V0czoKLSAgICAgICAgcmV0dXJuICJXZWFrIHNldHMiOwotICAgIGNhc2UgUm9v dE1hcmtSZWFzb246Ok91dHB1dDoKLSAgICAgICAgcmV0dXJuICJPdXRwdXQiOwotICAgIGNhc2Ug Um9vdE1hcmtSZWFzb246OkRGR1dvcmtMaXN0czoKLSAgICAgICAgcmV0dXJuICJERkcgd29yayBs aXN0cyI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6Q29kZUJsb2NrczoKLSAgICAgICAgcmV0 dXJuICJDb2RlIGJsb2NrcyI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6RE9NR0NPdXRwdXQ6 Ci0gICAgICAgIHJldHVybiAiRE9NIEdDIG91dHB1dCI7Ci0gICAgfQotICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwotICAgIHJldHVybiAiTm9uZSI7Ci19Ci0KIFN0cmluZyBIZWFwU25hcHNob3RC dWlsZGVyOjpqc29uKCkKIHsKICAgICByZXR1cm4ganNvbihbXSAoY29uc3QgSGVhcFNuYXBzaG90 Tm9kZSYpIHsgcmV0dXJuIHRydWU7IH0pOwpAQCAtNjU2LDcgKzYxOCw3IEBAIFN0cmluZyBIZWFw U25hcHNob3RCdWlsZGVyOjpqc29uKEZ1bmN0aW8KICAgICAgICAgICAgIGpzb24uYXBwZW5kTnVt YmVyKHNuYXBzaG90Tm9kZS52YWx1ZSgpLmlkZW50aWZpZXIpOwogCiAgICAgICAgICAgICAvLyBN YXliZSB3ZSBzaG91bGQganVzdCBhbHdheXMgZW5jb2RlIHRoZSByb290IG5hbWVzLgotICAgICAg ICAgICAgY29uc3QgY2hhciogcm9vdE5hbWUgPSByb290VHlwZVRvU3RyaW5nKGl0LnZhbHVlLm1h cmtSZWFzb24pOworICAgICAgICAgICAgY29uc3QgY2hhciogcm9vdE5hbWUgPSByb290TWFya1Jl YXNvbkRlc2NyaXB0aW9uKGl0LnZhbHVlLm1hcmtSZWFzb24pOwogICAgICAgICAgICAgYXV0byBy ZXN1bHQgPSBsYWJlbEluZGV4ZXMuYWRkKHJvb3ROYW1lLCBuZXh0TGFiZWxJbmRleCk7CiAgICAg ICAgICAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgICAgICAgICAgbmV4dExhYmVs SW5kZXgrKzsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Sb290TWFya1Jl YXNvbi5jcHAJKG5vbmV4aXN0ZW50KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUm9v dE1hcmtSZWFzb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNTcgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiUm9vdE1hcmtSZWFzb24uaCIKKworI2luY2x1ZGUgPHd0Zi9QcmludFN0cmVh bS5oPgorCituYW1lc3BhY2UgSlNDIHsKKworY29uc3QgY2hhciogcm9vdE1hcmtSZWFzb25EZXNj cmlwdGlvbihSb290TWFya1JlYXNvbiByZWFzb24pCit7CisjZGVmaW5lIENBU0VfUk9PVF9NQVJL X1JFQVNPTihyZWFzb24pIFwKKyAgICBjYXNlIEpTQzo6Um9vdE1hcmtSZWFzb246OnJlYXNvbjog XAorICAgICAgICByZXR1cm4gI3JlYXNvbjsgXAorCisgICAgc3dpdGNoIChyZWFzb24pIHsKKyAg ICAgICAgRk9SX0VBQ0hfUk9PVF9NQVJLX1JFQVNPTihDQVNFX1JPT1RfTUFSS19SRUFTT04pCisg ICAgfQorI3VuZGVmIENBU0VfUk9PVF9NQVJLX1JFQVNPTgorCisgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgcmV0dXJuICJOb25lIjsKK30KKworfSAvLyBuYW1lc3BhY2UgSlNDCisKK25h bWVzcGFjZSBXVEYgeworCit2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mIG91dCwgSlND OjpSb290TWFya1JlYXNvbiByZWFzb24pCit7CisgICAgb3V0LnByaW50KEpTQzo6cm9vdE1hcmtS ZWFzb25EZXNjcmlwdGlvbihyZWFzb24pKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV1RGCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Sb290TWFya1JlYXNvbi5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29uLmgJKHJldmlzaW9u IDI3NDQ5NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29uLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI1LDE5ICsyNSw0NCBAQAogCiAjcHJhZ21hIG9uY2UKIAorbmFt ZXNwYWNlIEpTQyB7CisKKyNkZWZpbmUgRk9SX0VBQ0hfUk9PVF9NQVJLX1JFQVNPTih2KSBcCisg ICAgdihOb25lKSBcCisgICAgdihDb25zZXJ2YXRpdmVTY2FuKSBcCisgICAgdihFeGVjdXRhYmxl VG9Db2RlQmxvY2tFZGdlcykgXAorICAgIHYoRXh0ZXJuYWxSZW1lbWJlcmVkU2V0KSBcCisgICAg dihTdHJvbmdSZWZlcmVuY2VzKSBcCisgICAgdihQcm90ZWN0ZWRWYWx1ZXMpIFwKKyAgICB2KE1h cmtlZEpTVmFsdWVSZWZBcnJheSkgXAorICAgIHYoTWFya0xpc3RTZXQpIFwKKyAgICB2KFZNRXhj ZXB0aW9ucykgXAorICAgIHYoU3Ryb25nSGFuZGxlcykgXAorICAgIHYoRGVidWdnZXIpIFwKKyAg ICB2KEpJVFN0dWJSb3V0aW5lcykgXAorICAgIHYoV2Vha01hcFNwYWNlKSBcCisgICAgdihXZWFr U2V0cykgXAorICAgIHYoT3V0cHV0KSBcCisgICAgdihERkdXb3JrTGlzdHMpIFwKKyAgICB2KENv ZGVCbG9ja3MpIFwKKyAgICB2KERPTUdDT3V0cHV0KQorCisjZGVmaW5lIERFQ0xBUkVfUk9PVF9N QVJLX1JFQVNPTihyZWFzb24pIHJlYXNvbiwKKwogZW51bSBjbGFzcyBSb290TWFya1JlYXNvbiA6 IHVpbnQ4X3QgewotICAgIE5vbmUsCi0gICAgQ29uc2VydmF0aXZlU2NhbiwKLSAgICBTdHJvbmdS ZWZlcmVuY2VzLAotICAgIFByb3RlY3RlZFZhbHVlcywKLSAgICBNYXJrTGlzdFNldCwKLSAgICBW TUV4Y2VwdGlvbnMsCi0gICAgU3Ryb25nSGFuZGxlcywKLSAgICBEZWJ1Z2dlciwKLSAgICBKSVRT dHViUm91dGluZXMsCi0gICAgV2Vha1NldHMsCi0gICAgT3V0cHV0LAotICAgIERGR1dvcmtMaXN0 cywKLSAgICBDb2RlQmxvY2tzLAotICAgIERPTUdDT3V0cHV0LAorICAgIEZPUl9FQUNIX1JPT1Rf TUFSS19SRUFTT04oREVDTEFSRV9ST09UX01BUktfUkVBU09OKQogfTsKKworI3VuZGVmIERFQ0xB UkVfUk9PVF9NQVJLX1JFQVNPTgorCitjb25zdCBjaGFyKiByb290TWFya1JlYXNvbkRlc2NyaXB0 aW9uKFJvb3RNYXJrUmVhc29uKTsKKworfSAvLyBuYW1lc3BhY2UgSlNDCisKK25hbWVzcGFjZSBX VEYgeworCitjbGFzcyBQcmludFN0cmVhbTsKKwordm9pZCBwcmludEludGVybmFsKFByaW50U3Ry ZWFtJiwgSlNDOjpSb290TWFya1JlYXNvbik7CisKK30gLy8gbmFtZXNwYWNlIFdURgo= 423363 2021-03-16 11:15:57 -0700 2021-03-16 14:59:02 -0700 proposed patch. bug-223263.patch text/plain 12127 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc0NDk1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDIxLTAzLTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgYSBSb290TWFya1JlYXNvbiBwcmludGVyIGFuZCBhbHNvIGFkZCBhIGZldyBhZGRpdGlvbmFs IHJlYXNvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjMyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEphdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICog U291cmNlcy50eHQ6CisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVh cDo6YWRkQ29yZUNvbnN0cmFpbnRzKToKKyAgICAgICAgKiBoZWFwL0hlYXBTbmFwc2hvdEJ1aWxk ZXIuY3BwOgorICAgICAgICAoSlNDOjpIZWFwU25hcHNob3RCdWlsZGVyOjpqc29uKToKKyAgICAg ICAgKEpTQzo6cm9vdFR5cGVUb1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICogaGVhcC9Sb290 TWFya1JlYXNvbi5jcHA6IEFkZGVkLgorICAgICAgICAoSlNDOjpyb290TWFya1JlYXNvbkRlc2Ny aXB0aW9uKToKKyAgICAgICAgKFdURjo6cHJpbnRJbnRlcm5hbCk6CisgICAgICAgICogaGVhcC9S b290TWFya1JlYXNvbi5oOgorCiAyMDIxLTAzLTE2ICBLaGVtIFJhaiAgPHJhai5raGVtQGdtYWls LmNvbT4KIAogICAgICAgICBbQ01ha2VdIEJ1aWxkIGZhaWxzIG9uIFJJU0MtViB3aXRoIEdDQyAx MQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXMudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9Tb3VyY2VzLnR4dAkocmV2aXNpb24gMjc0NDk0KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01NTUs NiArNTU1LDcgQEAgaGVhcC9NYXJraW5nQ29uc3RyYWludFNldC5jcHAKIGhlYXAvTWFya2luZ0Nv bnN0cmFpbnRTb2x2ZXIuY3BwCiBoZWFwL011dGF0b3JTY2hlZHVsZXIuY3BwCiBoZWFwL011dGF0 b3JTdGF0ZS5jcHAKK2hlYXAvUm9vdE1hcmtSZWFzb24uY3BwCiBoZWFwL1NpbXBsZU1hcmtpbmdD b25zdHJhaW50LmNwcAogaGVhcC9TbG90VmlzaXRvci5jcHAKIGhlYXAvU3BhY2VUaW1lTXV0YXRv clNjaGVkdWxlci5jcHAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAyNzQ0OTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNTM1MCw2ICs1MzUwLDcgQEAK IAkJRkU5MEJCM0ExQjdDRjY0RTAwNkIzRjAzIC8qIFZNSW5saW5lcy5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBWTUlubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJRkU5MTJCNEUyNTMxMTkzMzAwRkFCRERGIC8qIEFic3RyYWN0U2xvdFZpc2l0b3IuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQWJzdHJhY3RTbG90VmlzaXRvci5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRTkxMkI1MDI1MzExQUQxMDBGQUJEREYgLyog QWJzdHJhY3RTbG90VmlzaXRvcklubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gQWJzdHJhY3RTbG90VmlzaXRvcklubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJRkU5MkUxREQyNUZDMDMxRDAwMThGQ0YwIC8qIFJvb3RNYXJrUmVhc29uLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJvb3RNYXJrUmVhc29uLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5OEI1QjYxQkI5QUUxMTAwNzNFN0E2IC8q IEpJVFN1YkdlbmVyYXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKSVRT dWJHZW5lcmF0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkU5OUIyNDcxQzI0 QjZEMzAwQzgyMTU5IC8qIEpJVE5lZ0dlbmVyYXRvci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKSVROZWdHZW5lcmF0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQlGRTk5QjI0ODFDMjRCNkQzMDBDODIxNTkgLyogSklUTmVnR2VuZXJhdG9yLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpJVE5lZ0dlbmVyYXRvci5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNjQ1MCw2ICs2NDUxLDcgQEAKIAkJCQkwRkJCNzNC NjFERUYzQUFDMDAyQzAwOUUgLyogUHJldmVudENvbGxlY3Rpb25TY29wZS5oICovLAogCQkJCTBG RDBFNUVGMUU0NkJGMjMwMDA2QUIwOCAvKiBSZWdpc3RlclN0YXRlLmggKi8sCiAJCQkJMEY3Q0Y5 NEUxREJFRUU4NjAwOThDQzEyIC8qIFJlbGVhc2VIZWFwQWNjZXNzU2NvcGUuaCAqLywKKwkJCQlG RTkyRTFERDI1RkMwMzFEMDAxOEZDRjAgLyogUm9vdE1hcmtSZWFzb24uY3BwICovLAogCQkJCUZF M0I2NDJFMjVENkZCNEMwMDFBRERCNCAvKiBSb290TWFya1JlYXNvbi5oICovLAogCQkJCTBGMkM2 M0E5MUU0RkE0MkMwMEMxMzgzOSAvKiBSdW5uaW5nU2NvcGUuaCAqLywKIAkJCQkwRjREOEM3NjFG Q0EzQ0YyMDAxRDMyQUMgLyogU2ltcGxlTWFya2luZ0NvbnN0cmFpbnQuY3BwICovLApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHJldmlzaW9uIDI3NDQ5NCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzgzLDgg KzI3ODMsMTAgQEAgdm9pZCBIZWFwOjphZGRDb3JlQ29uc3RyYWludHMoKQogICAgIG1fY29uc3Ry YWludFNldC0+YWRkKAogICAgICAgICAiTXNyIiwgIk1pc2MgU21hbGwgUm9vdHMiLAogICAgICAg ICBNQUtFX01BUktJTkdfQ09OU1RSQUlOVF9FWEVDVVRPUl9QQUlSKChbdGhpc10gKGF1dG8mIHZp c2l0b3IpIHsKLSAgICAgICAgICAgIGlmIGNvbnN0ZXhwciAob2JqY0FQSUVuYWJsZWQpCisgICAg ICAgICAgICBpZiBjb25zdGV4cHIgKG9iamNBUElFbmFibGVkKSB7CisgICAgICAgICAgICAgICAg U2V0Um9vdE1hcmtSZWFzb25TY29wZSByb290U2NvcGUodmlzaXRvciwgUm9vdE1hcmtSZWFzb246 OkV4dGVybmFsUmVtZW1iZXJlZFNldCk7CiAgICAgICAgICAgICAgICAgc2NhbkV4dGVybmFsUmVt ZW1iZXJlZFNldChtX3ZtLCB2aXNpdG9yKTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg aWYgKG1fdm0uc21hbGxTdHJpbmdzLm5lZWRzVG9CZVZpc2l0ZWQoKm1fY29sbGVjdGlvblNjb3Bl KSkgewogICAgICAgICAgICAgICAgIFNldFJvb3RNYXJrUmVhc29uU2NvcGUgcm9vdFNjb3BlKHZp c2l0b3IsIFJvb3RNYXJrUmVhc29uOjpTdHJvbmdSZWZlcmVuY2VzKTsKQEAgLTI4MDIsOSArMjgw NCwxMiBAQCB2b2lkIEhlYXA6OmFkZENvcmVDb25zdHJhaW50cygpCiAgICAgICAgICAgICAgICAg TWFya2VkQXJndW1lbnRCdWZmZXI6Om1hcmtMaXN0cyh2aXNpdG9yLCAqbV9tYXJrTGlzdFNldCk7 CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIG1fbWFya2VkSlNWYWx1ZVJlZkFycmF5cy5m b3JFYWNoKFsmXSAoTWFya2VkSlNWYWx1ZVJlZkFycmF5KiBhcnJheSkgewotICAgICAgICAgICAg ICAgIGFycmF5LT52aXNpdEFnZ3JlZ2F0ZSh2aXNpdG9yKTsKLSAgICAgICAgICAgIH0pOworICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIFNldFJvb3RNYXJrUmVhc29uU2NvcGUgcm9vdFNj b3BlKHZpc2l0b3IsIFJvb3RNYXJrUmVhc29uOjpNYXJrZWRKU1ZhbHVlUmVmQXJyYXkpOworICAg ICAgICAgICAgICAgIG1fbWFya2VkSlNWYWx1ZVJlZkFycmF5cy5mb3JFYWNoKFsmXSAoTWFya2Vk SlNWYWx1ZVJlZkFycmF5KiBhcnJheSkgeworICAgICAgICAgICAgICAgICAgICBhcnJheS0+dmlz aXRBZ2dyZWdhdGUodmlzaXRvcik7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBTZXRSb290TWFya1JlYXNvblNjb3Bl IHJvb3RTY29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNvbjo6Vk1FeGNlcHRpb25zKTsKQEAgLTI4 NjYsMTAgKzI4NzEsMTUgQEAgdm9pZCBIZWFwOjphZGRDb3JlQ29uc3RyYWludHMoKQogICAgICAg ICAgICAgICAgIFJlZlB0cjxTaGFyZWRUYXNrPHZvaWQoVmlzaXRvciYpPj4gdGFzayA9IHNldC50 ZW1wbGF0ZSBmb3JFYWNoTWFya2VkQ2VsbEluUGFyYWxsZWw8VmlzaXRvcj4oY2FsbE91dHB1dENv bnN0cmFpbnQpOwogICAgICAgICAgICAgICAgIHZpc2l0b3IuYWRkUGFyYWxsZWxDb25zdHJhaW50 VGFzayh0YXNrKTsKICAgICAgICAgICAgIH07Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGFk ZCh2bS5leGVjdXRhYmxlVG9Db2RlQmxvY2tFZGdlc1dpdGhDb25zdHJhaW50cyk7Ci0gICAgICAg ICAgICBpZiAodm0ubV93ZWFrTWFwU3BhY2UpCisKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJvb3RTY29wZSh2aXNpdG9yLCBSb290TWFya1Jl YXNvbjo6RXhlY3V0YWJsZVRvQ29kZUJsb2NrRWRnZXMpOworICAgICAgICAgICAgICAgIGFkZCh2 bS5leGVjdXRhYmxlVG9Db2RlQmxvY2tFZGdlc1dpdGhDb25zdHJhaW50cyk7CisgICAgICAgICAg ICB9CisgICAgICAgICAgICBpZiAodm0ubV93ZWFrTWFwU3BhY2UpIHsKKyAgICAgICAgICAgICAg ICBTZXRSb290TWFya1JlYXNvblNjb3BlIHJvb3RTY29wZSh2aXNpdG9yLCBSb290TWFya1JlYXNv bjo6V2Vha01hcFNwYWNlKTsKICAgICAgICAgICAgICAgICBhZGQoKnZtLm1fd2Vha01hcFNwYWNl KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSkpLAogICAgICAgICBDb25zdHJhaW50Vm9sYXRp bGl0eTo6R3JleWVkQnlNYXJraW5nLAogICAgICAgICBDb25zdHJhaW50UGFyYWxsZWxpc206OlBh cmFsbGVsKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBTbmFwc2hvdEJ1 aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBT bmFwc2hvdEJ1aWxkZXIuY3BwCShyZXZpc2lvbiAyNzQ0OTQpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9IZWFwU25hcHNob3RCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzks OCArMzksNiBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAotc3RhdGljIGNvbnN0IGNoYXIqIHJvb3RU eXBlVG9TdHJpbmcoUm9vdE1hcmtSZWFzb24pOwotCiBOb2RlSWRlbnRpZmllciBIZWFwU25hcHNo b3RCdWlsZGVyOjpuZXh0QXZhaWxhYmxlT2JqZWN0SWRlbnRpZmllciA9IDE7CiBOb2RlSWRlbnRp ZmllciBIZWFwU25hcHNob3RCdWlsZGVyOjpnZXROZXh0T2JqZWN0SWRlbnRpZmllcigpIHsgcmV0 dXJuIG5leHRBdmFpbGFibGVPYmplY3RJZGVudGlmaWVyKys7IH0KIHZvaWQgSGVhcFNuYXBzaG90 QnVpbGRlcjo6cmVzZXROZXh0QXZhaWxhYmxlT2JqZWN0SWRlbnRpZmllcigpIHsgSGVhcFNuYXBz aG90QnVpbGRlcjo6bmV4dEF2YWlsYWJsZU9iamVjdElkZW50aWZpZXIgPSAxOyB9CkBAIC0zMDUs NDIgKzMwMyw2IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBzbmFwc2hvdFR5cGVUb1N0cmluZygKICAg ICByZXR1cm4gIkluc3BlY3RvciI7CiB9CiAKLXN0YXRpYyBjb25zdCBjaGFyKiByb290VHlwZVRv U3RyaW5nKFJvb3RNYXJrUmVhc29uIHR5cGUpCi17Ci0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAg Y2FzZSBSb290TWFya1JlYXNvbjo6Tm9uZToKLSAgICAgICAgcmV0dXJuICJOb25lIjsKLSAgICBj YXNlIFJvb3RNYXJrUmVhc29uOjpDb25zZXJ2YXRpdmVTY2FuOgotICAgICAgICByZXR1cm4gIkNv bnNlcnZhdGl2ZSBzY2FuIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpTdHJvbmdSZWZlcmVu Y2VzOgotICAgICAgICByZXR1cm4gIlN0cm9uZyByZWZlcmVuY2VzIjsKLSAgICBjYXNlIFJvb3RN YXJrUmVhc29uOjpQcm90ZWN0ZWRWYWx1ZXM6Ci0gICAgICAgIHJldHVybiAiUHJvdGVjdGVkIHZh bHVlcyI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6TWFya0xpc3RTZXQ6Ci0gICAgICAgIHJl dHVybiAiTWFyayBsaXN0IHNldCI7Ci0gICAgY2FzZSBSb290TWFya1JlYXNvbjo6Vk1FeGNlcHRp b25zOgotICAgICAgICByZXR1cm4gIlZNIGV4Y2VwdGlvbnMiOwotICAgIGNhc2UgUm9vdE1hcmtS ZWFzb246OlN0cm9uZ0hhbmRsZXM6Ci0gICAgICAgIHJldHVybiAiU3Ryb25nIGhhbmRsZXMiOwot ICAgIGNhc2UgUm9vdE1hcmtSZWFzb246OkRlYnVnZ2VyOgotICAgICAgICByZXR1cm4gIkRlYnVn Z2VyIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpKSVRTdHViUm91dGluZXM6Ci0gICAgICAg IHJldHVybiAiSklUIHN0dWIgcm91dGluZXMiOwotICAgIGNhc2UgUm9vdE1hcmtSZWFzb246Oldl YWtTZXRzOgotICAgICAgICByZXR1cm4gIldlYWsgc2V0cyI7Ci0gICAgY2FzZSBSb290TWFya1Jl YXNvbjo6T3V0cHV0OgotICAgICAgICByZXR1cm4gIk91dHB1dCI7Ci0gICAgY2FzZSBSb290TWFy a1JlYXNvbjo6REZHV29ya0xpc3RzOgotICAgICAgICByZXR1cm4gIkRGRyB3b3JrIGxpc3RzIjsK LSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpDb2RlQmxvY2tzOgotICAgICAgICByZXR1cm4gIkNv ZGUgYmxvY2tzIjsKLSAgICBjYXNlIFJvb3RNYXJrUmVhc29uOjpET01HQ091dHB1dDoKLSAgICAg ICAgcmV0dXJuICJET00gR0Mgb3V0cHV0IjsKLSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7Ci0gICAgcmV0dXJuICJOb25lIjsKLX0KLQogU3RyaW5nIEhlYXBTbmFwc2hvdEJ1aWxkZXI6 Ompzb24oKQogewogICAgIHJldHVybiBqc29uKFtdIChjb25zdCBIZWFwU25hcHNob3ROb2RlJikg eyByZXR1cm4gdHJ1ZTsgfSk7CkBAIC02NTYsNyArNjE4LDcgQEAgU3RyaW5nIEhlYXBTbmFwc2hv dEJ1aWxkZXI6Ompzb24oRnVuY3RpbwogICAgICAgICAgICAganNvbi5hcHBlbmROdW1iZXIoc25h cHNob3ROb2RlLnZhbHVlKCkuaWRlbnRpZmllcik7CiAKICAgICAgICAgICAgIC8vIE1heWJlIHdl IHNob3VsZCBqdXN0IGFsd2F5cyBlbmNvZGUgdGhlIHJvb3QgbmFtZXMuCi0gICAgICAgICAgICBj b25zdCBjaGFyKiByb290TmFtZSA9IHJvb3RUeXBlVG9TdHJpbmcoaXQudmFsdWUubWFya1JlYXNv bik7CisgICAgICAgICAgICBjb25zdCBjaGFyKiByb290TmFtZSA9IHJvb3RNYXJrUmVhc29uRGVz Y3JpcHRpb24oaXQudmFsdWUubWFya1JlYXNvbik7CiAgICAgICAgICAgICBhdXRvIHJlc3VsdCA9 IGxhYmVsSW5kZXhlcy5hZGQocm9vdE5hbWUsIG5leHRMYWJlbEluZGV4KTsKICAgICAgICAgICAg IGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAgICAgICAgICAgICBuZXh0TGFiZWxJbmRleCsr OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUm9vdE1hcmtSZWFzb24uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29uLmNw cAkobm9uZXhpc3RlbnQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Sb290TWFya1Jl YXNvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw1NyBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQg QU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VT OyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNs dWRlICJSb290TWFya1JlYXNvbi5oIgorCisjaW5jbHVkZSA8d3RmL1ByaW50U3RyZWFtLmg+CisK K25hbWVzcGFjZSBKU0MgeworCitjb25zdCBjaGFyKiByb290TWFya1JlYXNvbkRlc2NyaXB0aW9u KFJvb3RNYXJrUmVhc29uIHJlYXNvbikKK3sKKyNkZWZpbmUgQ0FTRV9ST09UX01BUktfUkVBU09O KHJlYXNvbikgXAorICAgIGNhc2UgSlNDOjpSb290TWFya1JlYXNvbjo6cmVhc29uOiBcCisgICAg ICAgIHJldHVybiAjcmVhc29uOyBcCisKKyAgICBzd2l0Y2ggKHJlYXNvbikgeworICAgICAgICBG T1JfRUFDSF9ST09UX01BUktfUkVBU09OKENBU0VfUk9PVF9NQVJLX1JFQVNPTikKKyAgICB9Cisj dW5kZWYgQ0FTRV9ST09UX01BUktfUkVBU09OCisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICByZXR1cm4gIk5vbmUiOworfQorCit9IC8vIG5hbWVzcGFjZSBKU0MKKworbmFtZXNwYWNl IFdURiB7CisKK3ZvaWQgcHJpbnRJbnRlcm5hbChQcmludFN0cmVhbSYgb3V0LCBKU0M6OlJvb3RN YXJrUmVhc29uIHJlYXNvbikKK3sKKyAgICBvdXQucHJpbnQoSlNDOjpyb290TWFya1JlYXNvbkRl c2NyaXB0aW9uKHJlYXNvbikpOworfQorCit9IC8vIG5hbWVzcGFjZSBXVEYKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Jvb3RNYXJrUmVhc29uLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUm9vdE1hcmtSZWFzb24uaAkocmV2aXNpb24gMjc0NDk0 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUm9vdE1hcmtSZWFzb24uaAkod29ya2lu ZyBjb3B5KQpAQCAtMjUsMTkgKzI1LDQ0IEBACiAKICNwcmFnbWEgb25jZQogCituYW1lc3BhY2Ug SlNDIHsKKworI2RlZmluZSBGT1JfRUFDSF9ST09UX01BUktfUkVBU09OKHYpIFwKKyAgICB2KE5v bmUpIFwKKyAgICB2KENvbnNlcnZhdGl2ZVNjYW4pIFwKKyAgICB2KEV4ZWN1dGFibGVUb0NvZGVC bG9ja0VkZ2VzKSBcCisgICAgdihFeHRlcm5hbFJlbWVtYmVyZWRTZXQpIFwKKyAgICB2KFN0cm9u Z1JlZmVyZW5jZXMpIFwKKyAgICB2KFByb3RlY3RlZFZhbHVlcykgXAorICAgIHYoTWFya2VkSlNW YWx1ZVJlZkFycmF5KSBcCisgICAgdihNYXJrTGlzdFNldCkgXAorICAgIHYoVk1FeGNlcHRpb25z KSBcCisgICAgdihTdHJvbmdIYW5kbGVzKSBcCisgICAgdihEZWJ1Z2dlcikgXAorICAgIHYoSklU U3R1YlJvdXRpbmVzKSBcCisgICAgdihXZWFrTWFwU3BhY2UpIFwKKyAgICB2KFdlYWtTZXRzKSBc CisgICAgdihPdXRwdXQpIFwKKyAgICB2KERGR1dvcmtMaXN0cykgXAorICAgIHYoQ29kZUJsb2Nr cykgXAorICAgIHYoRE9NR0NPdXRwdXQpCisKKyNkZWZpbmUgREVDTEFSRV9ST09UX01BUktfUkVB U09OKHJlYXNvbikgcmVhc29uLAorCiBlbnVtIGNsYXNzIFJvb3RNYXJrUmVhc29uIDogdWludDhf dCB7Ci0gICAgTm9uZSwKLSAgICBDb25zZXJ2YXRpdmVTY2FuLAotICAgIFN0cm9uZ1JlZmVyZW5j ZXMsCi0gICAgUHJvdGVjdGVkVmFsdWVzLAotICAgIE1hcmtMaXN0U2V0LAotICAgIFZNRXhjZXB0 aW9ucywKLSAgICBTdHJvbmdIYW5kbGVzLAotICAgIERlYnVnZ2VyLAotICAgIEpJVFN0dWJSb3V0 aW5lcywKLSAgICBXZWFrU2V0cywKLSAgICBPdXRwdXQsCi0gICAgREZHV29ya0xpc3RzLAotICAg IENvZGVCbG9ja3MsCi0gICAgRE9NR0NPdXRwdXQsCisgICAgRk9SX0VBQ0hfUk9PVF9NQVJLX1JF QVNPTihERUNMQVJFX1JPT1RfTUFSS19SRUFTT04pCiB9OworCisjdW5kZWYgREVDTEFSRV9ST09U X01BUktfUkVBU09OCisKK2NvbnN0IGNoYXIqIHJvb3RNYXJrUmVhc29uRGVzY3JpcHRpb24oUm9v dE1hcmtSZWFzb24pOworCit9IC8vIG5hbWVzcGFjZSBKU0MKKworbmFtZXNwYWNlIFdURiB7CisK K2NsYXNzIFByaW50U3RyZWFtOworCit2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mLCBK U0M6OlJvb3RNYXJrUmVhc29uKTsKKworfSAvLyBuYW1lc3BhY2UgV1RGCg==