148599 2015-08-28 15:58:00 -0700 iOS WebKit2 find-in-page doesn't support multi-line results, is often blank 2015-08-31 11:41:07 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin enrica mitz sam simon.fraser oldest_to_newest 1121873 0 thorton 2015-08-28 15:58:00 -0700 iOS WebKit2 find-in-page doesn't support multi-line results, is often blank 1121875 1 260190 thorton 2015-08-28 15:59:03 -0700 Created attachment 260190 Patch 1122234 2 thorton 2015-08-31 11:41:07 -0700 http://trac.webkit.org/changeset/189178 260190 2015-08-28 15:59:03 -0700 2015-08-31 11:34:20 -0700 Patch bug-148599-20150828155850.patch text/plain 18920 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxMmIyM2RkZDQwZjA1 ODc1NzhhYjhkNTllMjkzNDllOGQ0OTU5OC4uZTAzMDU5ZmUwMGRmZmU4NWQ4Mjk4YTg1ZjQwZjJj N2NhYmEzMjZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTI4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUyBXZWJLaXQy IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHN1cHBvcnQgbXVsdGktbGluZSByZXN1bHRzLCBpcyBvZnRl biBibGFuaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ4NTk5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzkxNDAzMT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OmdldENsaXBwZWRWaXNp YmxlVGV4dFJlY3RhbmdsZXMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246Omdl dFRleHRSZWN0YW5nbGVzKToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6Cisg ICAgICAgICogcGFnZS9UZXh0SW5kaWNhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRp YWxpemVJbmRpY2F0b3IpOgorICAgICAgICAqIHBhZ2UvVGV4dEluZGljYXRvci5oOgorICAgICAg ICBNYWtlIGl0IHBvc3NpYmxlIHRvIGNyZWF0ZSBhIFRleHRJbmRpY2F0b3IgdGhhdCBpc24ndCBj bGlwcGVkIHRvIHRoZSB2aXNpYmxlIHJlY3QsCisgICAgICAgIGJlY2F1c2UgaU9TIGZpbmQtaW4t cGFnZSBUZXh0SW5kaWNhdG9ycyBwZXJzaXN0IHdoaWxlIHNjcm9sbGluZyB0aGUgcGFnZSwKKyAg ICAgICAgYW5kIGFyZSBhbHJlYWR5IGNvbnN0cmFpbmVkIHRvIHRoZSBkb2N1bWVudCByZWN0IGFu eXdheS4KKwogMjAxNS0wOC0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNv bT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBNZWRpYVNlc3Npb24ucmVsZWFzZVNlc3Npb24o KSByZW5hbWVkIHRvIGRlYWN0aXZhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGQ3MmQzMTRjNTIwYTZhOWI3 ZTliNTA5ZjU1OGEwZDFjMTEwMjUyY2EuLjA5OTE0NzM0NDY0ZjEzMjU1ZDU5Yzc2OTY1ZTY5MGUx YzMxZWIzZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxNS0wOC0yOCAgVGltIEhv cnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBpT1MgV2ViS2l0MiBm aW5kLWluLXBhZ2UgZG9lc24ndCBzdXBwb3J0IG11bHRpLWxpbmUgcmVzdWx0cywgaXMgb2Z0ZW4g YmxhbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 ODU5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc5MTQwMzE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmlu ZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZmluZFN0 cmluZyk6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpkaWRGaW5kU3RyaW5nKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaDoKKyAgICAgICAg QWRkIGRpZEZpbmRTdHJpbmcoKSBmb3IgRmluZENvbnRyb2xsZXJJT1MuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV2Vi S2l0OjpGaW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUzo6ZHJhd1JlY3QpOgorICAgICAgICAo V2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6dXBkYXRlRmluZEluZGljYXRvcik6CisgICAgICAgIChX ZWJLaXQ6OnNldENvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlRW5hYmxlZEluQWxsRnJhbWVzKToK KyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OndpbGxGaW5kU3RyaW5nKToKKyAgICAg ICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OmRpZEZpbmRTdHJpbmcpOgorICAgICAgICAoV2Vi S2l0OjpGaW5kQ29udHJvbGxlcjo6ZGlkRmFpbFRvRmluZFN0cmluZyk6CisgICAgICAgIChXZWJL aXQ6OkZpbmRDb250cm9sbGVyOjpkaWRIaWRlRmluZEluZGljYXRvcik6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUy5oOgorICAg ICAgICAoV2ViS2l0OjpGaW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUzo6RmluZEluZGljYXRv ck92ZXJsYXlDbGllbnRJT1MpOgorICAgICAgICBBZG9wdCBUZXh0SW5kaWNhdG9yIGFuZCBzaHJp bmstd3JhcHBpbmcuCisKKyAgICAgICAgV2UnbGwgcmUtY3JlYXRlIHRoZSBpbmRpY2F0b3IgaWYg dGhlIGRldmljZS9wYWdlIHNjYWxlIGZhY3RvciBjaGFuZ2U7CisgICAgICAgIHRoaXMgaXMgdGhl IG9ubHkgY2FzZSBpbiB3aGljaCBhIFRleHRJbmRpY2F0b3Igc3RpY2tzIGFyb3VuZCB3aGVuCisg ICAgICAgIHBhZ2Ugc2NhbGUgY2hhbmdlcyAtLSB3ZSBzaG91bGQgY29tZSB1cCB3aXRoIGEgYmV0 dGVyIG1vZGVsIQorCiAyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbmF2aWdhdGlvbiBnZXN0dXJlIGNhbGxiYWNrcyB0 byBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxl Y3Rpb24uY3BwCmluZGV4IGU4ZDM2OGVkNDdjMzdjY2FmYWVmMmNmM2E4ZjgyNmE5OTRlMzU5Njku LjI0ODVmNjhjNGI1ZmNjYjQzY2ZhN2FmODhhZDExNmVlMmVmYTBhMWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC0yMDgxLDIxICsyMDgxLDI5IEBAIHZv aWQgRnJhbWVTZWxlY3Rpb246OmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVjdG9y PEZsb2F0UmVjdD4mIHJlY3RhbmdsCiAgICAgaWYgKCFyb290KQogICAgICAgICByZXR1cm47CiAK KyAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHM7CisgICAgZ2V0VGV4dFJlY3RhbmdsZXMo dGV4dFJlY3RzLCB0ZXh0UmVjdEhlaWdodCk7CisKKyAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRl bnRSZWN0ID0gbV9mcmFtZS0+dmlldygpLT52aXNpYmxlQ29udGVudFJlY3QoU2Nyb2xsYWJsZUFy ZWE6OkxlZ2FjeUlPU0RvY3VtZW50VmlzaWJsZVJlY3QpOworCisgICAgZm9yIChjb25zdCBhdXRv JiByZWN0IDogdGV4dFJlY3RzKSB7CisgICAgICAgIEZsb2F0UmVjdCBpbnRlcnNlY3Rpb25SZWN0 ID0gaW50ZXJzZWN0aW9uKHJlY3QsIHZpc2libGVDb250ZW50UmVjdCk7CisgICAgICAgIGlmICgh aW50ZXJzZWN0aW9uUmVjdC5pc0VtcHR5KCkpCisgICAgICAgICAgICByZWN0YW5nbGVzLmFwcGVu ZChpbnRlcnNlY3Rpb25SZWN0KTsKKyAgICB9Cit9CisKK3ZvaWQgRnJhbWVTZWxlY3Rpb246Omdl dFRleHRSZWN0YW5nbGVzKFZlY3RvcjxGbG9hdFJlY3Q+JiByZWN0YW5nbGVzLCBUZXh0UmVjdGFu Z2xlSGVpZ2h0IHRleHRSZWN0SGVpZ2h0KSBjb25zdAorewogICAgIFJlZlB0cjxSYW5nZT4gcmFu Z2UgPSB0b05vcm1hbGl6ZWRSYW5nZSgpOwogICAgIGlmICghcmFuZ2UpCiAgICAgICAgIHJldHVy bjsKIAotICAgIEZsb2F0UmVjdCB2aXNpYmxlQ29udGVudFJlY3QgPSBtX2ZyYW1lLT52aWV3KCkt PnZpc2libGVDb250ZW50UmVjdChTY3JvbGxhYmxlQXJlYTo6TGVnYWN5SU9TRG9jdW1lbnRWaXNp YmxlUmVjdCk7Ci0KICAgICBWZWN0b3I8RmxvYXRRdWFkPiBxdWFkczsKICAgICByYW5nZS0+YWJz b2x1dGVUZXh0UXVhZHMocXVhZHMsIHRleHRSZWN0SGVpZ2h0ID09IFRleHRSZWN0YW5nbGVIZWln aHQ6OlNlbGVjdGlvbkhlaWdodCk7CiAKLSAgICBzaXplX3Qgc2l6ZSA9IHF1YWRzLnNpemUoKTsK LSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkgewotICAgICAgICBGbG9hdFJl Y3QgaW50ZXJzZWN0aW9uUmVjdCA9IGludGVyc2VjdGlvbihxdWFkc1tpXS5lbmNsb3NpbmdCb3Vu ZGluZ0JveCgpLCB2aXNpYmxlQ29udGVudFJlY3QpOwotICAgICAgICBpZiAoIWludGVyc2VjdGlv blJlY3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmVjdGFuZ2xlcy5hcHBlbmQoaW50ZXJzZWN0 aW9uUmVjdCk7Ci0gICAgfQorICAgIGZvciAoY29uc3QgYXV0byYgcXVhZCA6IHF1YWRzKQorICAg ICAgICByZWN0YW5nbGVzLmFwcGVuZChxdWFkLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpOwogfQog CiAvLyBTY2FucyBsb2dpY2FsbHkgZm9yd2FyZCBmcm9tICJzdGFydCIsIGluY2x1ZGluZyBhbnkg Y2hpbGQgZnJhbWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNl bGVjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCmluZGV4 IGRmNzc3YzlhYjI2MjYxYTQ4YTEyY2Y3OWEwZWRhNzU5YjE0NWY0MDMuLjc3MjhmOGI0N2UyM2Yz NjJhZGU3ZDk4N2JjZTgzODdhOGM3NTZiM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRnJhbWVTZWxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmgKQEAgLTI2Miw2ICsyNjIsNyBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNz IFRleHRSZWN0YW5nbGVIZWlnaHQgeyBUZXh0SGVpZ2h0LCBTZWxlY3Rpb25IZWlnaHQgfTsKICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIGdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVj dG9yPEZsb2F0UmVjdD4mLCBUZXh0UmVjdGFuZ2xlSGVpZ2h0ID0gVGV4dFJlY3RhbmdsZUhlaWdo dDo6U2VsZWN0aW9uSGVpZ2h0KSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGdldFRl eHRSZWN0YW5nbGVzKFZlY3RvcjxGbG9hdFJlY3Q+JiwgVGV4dFJlY3RhbmdsZUhlaWdodCA9IFRl eHRSZWN0YW5nbGVIZWlnaHQ6OlNlbGVjdGlvbkhlaWdodCkgY29uc3Q7CiAKICAgICBXRUJDT1JF X0VYUE9SVCBIVE1MRm9ybUVsZW1lbnQqIGN1cnJlbnRGb3JtKCkgY29uc3Q7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCmluZGV4IDEzZWEzNGQ1MTc0OGY5ZDRlMzMyOTZmNTAy YTUzNjEyYWMyNjg0ZGUuLjBjZDVjM2VlOWVkYjg4YWEyZDUyNmVhMmE3OWY1ZTEyMGZhNTVlZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNwcApAQCAtMTg5LDE5ICsxODksMjcg QEAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZUluZGljYXRvcihUZXh0SW5kaWNhdG9yRGF0YSYgZGF0 YSwgRnJhbWUmIGZyYW1lLCBjb25zdCBSYW4KIAogICAgIGlmICgoZGF0YS5vcHRpb25zICYgVGV4 dEluZGljYXRvck9wdGlvblVzZUJvdW5kaW5nUmVjdEFuZFBhaW50QWxsQ29udGVudEZvckNvbXBs ZXhSYW5nZXMpICYmIGhhc05vbklubGluZU9yUmVwbGFjZWRFbGVtZW50cyhyYW5nZSkpCiAgICAg ICAgIGRhdGEub3B0aW9ucyB8PSBUZXh0SW5kaWNhdG9yT3B0aW9uUGFpbnRBbGxDb250ZW50Owot ICAgIGVsc2UKLSAgICAgICAgZnJhbWUuc2VsZWN0aW9uKCkuZ2V0Q2xpcHBlZFZpc2libGVUZXh0 UmVjdGFuZ2xlcyh0ZXh0UmVjdHMsIHRleHRSZWN0SGVpZ2h0KTsKKyAgICBlbHNlIHsKKyAgICAg ICAgaWYgKGRhdGEub3B0aW9ucyAmIFRleHRJbmRpY2F0b3JPcHRpb25Eb05vdENsaXBUb1Zpc2li bGVSZWN0KQorICAgICAgICAgICAgZnJhbWUuc2VsZWN0aW9uKCkuZ2V0VGV4dFJlY3RhbmdsZXMo dGV4dFJlY3RzLCB0ZXh0UmVjdEhlaWdodCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZy YW1lLnNlbGVjdGlvbigpLmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXModGV4dFJlY3Rz LCB0ZXh0UmVjdEhlaWdodCk7CisgICAgfQogCiAgICAgaWYgKHRleHRSZWN0cy5pc0VtcHR5KCkp IHsKICAgICAgICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IGZyYW1lLmNvbnRlbnRSZW5kZXJl cigpOwogICAgICAgICBpZiAoIXJlbmRlclZpZXcpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgICAgIC8vIENsaXAgdG8gdGhlIHZpc2libGUgcmVjdCwganVzdCBsaWtlIGdldENsaXBw ZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMgZG9lcy4KLSAgICAgICAgLy8gRklYTUU6IFdlIHJlYWxs eSB3YW50IHRvIGNsaXAgdG8gdGhlIHVub2JzY3VyZWQgcmVjdCBpbiBib3RoIGNhc2VzLCBJIHRo aW5rLgotICAgICAgICAvLyAodGhpcyBzZWVtcyB0byB3b3JrIG9uIE1hYywgYnV0IG1heWJlIG5v dCBpT1M/KQotICAgICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0ID0gZnJhbWUudmll dygpLT52aXNpYmxlQ29udGVudFJlY3QoU2Nyb2xsYWJsZUFyZWE6OkxlZ2FjeUlPU0RvY3VtZW50 VmlzaWJsZVJlY3QpOwogICAgICAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0ID0gcmFuZ2UuYWJz b2x1dGVCb3VuZGluZ1JlY3QoKTsKLSAgICAgICAgdGV4dFJlY3RzLmFwcGVuZChpbnRlcnNlY3Rp b24odmlzaWJsZUNvbnRlbnRSZWN0LCBib3VuZGluZ1JlY3QpKTsKKyAgICAgICAgaWYgKGRhdGEu b3B0aW9ucyAmIFRleHRJbmRpY2F0b3JPcHRpb25Eb05vdENsaXBUb1Zpc2libGVSZWN0KQorICAg ICAgICAgICAgdGV4dFJlY3RzLmFwcGVuZChib3VuZGluZ1JlY3QpOworICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgIC8vIENsaXAgdG8gdGhlIHZpc2libGUgcmVjdCwganVzdCBsaWtlIGdldENs aXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMgZG9lcy4KKyAgICAgICAgICAgIC8vIEZJWE1FOiBX ZSByZWFsbHkgd2FudCB0byBjbGlwIHRvIHRoZSB1bm9ic2N1cmVkIHJlY3QgaW4gYm90aCBjYXNl cywgSSB0aGluay4KKyAgICAgICAgICAgIC8vICh0aGlzIHNlZW1zIHRvIHdvcmsgb24gTWFjLCBi dXQgbWF5YmUgbm90IGlPUz8pCisgICAgICAgICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRS ZWN0ID0gZnJhbWUudmlldygpLT52aXNpYmxlQ29udGVudFJlY3QoU2Nyb2xsYWJsZUFyZWE6Okxl Z2FjeUlPU0RvY3VtZW50VmlzaWJsZVJlY3QpOworICAgICAgICAgICAgdGV4dFJlY3RzLmFwcGVu ZChpbnRlcnNlY3Rpb24odmlzaWJsZUNvbnRlbnRSZWN0LCBib3VuZGluZ1JlY3QpKTsKKyAgICAg ICAgfQogICAgIH0KIAogICAgIEZsb2F0UmVjdCB0ZXh0Qm91bmRpbmdSZWN0SW5Sb290Vmlld0Nv b3JkaW5hdGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9y LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaAppbmRleCA5YzY0MmZmNjk3 MTZiYjRkMWIwODYzODQzNGJhNDkzMjJlMzQ2N2NiLi5jNmMzNDA0NDNjYmFlZjQ5OGJjNDljZTQy Zjg5ZmQ2OWMwMjg2ZGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRp Y2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaApAQCAtODQs NiArODQsMTAgQEAgZW51bSBUZXh0SW5kaWNhdG9yT3B0aW9uIDogdWludDhfdCB7CiAgICAgLy8g QnkgZGVmYXVsdCwgVGV4dEluZGljYXRvciByZW1vdmVzIGFueSBtYXJnaW4gaWYgdGhlIGdpdmVu IFJhbmdlIG1hdGNoZXMgdGhlCiAgICAgLy8gc2VsZWN0aW9uIFJhbmdlLiBJZiB0aGlzIG9wdGlv biBpcyBzZXQsIG1haW50YWluIHRoZSBtYXJnaW4gaW4gYW55IGNhc2UuCiAgICAgVGV4dEluZGlj YXRvck9wdGlvbkluY2x1ZGVNYXJnaW5JZlJhbmdlTWF0Y2hlc1NlbGVjdGlvbiA9IDEgPDwgNiwK KworICAgIC8vIEJ5IGRlZmF1bHQsIFRleHRJbmRpY2F0b3IgY2xpcHMgdGhlIGluZGljYXRlZCBy ZWN0cyB0byB0aGUgdmlzaWJsZSBjb250ZW50IHJlY3QuCisgICAgLy8gSWYgdGhpcyBvcHRpb24g aXMgc2V0LCBkbyBub3QgY2xpcCB0aGUgaW5kaWNhdGVkIHJlY3RzLgorICAgIFRleHRJbmRpY2F0 b3JPcHRpb25Eb05vdENsaXBUb1Zpc2libGVSZWN0ID0gMSA8PCA3LAogfTsKIHR5cGVkZWYgdWlu dDhfdCBUZXh0SW5kaWNhdG9yT3B0aW9uczsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKaW5kZXggZDEzNjNhODBmZWY1ZDE2 NTNiYTUwOTg1YjFiOGE2MGZkNzlkMDVlMy4uOWQ2ZmZhNDA1MzM3OWRkMjZiZTFhZjI0ZmVkNmIz MzJmNTMxNzU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0ZpbmRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRmluZENvbnRyb2xsZXIuY3BwCkBAIC0yMzQsMTEgKzIzNCwxNSBAQCB2b2lkIEZpbmRDb250 cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBGaW5kT3B0aW9ucyBvcHRp b25zLCB1bnNpZwogICAgIGVsc2UKICAgICAgICAgZm91bmQgPSBtX3dlYlBhZ2UtPmNvcmVQYWdl KCktPmZpbmRTdHJpbmcoc3RyaW5nLCBjb3JlT3B0aW9ucyk7CiAKLSAgICBpZiAoZm91bmQgJiYg IWZvdW5kU3RyaW5nU3RhcnRzQWZ0ZXJTZWxlY3Rpb24pIHsKLSAgICAgICAgaWYgKG9wdGlvbnMg JiBGaW5kT3B0aW9uc0JhY2t3YXJkcykKLSAgICAgICAgICAgIG1fZm91bmRTdHJpbmdNYXRjaElu ZGV4LS07Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fZm91bmRTdHJpbmdNYXRjaEluZGV4 Kys7CisgICAgaWYgKGZvdW5kKSB7CisgICAgICAgIGRpZEZpbmRTdHJpbmcoKTsKKworICAgICAg ICBpZiAoIWZvdW5kU3RyaW5nU3RhcnRzQWZ0ZXJTZWxlY3Rpb24pIHsKKyAgICAgICAgICAgIGlm IChvcHRpb25zICYgRmluZE9wdGlvbnNCYWNrd2FyZHMpCisgICAgICAgICAgICAgICAgbV9mb3Vu ZFN0cmluZ01hdGNoSW5kZXgtLTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBt X2ZvdW5kU3RyaW5nTWF0Y2hJbmRleCsrOworICAgICAgICB9CiAgICAgfQogCiAgICAgUmVmUHRy PFdlYlBhZ2U+IHByb3RlY3RlZFdlYlBhZ2UgPSBtX3dlYlBhZ2U7CkBAIC0zNDgsNiArMzUyLDEw IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OndpbGxGaW5kU3RyaW5nKCkKIHsKIH0KIAordm9pZCBG aW5kQ29udHJvbGxlcjo6ZGlkRmluZFN0cmluZygpCit7Cit9CisKIHZvaWQgRmluZENvbnRyb2xs ZXI6OmRpZEZhaWxUb0ZpbmRTdHJpbmcoKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaAppbmRleCAyMWI0Yzc3N2E0ZjQ4ZGY3 NGEwN2ExYjYzMzVmOTRjMzFhYTg5OWI2Li5iYmQzMjRlYzg2ZmQwZjY0NzY3NjNkYjU2MWE2ZGY1 NjA3YTY5ZDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuaApAQCAtODQsNiArODQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBk YXRlRmluZFVJQWZ0ZXJQYWdlU2Nyb2xsKGJvb2wgZm91bmQsIGNvbnN0IFN0cmluZyYsIEZpbmRP cHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KTsKIAogICAgIHZvaWQgd2lsbEZpbmRTdHJp bmcoKTsKKyAgICB2b2lkIGRpZEZpbmRTdHJpbmcoKTsKICAgICB2b2lkIGRpZEZhaWxUb0ZpbmRT dHJpbmcoKTsKICAgICB2b2lkIGRpZEhpZGVGaW5kSW5kaWNhdG9yKCk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRDb250cm9sbGVy SU9TLm1tCmluZGV4IGY1ZTg2ZGYwMWZkYTE5ZDJlNmU0MWUxZjQwOGI4ZGMzMTViOGEyOGMuLmNl NTIyMjE3MjFmNDQyYjY2NzBkMmVhMGU4ZWIwNTlhMzUyYjU5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklP Uy5tbQpAQCAtMzMsMTEgKzMzLDE1IEBACiAjaW1wb3J0ICJXZWJDb3JlQXJndW1lbnRDb2RlcnMu aCIKICNpbXBvcnQgIldlYlBhZ2UuaCIKICNpbXBvcnQgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgi CisjaW1wb3J0IDxXZWJDb3JlL0ZvY3VzQ29udHJvbGxlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9G cmFtZVZpZXcuaD4KICNpbXBvcnQgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAjaW1wb3J0 IDxXZWJDb3JlL01haW5GcmFtZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CiAjaW1wb3J0 IDxXZWJDb3JlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5oPgorI2ltcG9ydCA8V2ViQ29yZS9QYXRo VXRpbGl0aWVzLmg+CisjaW1wb3J0IDxXZWJDb3JlL1NldHRpbmdzLmg+CisjaW1wb3J0IDxXZWJD b3JlL1RleHRJbmRpY2F0b3IuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTQ1 LDYgKzQ5LDggQEAgY29uc3QgaW50IGNvcm5lclJhZGl1cyA9IDM7CiBjb25zdCBpbnQgdG90YWxI b3Jpem9udGFsTWFyZ2luID0gMjsKIGNvbnN0IGludCB0b3RhbFZlcnRpY2FsTWFyZ2luID0gMTsK IAorY29uc3QgVGV4dEluZGljYXRvck9wdGlvbnMgZmluZFRleHRJbmRpY2F0b3JPcHRpb25zID0g VGV4dEluZGljYXRvck9wdGlvblRpZ2h0bHlGaXRDb250ZW50IHwgVGV4dEluZGljYXRvck9wdGlv bkluY2x1ZGVNYXJnaW5JZlJhbmdlTWF0Y2hlc1NlbGVjdGlvbiB8IFRleHRJbmRpY2F0b3JPcHRp b25Eb05vdENsaXBUb1Zpc2libGVSZWN0OworCiBzdGF0aWMgQ29sb3IgaGlnaGxpZ2h0Q29sb3Io KQogewogICAgIHJldHVybiBDb2xvcigyNTUsIDIyOCwgNTYsIDI1NSk7CkBAIC01NCw0NCArNjAs NDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZvaWQgRmluZEluZGljYXRvck92ZXJsYXlDbGll bnRJT1M6OmRyYXdSZWN0KFBhZ2VPdmVybGF5JiBvdmVybGF5LCBHcmFwaGljc0NvbnRleHQmIGNv bnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKIHsKLSAgICAvLyBGSVhNRTogU3VwcG9y dCBtdWx0aXBsZSB0ZXh0IHJlY3RzLgotCi0gICAgSW50UmVjdCBvdmVybGF5RnJhbWUgPSBvdmVy bGF5LmZyYW1lKCk7Ci0gICAgSW50UmVjdCBvdmVybGF5Qm91bmRzID0gb3ZlcmxheS5ib3VuZHMo KTsKLQotICAgIHsKLSAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVy KGNvbnRleHQpOwotICAgICAgICBQYXRoIGNsaXBQYXRoOwotICAgICAgICBjbGlwUGF0aC5hZGRS b3VuZGVkUmVjdChvdmVybGF5Qm91bmRzLCBGbG9hdFNpemUoY29ybmVyUmFkaXVzLCBjb3JuZXJS YWRpdXMpKTsKLSAgICAgICAgY29udGV4dC5jbGlwKGNsaXBQYXRoKTsKLSAgICAgICAgY29udGV4 dC5zZXRGaWxsQ29sb3IoaGlnaGxpZ2h0Q29sb3IoKSwgQ29sb3JTcGFjZURldmljZVJHQik7Ci0g ICAgICAgIGNvbnRleHQuZmlsbFJlY3Qob3ZlcmxheUJvdW5kcyk7Ci0gICAgfQorICAgIGZsb2F0 IHNjYWxlRmFjdG9yID0gbV9mcmFtZS5wYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCk7CiAKLSAg ICB7Ci0gICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0 KTsKLSAgICAgICAgY29udGV4dC50cmFuc2xhdGUoLW92ZXJsYXlGcmFtZS54KCksIC1vdmVybGF5 RnJhbWUueSgpKTsKLSAgICAgICAgbV9mcmFtZS52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFp bnRCZWhhdmlvclNlbGVjdGlvbk9ubHkgfCBQYWludEJlaGF2aW9yRm9yY2VCbGFja1RleHQgfCBQ YWludEJlaGF2aW9yRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKTsKLSAgICAgICAgbV9mcmFtZS52 aWV3KCktPnBhaW50Q29udGVudHMoJmNvbnRleHQsIG92ZXJsYXlGcmFtZSk7Ci0gICAgICAgIG1f ZnJhbWUudmlldygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JOb3JtYWwpOwotICAg IH0KKyAgICBpZiAobV9mcmFtZS5zZXR0aW5ncygpLmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCisg ICAgICAgIHNjYWxlRmFjdG9yICo9IG1fZnJhbWUucGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKTsK KworICAgIC8vIElmIHRoZSBwYWdlIHNjYWxlIGNoYW5nZWQsIHdlIG5lZWQgdG8gcGFpbnQgYSBu ZXcgVGV4dEluZGljYXRvci4KKyAgICBpZiAobV90ZXh0SW5kaWNhdG9yLT5jb250ZW50SW1hZ2VT Y2FsZUZhY3RvcigpICE9IHNjYWxlRmFjdG9yKQorICAgICAgICBtX3RleHRJbmRpY2F0b3IgPSBU ZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZShtX2ZyYW1lLCBmaW5kVGV4 dEluZGljYXRvck9wdGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpO b25lLCBGbG9hdFNpemUodG90YWxIb3Jpem9udGFsTWFyZ2luLCB0b3RhbFZlcnRpY2FsTWFyZ2lu KSk7CisKKyAgICBpZiAoIW1fdGV4dEluZGljYXRvcikKKyAgICAgICAgcmV0dXJuOworCisgICAg SW1hZ2UqIGluZGljYXRvckltYWdlID0gbV90ZXh0SW5kaWNhdG9yLT5jb250ZW50SW1hZ2UoKTsK KyAgICBpZiAoIWluZGljYXRvckltYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBWZWN0b3I8 RmxvYXRSZWN0PiB0ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzID0gbV90ZXh0SW5k aWNhdG9yLT50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKCk7CisgICAgVmVjdG9y PFBhdGg+IHBhdGhzID0gUGF0aFV0aWxpdGllczo6cGF0aHNXaXRoU2hyaW5rV3JhcHBlZFJlY3Rz KHRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMsIGNvcm5lclJhZGl1cyk7CisKKyAg ICBjb250ZXh0LnNldEZpbGxDb2xvcihoaWdobGlnaHRDb2xvcigpLCBDb2xvclNwYWNlRGV2aWNl UkdCKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIHBhdGggOiBwYXRocykKKyAgICAgICAgY29udGV4 dC5maWxsUGF0aChwYXRoKTsKKworICAgIGNvbnRleHQuZHJhd0ltYWdlKGluZGljYXRvckltYWdl LCBDb2xvclNwYWNlRGV2aWNlUkdCLCBvdmVybGF5LmJvdW5kcygpKTsKIH0KIAogYm9vbCBGaW5k Q29udHJvbGxlcjo6dXBkYXRlRmluZEluZGljYXRvcihGcmFtZSYgc2VsZWN0ZWRGcmFtZSwgYm9v bCBpc1Nob3dpbmdPdmVybGF5LCBib29sIHNob3VsZEFuaW1hdGUpCiB7Ci0gICAgSW50UmVjdCBt YXRjaFJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHNlbGVjdGVkRnJhbWUuc2VsZWN0aW9uKCkuc2Vs ZWN0aW9uQm91bmRzKGZhbHNlKSk7Ci0gICAgbWF0Y2hSZWN0ID0gc2VsZWN0ZWRGcmFtZS52aWV3 KCktPmNvbnRlbnRzVG9Sb290VmlldyhtYXRjaFJlY3QpOwotICAgIG1hdGNoUmVjdC5pbmZsYXRl WCh0b3RhbEhvcml6b250YWxNYXJnaW4pOwotICAgIG1hdGNoUmVjdC5pbmZsYXRlWSh0b3RhbFZl cnRpY2FsTWFyZ2luKTsKLQogICAgIGlmIChtX2ZpbmRJbmRpY2F0b3JPdmVybGF5KQogICAgICAg ICBtX3dlYlBhZ2UtPm1haW5GcmFtZSgpLT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS51bmluc3Rh bGxQYWdlT3ZlcmxheShtX2ZpbmRJbmRpY2F0b3JPdmVybGF5LmdldCgpLCBQYWdlT3ZlcmxheTo6 RmFkZU1vZGU6OkRvTm90RmFkZSk7CiAKLSAgICBtX2ZpbmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50 ID0gc3RkOjptYWtlX3VuaXF1ZTxGaW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUz4oc2VsZWN0 ZWRGcmFtZSk7CisgICAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IHRleHRJbmRpY2F0b3IgPSBUZXh0 SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZShzZWxlY3RlZEZyYW1lLCBmaW5k VGV4dEluZGljYXRvck9wdGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9u OjpOb25lLCBGbG9hdFNpemUodG90YWxIb3Jpem9udGFsTWFyZ2luLCB0b3RhbFZlcnRpY2FsTWFy Z2luKSk7CisgICAgaWYgKCF0ZXh0SW5kaWNhdG9yKQorICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICBtX2ZpbmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxGaW5k SW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUz4oc2VsZWN0ZWRGcmFtZSwgdGV4dEluZGljYXRvci5n ZXQoKSk7CiAgICAgbV9maW5kSW5kaWNhdG9yT3ZlcmxheSA9IFBhZ2VPdmVybGF5OjpjcmVhdGUo Km1fZmluZEluZGljYXRvck92ZXJsYXlDbGllbnQsIFBhZ2VPdmVybGF5OjpPdmVybGF5VHlwZTo6 RG9jdW1lbnQpOwogICAgIG1fd2ViUGFnZS0+bWFpbkZyYW1lKCktPnBhZ2VPdmVybGF5Q29udHJv bGxlcigpLmluc3RhbGxQYWdlT3ZlcmxheShtX2ZpbmRJbmRpY2F0b3JPdmVybGF5LCBQYWdlT3Zl cmxheTo6RmFkZU1vZGU6OkRvTm90RmFkZSk7CiAKLSAgICBtX2ZpbmRJbmRpY2F0b3JPdmVybGF5 LT5zZXRGcmFtZShtYXRjaFJlY3QpOworICAgIG1fZmluZEluZGljYXRvck92ZXJsYXktPnNldEZy YW1lKGVuY2xvc2luZ0ludFJlY3QodGV4dEluZGljYXRvci0+dGV4dEJvdW5kaW5nUmVjdEluUm9v dFZpZXdDb29yZGluYXRlcygpKSk7CiAgICAgbV9maW5kSW5kaWNhdG9yT3ZlcmxheS0+c2V0TmVl ZHNEaXNwbGF5KCk7CiAKICAgICBpZiAoaXNTaG93aW5nT3ZlcmxheSB8fCBzaG91bGRBbmltYXRl KSB7CkBAIC0xMDYsNyArMTE0LDYgQEAgYm9vbCBGaW5kQ29udHJvbGxlcjo6dXBkYXRlRmluZElu ZGljYXRvcihGcmFtZSYgc2VsZWN0ZWRGcmFtZSwgYm9vbCBpc1Nob3dpbmdPdmUKICAgICAgICAg bV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpTbWFydE1hZ25pZmljYXRpb25Db250cm9sbGVyOjpN YWduaWZ5KHN0YXJ0UmVjdC5jZW50ZXIoKSwgcmVuZGVyUmVjdCwgdmlzaWJsZUNvbnRlbnRSZWN0 LCBtX3dlYlBhZ2UtPm1pbmltdW1QYWdlU2NhbGVGYWN0b3IoKSwgbV93ZWJQYWdlLT5tYXhpbXVt UGFnZVNjYWxlRmFjdG9yKCkpKTsKICAgICB9CiAKLSAgICBtX2ZpbmRJbmRpY2F0b3JSZWN0ID0g bWF0Y2hSZWN0OwogICAgIG1faXNTaG93aW5nRmluZEluZGljYXRvciA9IHRydWU7CiAgICAgCiAg ICAgcmV0dXJuIHRydWU7CkBAIC0xMjQsMjggKzEzMSwzOCBAQCB2b2lkIEZpbmRDb250cm9sbGVy OjpoaWRlRmluZEluZGljYXRvcigpCiAgICAgZGlkSGlkZUZpbmRJbmRpY2F0b3IoKTsKIH0KIAor c3RhdGljIHZvaWQgc2V0Q29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2VFbmFibGVkSW5BbGxGcmFt ZXMoV2ViUGFnZSYgcGFnZSwgYm9vbCBlbmFibGVkKQoreworICAgIGZvciAoRnJhbWUqIGNvcmVG cmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7IGNvcmVGcmFtZTsgY29yZUZyYW1lID0gY29yZUZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpCisgICAgICAgIGNvcmVGcmFtZS0+ZWRpdG9yKCkuc2V0 SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoZW5hYmxlZCk7Cit9CisKIHZvaWQgRmlu ZENvbnRyb2xsZXI6OndpbGxGaW5kU3RyaW5nKCkKIHsKLSAgICBmb3IgKEZyYW1lKiBjb3JlRnJh bWUgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZSgpOyBjb3JlRnJhbWU7IGNvcmVGcmFtZSA9IGNvcmVG cmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKSB7Ci0gICAgICAgIGNvcmVGcmFtZS0+ZWRpdG9y KCkuc2V0SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UodHJ1ZSk7Ci0gICAgICAgIGNv cmVGcmFtZS0+c2VsZWN0aW9uKCkuc2V0VXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQodHJ1ZSk7Ci0g ICAgfQorICAgIHNldENvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlRW5hYmxlZEluQWxsRnJhbWVz KCptX3dlYlBhZ2UsIHRydWUpOworfQorCit2b2lkIEZpbmRDb250cm9sbGVyOjpkaWRGaW5kU3Ry aW5nKCkKK3sKKyAgICAvLyBJZiB0aGUgc2VsZWN0aW9uIGJlZm9yZSB3ZSBlbmFibGVkIGFwcGVh cmFuY2UgdXBkYXRlcyBpcyBlcXVhbCB0byB0aGUKKyAgICAvLyByYW5nZSB0aGF0IHdlIGp1c3Qg Zm91bmQsIHNldFNlbGVjdGlvbiB3aWxsIGJhaWwgYW5kIGZhaWwgdG8gYWN0dWFsbHkgY2FsbAor ICAgIC8vIHVwZGF0ZUFwcGVhcmFuY2UsIHNvIHRoZSBzZWxlY3Rpb24gd29uJ3QgaGF2ZSBiZWVu IHB1c2hlZCB0byB0aGUgcmVuZGVyIHRyZWUuCisgICAgLy8gVGhlcmVmb3JlLCB3ZSBuZWVkIHRv IGZvcmNlIGFuIHVwZGF0ZSBubyBtYXR0ZXIgd2hhdC4KKworICAgIEZyYW1lJiBmcmFtZSA9IG1f d2ViUGFnZS0+Y29yZVBhZ2UoKS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1l KCk7CisgICAgZnJhbWUuc2VsZWN0aW9uKCkuc2V0VXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQodHJ1 ZSk7CisgICAgZnJhbWUuc2VsZWN0aW9uKCkudXBkYXRlQXBwZWFyYW5jZSgpOworICAgIGZyYW1l LnNlbGVjdGlvbigpLnNldFVwZGF0ZUFwcGVhcmFuY2VFbmFibGVkKGZhbHNlKTsKIH0KIAogdm9p ZCBGaW5kQ29udHJvbGxlcjo6ZGlkRmFpbFRvRmluZFN0cmluZygpCiB7Ci0gICAgZm9yIChGcmFt ZSogY29yZUZyYW1lID0gbV93ZWJQYWdlLT5tYWluRnJhbWUoKTsgY29yZUZyYW1lOyBjb3JlRnJh bWUgPSBjb3JlRnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgewotICAgICAgICBjb3JlRnJh bWUtPnNlbGVjdGlvbigpLnNldFVwZGF0ZUFwcGVhcmFuY2VFbmFibGVkKGZhbHNlKTsKLSAgICAg ICAgY29yZUZyYW1lLT5lZGl0b3IoKS5zZXRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlvbkNoYW5n ZShmYWxzZSk7Ci0gICAgfQorICAgIHNldENvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlRW5hYmxl ZEluQWxsRnJhbWVzKCptX3dlYlBhZ2UsIGZhbHNlKTsKIH0KIAogdm9pZCBGaW5kQ29udHJvbGxl cjo6ZGlkSGlkZUZpbmRJbmRpY2F0b3IoKQogewotICAgIGZvciAoRnJhbWUqIGNvcmVGcmFtZSA9 IG1fd2ViUGFnZS0+bWFpbkZyYW1lKCk7IGNvcmVGcmFtZTsgY29yZUZyYW1lID0gY29yZUZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKLSAgICAgICAgY29yZUZyYW1lLT5zZWxlY3Rpb24o KS5zZXRVcGRhdGVBcHBlYXJhbmNlRW5hYmxlZChmYWxzZSk7Ci0gICAgICAgIGNvcmVGcmFtZS0+ ZWRpdG9yKCkuc2V0SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoZmFsc2UpOwotICAg IH0KKyAgICBzZXRDb21wb3NpdGlvblNlbGVjdGlvbkNoYW5nZUVuYWJsZWRJbkFsbEZyYW1lcygq bV93ZWJQYWdlLCBmYWxzZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kSW5kaWNhdG9yT3Zl cmxheUNsaWVudElPUy5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9G aW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUy5oCmluZGV4IDQyOTIyODExZGU5ODcyMjRiYWU5 YjdiYmZlOTNkZTVjZmViY2IyYzUuLjE5MzNlNDc4ZTEwZjM1ZjlhZTg3ODY0M2ZiZDgzYzAxYTUy MWIwYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv RmluZEluZGljYXRvck92ZXJsYXlDbGllbnRJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50SU9TLmgKQEAgLTMw LDEyICszMCwxNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHQuaD4KICNpbXBv cnQgPFdlYkNvcmUvUGFnZU92ZXJsYXkuaD4KIAorbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3Mg VGV4dEluZGljYXRvcjsKK30KKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIEZpbmRJbmRp Y2F0b3JPdmVybGF5Q2xpZW50SU9TIDogcHVibGljIFdlYkNvcmU6OlBhZ2VPdmVybGF5OjpDbGll bnQgewogcHVibGljOgotICAgIEZpbmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50SU9TKFdlYkNvcmU6 OkZyYW1lJiBmcmFtZSkKKyAgICBGaW5kSW5kaWNhdG9yT3ZlcmxheUNsaWVudElPUyhXZWJDb3Jl OjpGcmFtZSYgZnJhbWUsIFdlYkNvcmU6OlRleHRJbmRpY2F0b3IqIHRleHRJbmRpY2F0b3IpCiAg ICAgICAgIDogbV9mcmFtZShmcmFtZSkKKyAgICAgICAgLCBtX3RleHRJbmRpY2F0b3IodGV4dElu ZGljYXRvcikKICAgICB7CiAgICAgfQogCkBAIC00Nyw2ICs1Miw3IEBAIHByaXZhdGU6CiAgICAg dmlydHVhbCBib29sIG1vdXNlRXZlbnQoV2ViQ29yZTo6UGFnZU92ZXJsYXkmLCBjb25zdCBXZWJD b3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmKSBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogCiAg ICAgV2ViQ29yZTo6RnJhbWUmIG1fZnJhbWU7CisgICAgUmVmUHRyPFdlYkNvcmU6OlRleHRJbmRp Y2F0b3I+IG1fdGV4dEluZGljYXRvcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=