236259 2022-02-07 13:52:09 -0800 tracking done by HTMLSourceTracker is unused 2022-02-07 20:26:19 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 heycam heycam cdumez changseok esprehn+autocc ews-watchlist ggaren gyuyoung.kim webkit-bug-importer oldest_to_newest 1838342 0 heycam 2022-02-07 13:52:09 -0800 Since the removal of the XSS Auditor in bug 230499, the tracking of attribute locations that HTMLSourceTracker does is unused. We can remove it. 1838343 1 451149 heycam 2022-02-07 13:55:28 -0800 Created attachment 451149 Patch 1838344 2 451149 ggaren 2022-02-07 13:58:16 -0800 Comment on attachment 451149 Patch r=me 1838500 3 ews-feeder 2022-02-07 20:25:51 -0800 Committed r289356 (246944@main): <https://commits.webkit.org/246944@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451149. 1838502 4 webkit-bug-importer 2022-02-07 20:26:19 -0800 <rdar://problem/88609360> 451149 2022-02-07 13:55:28 -0800 2022-02-07 20:25:53 -0800 Patch bug-236259-20220208085527.patch text/plain 21400 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcyNmQyZjc5ZTk1OTdh N2ExYTZhOWExZDQ2OTVhNWUzYTViOTI1Mi4uMGMwOTUwZjNiNGFhZTIyODQ0ZjU5ZDA4MDQ5ZjVj YzRhYTAzMGQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTA3ICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEhUTUxT b3VyY2VUcmFja2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzYyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTaW5jZSB0aGUgcmVtb3ZhbCBvZiB0aGUgWFNTIEF1ZGl0b3IgaW4gYnVnIDIzMDQ5OSwg dGhlIHRyYWNraW5nIG9mCisgICAgICAgIGF0dHJpYnV0ZSBsb2NhdGlvbnMgdGhhdCBIVE1MU291 cmNlVHJhY2tlciBkb2VzIGlzIHVudXNlZC4KKworICAgICAgICAqIFNvdXJjZXMudHh0OgorICAg ICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBodG1s L3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERv Y3VtZW50UGFyc2VyOjpwdW1wVG9rZW5pemVyTG9vcCk6CisgICAgICAgICogaHRtbC9wYXJzZXIv SFRNTERvY3VtZW50UGFyc2VyLmg6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRy YWNrZXIuY3BwOiBSZW1vdmVkLgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxTb3VyY2VUcmFj a2VyLmg6IFJlbW92ZWQuCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRva2VuLmg6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmJlZ2luQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUb2tlbjo6ZW5kQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tl bjo6c2V0QXR0cmlidXRlQmFzZU9mZnNldCk6IERlbGV0ZWQuCisgICAgICAgICogaHRtbC9wYXJz ZXIvSFRNTFRva2VuaXplci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9rZW5pemVyOjpw cm9jZXNzVG9rZW4pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUb2tlbml6ZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OnNldFRva2VuQXR0cmlidXRlQmFzZU9mZnNl dCk6IERlbGV0ZWQuCisKIDIwMjItMDItMDMgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAK ICAgICAgICAgTG9jYWxTdG9yYWdlIHZhbHVlcyBzaG91bGQgYmUgOC1iaXQgc3RyaW5ncyBpbiBt ZW1vcnkgaWYgcG9zc2libGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0 IGIvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKaW5kZXggYjNmNWUwYjc4NDE3MGJmMDI0ZDc4 ODM5ZmZjOTA4MTcyNGE3NGNhNi4uMjc4YjVkOWRlYmZiYTgxOGJkMjQxNzdmN2VjYmZlMTAxNmVh Y2EzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKKysrIGIvU291cmNl L1dlYkNvcmUvU291cmNlcy50eHQKQEAgLTE0MjAsNyArMTQyMCw2IEBAIGh0bWwvcGFyc2VyL0hU TUxQYXJzZXJTY2hlZHVsZXIuY3BwCiBodG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3Bw CiBodG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuY3BwCiBodG1sL3BhcnNlci9IVE1M U2NyaXB0UnVubmVyLmNwcAotaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuY3BwCiBodG1s L3BhcnNlci9IVE1MU3Jjc2V0UGFyc2VyLmNwcAogaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5j cHAKIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBjNWY0NGVmMDRhNzA1OGIx OWIyNGM4NWQxMWQ2M2Q5NDU0ZTNkYjBjLi40NDhlNGE3ZjU4ODI0MTdhMjA4ZjExMTM2ZTkxMDQ2 Y2M4ZWJhYzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCkBAIC0zMTgxLDcgKzMxODEsNiBAQAogCQk5NzdCMzg3NTEyMjg4M0U5MDBC ODFGRjggLyogSFRNTFNjcmlwdFJ1bm5lci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gOTc3QjM4NUMxMjI4ODNFOTAwQjgxRkY4IC8qIEhUTUxTY3JpcHRS dW5uZXIuaCAqLzsgfTsKIAkJOTc3QjM4NzYxMjI4ODNFOTAwQjgxRkY4IC8qIEhUTUxTY3JpcHRS dW5uZXJIb3N0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA5NzdCMzg1RDEyMjg4M0U5MDBCODFGRjggLyogSFRNTFNjcmlwdFJ1bm5lckhvc3QuaCAqLzsg fTsKIAkJOTc3QjM4NzgxMjI4ODNFOTAwQjgxRkY4IC8qIEhUTUxUb2tlbml6ZXIuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3N0IzODVGMTIyODgzRTkw MEI4MUZGOCAvKiBIVE1MVG9rZW5pemVyLmggKi87IH07Ci0JCTk3N0UyRENFMTJGMEUyODMwMEMx MzM3OSAvKiBIVE1MU291cmNlVHJhY2tlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gOTc3RTJEQ0MxMkYwRTI4MzAwQzEzMzc5IC8qIEhUTUxTb3VyY2VU cmFja2VyLmggKi87IH07CiAJCTk3OEFENjc1MTQxMzBBOEQwMEM3Q0FFMyAvKiBIVE1MU3BhbkVs ZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3 OEFENjcyMTQxMzBBOEQwMEM3Q0FFMyAvKiBIVE1MU3BhbkVsZW1lbnQuaCAqLzsgfTsKIAkJOTc5 RjQzRDQxMDc1RTQ0QTAwMDBGODNCIC8qIE5hdmlnYXRpb25TY2hlZHVsZXIuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3OUY0M0QyMTA3NUU0NEEwMDAw RjgzQiAvKiBOYXZpZ2F0aW9uU2NoZWR1bGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMg PSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJOTdBQTNDQTUxNDUyMzdDQzAwM0UxREE2IC8qIEV2ZW50 VGFyZ2V0SGVhZGVycy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gOTdBQTNDQTMxNDUyMzdDQzAwM0UxREE2IC8qIEV2ZW50VGFyZ2V0SGVhZGVycy5oICov OyB9OwpAQCAtMTMxODQsOCArMTMxODMsNiBAQAogCQk5NzdCMzg1RDEyMjg4M0U5MDBCODFGRjgg LyogSFRNTFNjcmlwdFJ1bm5lckhvc3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gSFRNTFNjcmlwdFJ1bm5lckhvc3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ OTc3QjM4NUUxMjI4ODNFOTAwQjgxRkY4IC8qIEhUTUxUb2tlbml6ZXIuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSFRNTFRva2VuaXplci5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTk3N0IzODVGMTIyODgzRTkwMEI4MUZGOCAvKiBIVE1MVG9rZW5p emVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhUTUxUb2tlbml6ZXIuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJOTc3RTJEQ0IxMkYwRTI4MzAwQzEzMzc5IC8q IEhUTUxTb3VyY2VUcmFja2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IEhUTUxTb3VyY2VUcmFja2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJ OTc3RTJEQ0MxMkYwRTI4MzAwQzEzMzc5IC8qIEhUTUxTb3VyY2VUcmFja2VyLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhUTUxTb3VyY2VUcmFja2VyLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTk3OEFENjcxMTQxMzBBOEQwMEM3Q0FFMyAvKiBIVE1MU3BhbkVs ZW1lbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSFRNTFNwYW5F bGVtZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTc4QUQ2NzIxNDEzMEE4 RDAwQzdDQUUzIC8qIEhUTUxTcGFuRWxlbWVudC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBIVE1MU3BhbkVsZW1lbnQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ OTc4QUQ2NzMxNDEzMEE4RDAwQzdDQUUzIC8qIEhUTUxTcGFuRWxlbWVudC5pZGwgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0OyBwYXRoID0gSFRNTFNwYW5FbGVtZW50LmlkbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTI2Mzc4LDggKzI2Mzc1LDYgQEAKIAkJCQk5NzdCMzg1QjEyMjg4M0U5MDBCODFG RjggLyogSFRNTFNjcmlwdFJ1bm5lci5jcHAgKi8sCiAJCQkJOTc3QjM4NUMxMjI4ODNFOTAwQjgx RkY4IC8qIEhUTUxTY3JpcHRSdW5uZXIuaCAqLywKIAkJCQk5NzdCMzg1RDEyMjg4M0U5MDBCODFG RjggLyogSFRNTFNjcmlwdFJ1bm5lckhvc3QuaCAqLywKLQkJCQk5NzdFMkRDQjEyRjBFMjgzMDBD MTMzNzkgLyogSFRNTFNvdXJjZVRyYWNrZXIuY3BwICovLAotCQkJCTk3N0UyRENDMTJGMEUyODMw MEMxMzM3OSAvKiBIVE1MU291cmNlVHJhY2tlci5oICovLAogCQkJCTUzNkQ1QTFFMTkzRTE4RDAw MENFNENBQiAvKiBIVE1MU3Jjc2V0UGFyc2VyLmNwcCAqLywKIAkJCQk1MzZENUExRjE5M0UxOEU5 MDBDRTRDQUIgLyogSFRNTFNyY3NldFBhcnNlci5oICovLAogCQkJCTk3QzFGNTUyMTIyODU1Q0Iw MEVERTYxNSAvKiBIVE1MU3RhY2tJdGVtLmggKi8sCkBAIC0zNDgwMSw3ICszNDc5Niw2IEBACiAJ CQkJQTgxMzY5RDgwOTczNzRGNjAwRDc0NDYzIC8qIEhUTUxTZWxlY3RFbGVtZW50LmggaW4gSGVh ZGVycyAqLywKIAkJCQk5QjY5RDNCNTFCOThGRkU5MDBFMzUxMkIgLyogSFRNTFNsb3RFbGVtZW50 LmggaW4gSGVhZGVycyAqLywKIAkJCQlFNDQ2MTNBODBDRDYzMzEwMDBGQURBNzUgLyogSFRNTFNv dXJjZUVsZW1lbnQuaCBpbiBIZWFkZXJzICovLAotCQkJCTk3N0UyRENFMTJGMEUyODMwMEMxMzM3 OSAvKiBIVE1MU291cmNlVHJhY2tlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTc4QUQ2NzUxNDEz MEE4RDAwQzdDQUUzIC8qIEhUTUxTcGFuRWxlbWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTM2 RDVBMjAxOTNFMThFOTAwQ0U0Q0FCIC8qIEhUTUxTcmNzZXRQYXJzZXIuaCBpbiBIZWFkZXJzICov LAogCQkJCUE4NzFEQzIzMEExNTIwNTcwMEIxMkE2OCAvKiBIVE1MU3R5bGVFbGVtZW50LmggaW4g SGVhZGVycyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1l bnRQYXJzZXIuY3BwCmluZGV4IGJlZjQyYTIxZWUyYmYyOTViOWZlMDI1MWM0YmQ4OWZhOGViNGQ3 MzcuLjQ1MTU5YWUwY2M3MTVkYmEzMjRiNzk3MDhjNTBlYmVmMjg3OTg3YzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMjc0 LDE2ICsyNzQsMTAgQEAgYm9vbCBIVE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tlbml6ZXJMb29w KFN5bmNocm9ub3VzTW9kZSBtb2RlLCBib29sIHBhcnNpbmdGcmEKICAgICAgICAgaWYgKFVOTElL RUxZKG1vZGUgPT0gQWxsb3dZaWVsZCAmJiBtX3BhcnNlclNjaGVkdWxlci0+c2hvdWxkWWllbGRC ZWZvcmVUb2tlbihzZXNzaW9uKSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgICAg ICBpZiAoIXBhcnNpbmdGcmFnbWVudCkKLSAgICAgICAgICAgIG1fc291cmNlVHJhY2tlci5zdGFy dFRva2VuKG1faW5wdXQuY3VycmVudCgpLCBtX3Rva2VuaXplcik7Ci0KICAgICAgICAgYXV0byB0 b2tlbiA9IG1fdG9rZW5pemVyLm5leHRUb2tlbihtX2lucHV0LmN1cnJlbnQoKSk7CiAgICAgICAg IGlmICghdG9rZW4pCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgaWYgKCFw YXJzaW5nRnJhZ21lbnQpCi0gICAgICAgICAgICBtX3NvdXJjZVRyYWNrZXIuZW5kVG9rZW4obV9p bnB1dC5jdXJyZW50KCksIG1fdG9rZW5pemVyKTsKLQogICAgICAgICBjb25zdHJ1Y3RUcmVlRnJv bUhUTUxUb2tlbih0b2tlbik7CiAgICAgfSB3aGlsZSAoIWlzU3RvcHBlZCgpKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmggYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaAppbmRleCA4YjRm YTg0NTJhZDc1NmUyNzUzZjc1ZDFlYWI2MzIxN2NmYzhjYTVhLi43ZGU2OWY1NTI2MWEwNjRjYzFk OWFhY2EyNjNlNjcxYzc4NDI3ZTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9IVE1MRG9jdW1lbnRQYXJzZXIuaApAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAiSFRN TElucHV0U3RyZWFtLmgiCiAjaW5jbHVkZSAiSFRNTFNjcmlwdFJ1bm5lckhvc3QuaCIKLSNpbmNs dWRlICJIVE1MU291cmNlVHJhY2tlci5oIgogI2luY2x1ZGUgIkhUTUxUb2tlbml6ZXIuaCIKICNp bmNsdWRlICJQZW5kaW5nU2NyaXB0Q2xpZW50LmgiCiAjaW5jbHVkZSAiU2NyaXB0YWJsZURvY3Vt ZW50UGFyc2VyLmgiCkBAIC0xMzUsNyArMTM0LDYgQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8SFRNTFByZWxvYWRTY2FubmVyPiBtX3ByZWxvYWRTY2FubmVyOwogICAgIHN0ZDo6dW5p cXVlX3B0cjxIVE1MUHJlbG9hZFNjYW5uZXI+IG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXI7CiAg ICAgc3RkOjp1bmlxdWVfcHRyPEhUTUxQYXJzZXJTY2hlZHVsZXI+IG1fcGFyc2VyU2NoZWR1bGVy OwotICAgIEhUTUxTb3VyY2VUcmFja2VyIG1fc291cmNlVHJhY2tlcjsKICAgICBUZXh0UG9zaXRp b24gbV90ZXh0UG9zaXRpb247CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SFRNTFJlc291cmNlUHJl bG9hZGVyPiBtX3ByZWxvYWRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxTb3VyY2VUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxTb3VyY2VUcmFja2VyLmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMjJkYmE5 MGE1ODIwZTZkN2ExZjczZjU2OWJhZDczMDI2MDEzODAyMy4uMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M U291cmNlVHJhY2tlci5jcHAKKysrIC9kZXYvbnVsbApAQCAtMSw5NSArMCwwIEBACi0vKgotICog Q29weXJpZ2h0IChDKSAyMDEwIEFkYW0gQmFydGguIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQotICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKLSAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKLSAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAotICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAotICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgi Ci0jaW5jbHVkZSAiSFRNTFNvdXJjZVRyYWNrZXIuaCIKLQotI2luY2x1ZGUgIkhUTUxUb2tlbml6 ZXIuaCIKLSNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+Ci0KLW5hbWVzcGFjZSBX ZWJDb3JlIHsKLQotdm9pZCBIVE1MU291cmNlVHJhY2tlcjo6c3RhcnRUb2tlbihTZWdtZW50ZWRT dHJpbmcmIGN1cnJlbnRJbnB1dCwgSFRNTFRva2VuaXplciYgdG9rZW5pemVyKQotewotICAgIGlm ICghbV9zdGFydGVkKSB7Ci0gICAgICAgIGlmICh0b2tlbml6ZXIubnVtYmVyT2ZCdWZmZXJlZENo YXJhY3RlcnMoKSkKLSAgICAgICAgICAgIG1fcHJldmlvdXNTb3VyY2UgPSB0b2tlbml6ZXIuYnVm ZmVyZWRDaGFyYWN0ZXJzKCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fcHJldmlvdXNT b3VyY2UuY2xlYXIoKTsKLSAgICAgICAgbV9zdGFydGVkID0gdHJ1ZTsKLSAgICB9IGVsc2UKLSAg ICAgICAgbV9wcmV2aW91c1NvdXJjZS5hcHBlbmQobV9jdXJyZW50U291cmNlKTsKLQotICAgIG1f Y3VycmVudFNvdXJjZSA9IGN1cnJlbnRJbnB1dDsKLSAgICBtX3Rva2VuU3RhcnQgPSBtX2N1cnJl bnRTb3VyY2UubnVtYmVyT2ZDaGFyYWN0ZXJzQ29uc3VtZWQoKSAtIG1fcHJldmlvdXNTb3VyY2Uu bGVuZ3RoKCk7Ci0gICAgdG9rZW5pemVyLnNldFRva2VuQXR0cmlidXRlQmFzZU9mZnNldChtX3Rv a2VuU3RhcnQpOwotfQotCi12b2lkIEhUTUxTb3VyY2VUcmFja2VyOjplbmRUb2tlbihTZWdtZW50 ZWRTdHJpbmcmIGN1cnJlbnRJbnB1dCwgSFRNTFRva2VuaXplciYgdG9rZW5pemVyKQotewotICAg IEFTU0VSVChtX3N0YXJ0ZWQpOwotICAgIG1fc3RhcnRlZCA9IGZhbHNlOwotCi0gICAgbV90b2tl bkVuZCA9IGN1cnJlbnRJbnB1dC5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpIC0gdG9rZW5p emVyLm51bWJlck9mQnVmZmVyZWRDaGFyYWN0ZXJzKCk7Ci0gICAgbV9jYWNoZWRTb3VyY2VGb3JU b2tlbiA9IFN0cmluZygpOwotfQotCi1TdHJpbmcgSFRNTFNvdXJjZVRyYWNrZXI6OnNvdXJjZShj b25zdCBIVE1MVG9rZW4mIHRva2VuKQotewotICAgIEFTU0VSVCghbV9zdGFydGVkKTsKLQotICAg IGlmICh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpFbmRPZkZpbGUpCi0gICAgICAgIHJldHVy biBTdHJpbmcoKTsgLy8gSGlkZXMgdGhlIG51bGwgY2hhcmFjdGVyIHdlIHVzZSB0byBtYXJrIHRo ZSBlbmQgb2YgZmlsZS4KLQotICAgIGlmICghbV9jYWNoZWRTb3VyY2VGb3JUb2tlbi5pc0VtcHR5 KCkpCi0gICAgICAgIHJldHVybiBtX2NhY2hlZFNvdXJjZUZvclRva2VuOwotCi0gICAgdW5zaWdu ZWQgbGVuZ3RoID0gbV90b2tlbkVuZCAtIG1fdG9rZW5TdGFydDsKLQotICAgIFN0cmluZ0J1aWxk ZXIgc291cmNlOwotICAgIHNvdXJjZS5yZXNlcnZlQ2FwYWNpdHkobGVuZ3RoKTsKLQotICAgIHVu c2lnbmVkIGkgPSAwOwotICAgIGZvciAoIDsgaSA8IGxlbmd0aCAmJiAhbV9wcmV2aW91c1NvdXJj ZS5pc0VtcHR5KCk7ICsraSkgewotICAgICAgICBzb3VyY2UuYXBwZW5kKG1fcHJldmlvdXNTb3Vy Y2UuY3VycmVudENoYXJhY3RlcigpKTsKLSAgICAgICAgbV9wcmV2aW91c1NvdXJjZS5hZHZhbmNl KCk7Ci0gICAgfQotICAgIGZvciAoIDsgaSA8IGxlbmd0aDsgKytpKSB7Ci0gICAgICAgIEFTU0VS VCghbV9jdXJyZW50U291cmNlLmlzRW1wdHkoKSk7Ci0gICAgICAgIHNvdXJjZS5hcHBlbmQobV9j dXJyZW50U291cmNlLmN1cnJlbnRDaGFyYWN0ZXIoKSk7Ci0gICAgICAgIG1fY3VycmVudFNvdXJj ZS5hZHZhbmNlKCk7Ci0gICAgfQotCi0gICAgbV9jYWNoZWRTb3VyY2VGb3JUb2tlbiA9IHNvdXJj ZS50b1N0cmluZygpOwotICAgIHJldHVybiBtX2NhY2hlZFNvdXJjZUZvclRva2VuOwotfQotCi1T dHJpbmcgSFRNTFNvdXJjZVRyYWNrZXI6OnNvdXJjZShjb25zdCBIVE1MVG9rZW4mIHRva2VuLCB1 bnNpZ25lZCBhdHRyaWJ1dGVTdGFydCwgdW5zaWduZWQgYXR0cmlidXRlRW5kKQotewotICAgIHJl dHVybiBzb3VyY2UodG9rZW4pLnN1YnN0cmluZyhhdHRyaWJ1dGVTdGFydCwgYXR0cmlidXRlRW5k IC0gYXR0cmlidXRlU3RhcnQpOwotfQotCi19CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MU291cmNlVHJhY2tlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFNvdXJjZVRyYWNrZXIuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggM2Ey NGNmMGZjNjEwN2RlMmY1ODExNGI2NzZiNjMyYmU1NjE3OTFhZi4uMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MU291cmNlVHJhY2tlci5oCisrKyAvZGV2L251bGwKQEAgLTEsNTkgKzAsMCBAQAotLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMCBBZGFtIEJhcnRoLiBBbGwgUmlnaHRzIFJlc2VydmVkLgotICog Q29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0g KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1 Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlv bi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJ UycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCi0gKiBDT05UUklCVVRP UlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICogUFJPRklUUzsgT1IgQlVTSU5FU1Mg SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQotICogT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0g KiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI3ByYWdtYSBvbmNlCi0KLSNp bmNsdWRlICJTZWdtZW50ZWRTdHJpbmcuaCIKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1jbGFz cyBIVE1MVG9rZW47Ci1jbGFzcyBIVE1MVG9rZW5pemVyOwotCi1jbGFzcyBIVE1MU291cmNlVHJh Y2tlciB7Ci0gICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSFRNTFNvdXJjZVRyYWNrZXIpOwotcHVi bGljOgotICAgIEhUTUxTb3VyY2VUcmFja2VyKCkgPSBkZWZhdWx0OwotCi0gICAgdm9pZCBzdGFy dFRva2VuKFNlZ21lbnRlZFN0cmluZyYsIEhUTUxUb2tlbml6ZXImKTsKLSAgICB2b2lkIGVuZFRv a2VuKFNlZ21lbnRlZFN0cmluZyYsIEhUTUxUb2tlbml6ZXImKTsKLQotICAgIFN0cmluZyBzb3Vy Y2UoY29uc3QgSFRNTFRva2VuJik7Ci0gICAgU3RyaW5nIHNvdXJjZShjb25zdCBIVE1MVG9rZW4m LCB1bnNpZ25lZCBhdHRyaWJ1dGVTdGFydCwgdW5zaWduZWQgYXR0cmlidXRlRW5kKTsKLQotcHJp dmF0ZToKLSAgICBib29sIG1fc3RhcnRlZCB7IGZhbHNlIH07Ci0KLSAgICB1bnNpZ25lZCBtX3Rv a2VuU3RhcnQ7Ci0gICAgdW5zaWduZWQgbV90b2tlbkVuZDsKLQotICAgIFNlZ21lbnRlZFN0cmlu ZyBtX3ByZXZpb3VzU291cmNlOwotICAgIFNlZ21lbnRlZFN0cmluZyBtX2N1cnJlbnRTb3VyY2U7 Ci0KLSAgICBTdHJpbmcgbV9jYWNoZWRTb3VyY2VGb3JUb2tlbjsKLX07Ci0KLX0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxU b2tlbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuLmgKaW5kZXggNzhh NjQ5MTM2M2UxMjNmMzkwZjM5NWMyZTFiZjdjYTg1NzJhNGZhYi4uN2JlMWM4OTk1Njg5MDlmNmMz YmUxYzY2YWI4Nzc3NmUwMzRjZDFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRva2VuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRv a2VuLmgKQEAgLTU2LDEwICs1Niw2IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgQXR0cmlidXRlIHsK ICAgICAgICAgVmVjdG9yPFVDaGFyLCAzMj4gbmFtZTsKICAgICAgICAgVmVjdG9yPFVDaGFyLCA2 ND4gdmFsdWU7Ci0KLSAgICAgICAgLy8gVXNlZCBieSBIVE1MU291cmNlVHJhY2tlci4KLSAgICAg ICAgdW5zaWduZWQgc3RhcnRPZmZzZXQ7Ci0gICAgICAgIHVuc2lnbmVkIGVuZE9mZnNldDsKICAg ICB9OwogCiAgICAgdHlwZWRlZiBWZWN0b3I8QXR0cmlidXRlLCAxMD4gQXR0cmlidXRlTGlzdDsK QEAgLTEwNiwxOSArMTAyLDE0IEBAIHB1YmxpYzoKICAgICB2b2lkIGJlZ2luRW5kVGFnKExDaGFy KTsKICAgICB2b2lkIGJlZ2luRW5kVGFnKGNvbnN0IFZlY3RvcjxMQ2hhciwgMzI+Jik7CiAKLSAg ICB2b2lkIGJlZ2luQXR0cmlidXRlKHVuc2lnbmVkIG9mZnNldCk7CisgICAgdm9pZCBiZWdpbkF0 dHJpYnV0ZSgpOwogICAgIHZvaWQgYXBwZW5kVG9BdHRyaWJ1dGVOYW1lKFVDaGFyKTsKICAgICB2 b2lkIGFwcGVuZFRvQXR0cmlidXRlVmFsdWUoVUNoYXIpOwotICAgIHZvaWQgZW5kQXR0cmlidXRl KHVuc2lnbmVkIG9mZnNldCk7CisgICAgdm9pZCBhcHBlbmRUb0F0dHJpYnV0ZVZhbHVlKHVuc2ln bmVkIGluZGV4LCBTdHJpbmdWaWV3IHZhbHVlKTsKKyAgICB2b2lkIGVuZEF0dHJpYnV0ZSgpOwog CiAgICAgdm9pZCBzZXRTZWxmQ2xvc2luZygpOwogCi0gICAgLy8gVXNlZCBieSBIVE1MVG9rZW5p emVyIG9uIGJlaGFsZiBvZiBIVE1MU291cmNlVHJhY2tlci4KLSAgICB2b2lkIHNldEF0dHJpYnV0 ZUJhc2VPZmZzZXQodW5zaWduZWQgYXR0cmlidXRlQmFzZU9mZnNldCkgeyBtX2F0dHJpYnV0ZUJh c2VPZmZzZXQgPSBhdHRyaWJ1dGVCYXNlT2Zmc2V0OyB9Ci0KLXB1YmxpYzoKLSAgICB2b2lkIGFw cGVuZFRvQXR0cmlidXRlVmFsdWUodW5zaWduZWQgaW5kZXgsIFN0cmluZ1ZpZXcgdmFsdWUpOwot CiAgICAgLy8gQ2hhcmFjdGVyLgogCiAgICAgLy8gU3RhcnRpbmcgYSBjaGFyYWN0ZXIgdG9rZW4g d29ya3Mgc2xpZ2h0bHkgZGlmZmVyZW50bHkgdGhhbiBzdGFydGluZwpAQCAtMTUzLDggKzE0NCw2 IEBAIHByaXZhdGU6CiAKICAgICAvLyBGb3IgRE9DVFlQRQogICAgIHN0ZDo6dW5pcXVlX3B0cjxE b2N0eXBlRGF0YT4gbV9kb2N0eXBlRGF0YTsKLQotICAgIHVuc2lnbmVkIG1fYXR0cmlidXRlQmFz ZU9mZnNldCB7IDAgfTsgLy8gQ2hhbmdlcyBhY3Jvc3MgZG9jdW1lbnQud3JpdGUoKSBib3VuZGFy aWVzLgogfTsKIAogY29uc3QgSFRNTFRva2VuOjpBdHRyaWJ1dGUqIGZpbmRBdHRyaWJ1dGUoY29u c3QgVmVjdG9yPEhUTUxUb2tlbjo6QXR0cmlidXRlPiYsIFN0cmluZ1ZpZXcgbmFtZSk7CkBAIC0z MDksMjIgKzI5OCwxNiBAQCBpbmxpbmUgdm9pZCBIVE1MVG9rZW46OmJlZ2luRW5kVGFnKGNvbnN0 IFZlY3RvcjxMQ2hhciwgMzI+JiBjaGFyYWN0ZXJzKQogICAgIG1fZGF0YS5hcHBlbmRWZWN0b3Io Y2hhcmFjdGVycyk7CiB9CiAKLWlubGluZSB2b2lkIEhUTUxUb2tlbjo6YmVnaW5BdHRyaWJ1dGUo dW5zaWduZWQgb2Zmc2V0KQoraW5saW5lIHZvaWQgSFRNTFRva2VuOjpiZWdpbkF0dHJpYnV0ZSgp CiB7CiAgICAgQVNTRVJUKG1fdHlwZSA9PSBTdGFydFRhZyB8fCBtX3R5cGUgPT0gRW5kVGFnKTsK LSAgICBBU1NFUlQob2Zmc2V0KTsKLQogICAgIG1fYXR0cmlidXRlcy5ncm93KG1fYXR0cmlidXRl cy5zaXplKCkgKyAxKTsKICAgICBtX2N1cnJlbnRBdHRyaWJ1dGUgPSAmbV9hdHRyaWJ1dGVzLmxh c3QoKTsKLQotICAgIG1fY3VycmVudEF0dHJpYnV0ZS0+c3RhcnRPZmZzZXQgPSBvZmZzZXQgLSBt X2F0dHJpYnV0ZUJhc2VPZmZzZXQ7CiB9CiAKLWlubGluZSB2b2lkIEhUTUxUb2tlbjo6ZW5kQXR0 cmlidXRlKHVuc2lnbmVkIG9mZnNldCkKK2lubGluZSB2b2lkIEhUTUxUb2tlbjo6ZW5kQXR0cmli dXRlKCkKIHsKLSAgICBBU1NFUlQob2Zmc2V0KTsKICAgICBBU1NFUlQobV9jdXJyZW50QXR0cmli dXRlKTsKLSAgICBtX2N1cnJlbnRBdHRyaWJ1dGUtPmVuZE9mZnNldCA9IG9mZnNldCAtIG1fYXR0 cmlidXRlQmFzZU9mZnNldDsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIG1fY3VycmVudEF0dHJp YnV0ZSA9IG51bGxwdHI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxUb2tlbml6ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TFRva2VuaXplci5jcHAKaW5kZXggZDNlYmE1MTQ0NWYzMmI1ZjM2MGExMjg2NGFlNzAxNGVlNjk3 ZWEwOC4uNTkzOGM1YzBmNTkwZjA4Zjg4NWZkODM3NzRjOGNhOWRlNjUyNWFiZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAKQEAgLTcyMSw3ICs3MjEs NyBAQCBib29sIEhUTUxUb2tlbml6ZXI6OnByb2Nlc3NUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNv dXJjZSkKICAgICAgICAgfQogICAgICAgICBpZiAoY2hhcmFjdGVyID09ICciJyB8fCBjaGFyYWN0 ZXIgPT0gJ1wnJyB8fCBjaGFyYWN0ZXIgPT0gJzwnIHx8IGNoYXJhY3RlciA9PSAnPScpCiAgICAg ICAgICAgICBwYXJzZUVycm9yKCk7Ci0gICAgICAgIG1fdG9rZW4uYmVnaW5BdHRyaWJ1dGUoc291 cmNlLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCkpOworICAgICAgICBtX3Rva2VuLmJlZ2lu QXR0cmlidXRlKCk7CiAgICAgICAgIG1fdG9rZW4uYXBwZW5kVG9BdHRyaWJ1dGVOYW1lKHRvQVND SUlMb3dlcihjaGFyYWN0ZXIpKTsKICAgICAgICAgQURWQU5DRV9QQVNUX05PTl9ORVdMSU5FX1RP KEF0dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAgRU5EX1NUQVRFKCkKQEAgLTc2NCw3ICs3NjQsNyBA QCBib29sIEhUTUxUb2tlbml6ZXI6OnByb2Nlc3NUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJj ZSkKICAgICAgICAgfQogICAgICAgICBpZiAoY2hhcmFjdGVyID09ICciJyB8fCBjaGFyYWN0ZXIg PT0gJ1wnJyB8fCBjaGFyYWN0ZXIgPT0gJzwnKQogICAgICAgICAgICAgcGFyc2VFcnJvcigpOwot ICAgICAgICBtX3Rva2VuLmJlZ2luQXR0cmlidXRlKHNvdXJjZS5udW1iZXJPZkNoYXJhY3RlcnND b25zdW1lZCgpKTsKKyAgICAgICAgbV90b2tlbi5iZWdpbkF0dHJpYnV0ZSgpOwogICAgICAgICBt X3Rva2VuLmFwcGVuZFRvQXR0cmlidXRlTmFtZSh0b0FTQ0lJTG93ZXIoY2hhcmFjdGVyKSk7CiAg ICAgICAgIEFEVkFOQ0VfUEFTVF9OT05fTkVXTElORV9UTyhBdHRyaWJ1dGVOYW1lU3RhdGUpOwog ICAgIEVORF9TVEFURSgpCkBAIC03OTQsNyArNzk0LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpw cm9jZXNzVG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAKICAgICBCRUdJTl9TVEFURShB dHRyaWJ1dGVWYWx1ZURvdWJsZVF1b3RlZFN0YXRlKQogICAgICAgICBpZiAoY2hhcmFjdGVyID09 ICciJykgewotICAgICAgICAgICAgbV90b2tlbi5lbmRBdHRyaWJ1dGUoc291cmNlLm51bWJlck9m Q2hhcmFjdGVyc0NvbnN1bWVkKCkpOworICAgICAgICAgICAgbV90b2tlbi5lbmRBdHRyaWJ1dGUo KTsKICAgICAgICAgICAgIEFEVkFOQ0VfUEFTVF9OT05fTkVXTElORV9UTyhBZnRlckF0dHJpYnV0 ZVZhbHVlUXVvdGVkU3RhdGUpOwogICAgICAgICB9CiAgICAgICAgIGlmIChjaGFyYWN0ZXIgPT0g JyYnKSB7CkBAIC04MDMsNyArODAzLDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpwcm9jZXNzVG9r ZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAgICAgICAgIH0KICAgICAgICAgaWYgKGNoYXJh Y3RlciA9PSBrRW5kT2ZGaWxlTWFya2VyKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKCk7Ci0g ICAgICAgICAgICBtX3Rva2VuLmVuZEF0dHJpYnV0ZShzb3VyY2UubnVtYmVyT2ZDaGFyYWN0ZXJz Q29uc3VtZWQoKSk7CisgICAgICAgICAgICBtX3Rva2VuLmVuZEF0dHJpYnV0ZSgpOwogICAgICAg ICAgICAgUkVDT05TVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgbV90b2tl bi5hcHBlbmRUb0F0dHJpYnV0ZVZhbHVlKGNoYXJhY3Rlcik7CkBAIC04MTIsNyArODEyLDcgQEAg Ym9vbCBIVE1MVG9rZW5pemVyOjpwcm9jZXNzVG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2Up CiAKICAgICBCRUdJTl9TVEFURShBdHRyaWJ1dGVWYWx1ZVNpbmdsZVF1b3RlZFN0YXRlKQogICAg ICAgICBpZiAoY2hhcmFjdGVyID09ICdcJycpIHsKLSAgICAgICAgICAgIG1fdG9rZW4uZW5kQXR0 cmlidXRlKHNvdXJjZS5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpKTsKKyAgICAgICAgICAg IG1fdG9rZW4uZW5kQXR0cmlidXRlKCk7CiAgICAgICAgICAgICBBRFZBTkNFX1BBU1RfTk9OX05F V0xJTkVfVE8oQWZ0ZXJBdHRyaWJ1dGVWYWx1ZVF1b3RlZFN0YXRlKTsKICAgICAgICAgfQogICAg ICAgICBpZiAoY2hhcmFjdGVyID09ICcmJykgewpAQCAtODIxLDcgKzgyMSw3IEBAIGJvb2wgSFRN TFRva2VuaXplcjo6cHJvY2Vzc1Rva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlKQogICAgICAg ICB9CiAgICAgICAgIGlmIChjaGFyYWN0ZXIgPT0ga0VuZE9mRmlsZU1hcmtlcikgewogICAgICAg ICAgICAgcGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbV90b2tlbi5lbmRBdHRyaWJ1dGUoc291 cmNlLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCkpOworICAgICAgICAgICAgbV90b2tlbi5l bmRBdHRyaWJ1dGUoKTsKICAgICAgICAgICAgIFJFQ09OU1VNRV9JTihEYXRhU3RhdGUpOwogICAg ICAgICB9CiAgICAgICAgIG1fdG9rZW4uYXBwZW5kVG9BdHRyaWJ1dGVWYWx1ZShjaGFyYWN0ZXIp OwpAQCAtODMwLDcgKzgzMCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6cHJvY2Vzc1Rva2VuKFNl Z21lbnRlZFN0cmluZyYgc291cmNlKQogCiAgICAgQkVHSU5fU1RBVEUoQXR0cmlidXRlVmFsdWVV bnF1b3RlZFN0YXRlKQogICAgICAgICBpZiAoaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNoYXJhY3Rl cikpIHsKLSAgICAgICAgICAgIG1fdG9rZW4uZW5kQXR0cmlidXRlKHNvdXJjZS5udW1iZXJPZkNo YXJhY3RlcnNDb25zdW1lZCgpKTsKKyAgICAgICAgICAgIG1fdG9rZW4uZW5kQXR0cmlidXRlKCk7 CiAgICAgICAgICAgICBBRFZBTkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAg ICAgIH0KICAgICAgICAgaWYgKGNoYXJhY3RlciA9PSAnJicpIHsKQEAgLTgzOCwxMiArODM4LDEy IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6cHJvY2Vzc1Rva2VuKFNlZ21lbnRlZFN0cmluZyYgc291 cmNlKQogICAgICAgICAgICAgQURWQU5DRV9QQVNUX05PTl9ORVdMSU5FX1RPKENoYXJhY3RlclJl ZmVyZW5jZUluQXR0cmlidXRlVmFsdWVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGNo YXJhY3RlciA9PSAnPicpIHsKLSAgICAgICAgICAgIG1fdG9rZW4uZW5kQXR0cmlidXRlKHNvdXJj ZS5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpKTsKKyAgICAgICAgICAgIG1fdG9rZW4uZW5k QXR0cmlidXRlKCk7CiAgICAgICAgICAgICByZXR1cm4gZW1pdEFuZFJlc3VtZUluRGF0YVN0YXRl KHNvdXJjZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGNoYXJhY3RlciA9PSBrRW5kT2ZGaWxl TWFya2VyKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICBtX3Rva2Vu LmVuZEF0dHJpYnV0ZShzb3VyY2UubnVtYmVyT2ZDaGFyYWN0ZXJzQ29uc3VtZWQoKSk7CisgICAg ICAgICAgICBtX3Rva2VuLmVuZEF0dHJpYnV0ZSgpOwogICAgICAgICAgICAgUkVDT05TVU1FX0lO KERhdGFTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGNoYXJhY3RlciA9PSAnIicgfHwg Y2hhcmFjdGVyID09ICdcJycgfHwgY2hhcmFjdGVyID09ICc8JyB8fCBjaGFyYWN0ZXIgPT0gJz0n IHx8IGNoYXJhY3RlciA9PSAnYCcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MVG9rZW5pemVyLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9r ZW5pemVyLmgKaW5kZXggNWQ4MTkxZjQ0ODk1NDQyMTU4Y2Y3ZTI1NGEzYTFjNTY4N2E4MDQ0Yy4u NTAwN2Y0MzgwYmRiNGIzOTgxNDFkN2YxYTQ5MGM4NGYxMWEyNTgyNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbml6ZXIuaApAQCAtNDIsOSArNDIsNiBAQCBwdWJsaWM6 CiAgICAgY2xhc3MgVG9rZW5QdHI7CiAgICAgVG9rZW5QdHIgbmV4dFRva2VuKFNlZ21lbnRlZFN0 cmluZyYpOwogCi0gICAgLy8gVXNlZCBieSBIVE1MU291cmNlVHJhY2tlci4KLSAgICB2b2lkIHNl dFRva2VuQXR0cmlidXRlQmFzZU9mZnNldCh1bnNpZ25lZCk7Ci0KICAgICAvLyBSZXR1cm5zIGEg Y29weSBvZiBhbnkgY2hhcmFjdGVycyBidWZmZXJlZCBpbnRlcm5hbGx5IGJ5IHRoZSB0b2tlbml6 ZXIuCiAgICAgLy8gVGhlIHRva2VuaXplciBidWZmZXJzIGNoYXJhY3RlcnMgd2hlbiBzZWFyY2hp bmcgZm9yIHRoZSA8L3NjcmlwdD4gdG9rZW4gdGhhdCB0ZXJtaW5hdGVzIGEgc2NyaXB0IGVsZW1l bnQuCiAgICAgU3RyaW5nIGJ1ZmZlcmVkQ2hhcmFjdGVycygpIGNvbnN0OwpAQCAtMjg0LDExICsy ODEsNiBAQCBpbmxpbmUgSFRNTFRva2VuaXplcjo6VG9rZW5QdHIgSFRNTFRva2VuaXplcjo6bmV4 dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlKQogICAgIHJldHVybiBUb2tlblB0cihwcm9j ZXNzVG9rZW4oc291cmNlKSA/ICZtX3Rva2VuIDogbnVsbHB0cik7CiB9CiAKLWlubGluZSB2b2lk IEhUTUxUb2tlbml6ZXI6OnNldFRva2VuQXR0cmlidXRlQmFzZU9mZnNldCh1bnNpZ25lZCBvZmZz ZXQpCi17Ci0gICAgbV90b2tlbi5zZXRBdHRyaWJ1dGVCYXNlT2Zmc2V0KG9mZnNldCk7Ci19Ci0K IGlubGluZSBzaXplX3QgSFRNTFRva2VuaXplcjo6bnVtYmVyT2ZCdWZmZXJlZENoYXJhY3RlcnMo KSBjb25zdAogewogICAgIC8vIE5vdGljZSB0aGF0IHdlIGFkZCAyIHRvIHRoZSBsZW5ndGggb2Yg dGhlIG1fdGVtcG9yYXJ5QnVmZmVyIHRvCg==