215053 2020-08-01 00:42:28 -0700 Make WidthIterator::advance() return void 2020-08-07 23:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206208 215059 1 mmaxfield mmaxfield changseok darin dino esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim jonlee kondapallykalyan pdr sabouhallawa schenney sergio simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1677094 0 mmaxfield 2020-08-01 00:42:28 -0700 Make WidthIterator::advance() return void 1677097 1 405774 mmaxfield 2020-08-01 00:44:58 -0700 Created attachment 405774 Patch 1677421 2 ews-feeder 2020-08-03 14:04:43 -0700 Committed r265218: <https://trac.webkit.org/changeset/265218> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405774. 1677482 3 webkit-bug-importer 2020-08-03 16:24:23 -0700 <rdar://problem/66497046> 405774 2020-08-01 00:44:58 -0700 2020-08-03 14:04:44 -0700 Patch bug-215053-20200801004457.patch text/plain 9443 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMzUzZmU1ZThjOTRh NWQ1ZmNkOTgzNTc4YWNmOTQzYTIzM2M5Mi4uODkzNzhkZDIwMTJiYWVkMThiZjJiMjI3ZDFkYTM1 NzZjNTZhZjkyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA4LTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBXaWR0 aEl0ZXJhdG9yOjphZHZhbmNlKCkgcmV0dXJuIHZvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTA1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3NjkKKyAgICAgICAgYW5kIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYyMDguCisKKyAgICAgICAg VGhpcyBpcyBhIHNtYWxsIHNpbXBsaWZpY2F0aW9uIGluIHRoZSBmYXN0IHRleHQgY29kZXBhdGgu IEl0IHVzZWQgdG8gcmV0dXJuCisgICAgICAgIGhvdyBtYW55IGNoYXJhY3RlcnMgd2VyZSBjb25z dW1lZC4gSG93ZXZlciwgdGhpcyBpbmZvcm1hdGlvbiBpcyBhbHJlYWR5CisgICAgICAgIGV4cG9z ZWQgYnkganVzdCBjYWxsaW5nIGN1cnJlbnRDaGFyYWN0ZXIoKSBvbiB0aGUgd2lkdGggaXRlcmF0 b3IgYmVmb3JlIGFuZAorICAgICAgICBhZnRlciBjYWxsaW5nIGFkdmFuY2UoKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250Q2FzY2FkZTo6ZHJhd1RleHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dENhc2NhZGU6OmRpc3BsYXlMaXN0Rm9yVGV4dFJ1biBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpGb250Q2FzY2FkZTo6bGF5b3V0U2ltcGxlVGV4dCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpGb250Q2FzY2FkZTo6YWRqdXN0U2VsZWN0aW9uUmVjdEZvclNpbXBsZVRleHQgY29uc3QpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKToKKyAgICAgICAgKFdlYkNv cmU6OldpZHRoSXRlcmF0b3I6OmFkdmFuY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L1dpZHRoSXRlcmF0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRyaWNz QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdUZXh0TWV0cmljc0J1aWxkZXI6OmFk dmFuY2VTaW1wbGVUZXh0KToKKwogMjAyMC0wNy0zMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHRleHQgbGF5b3V0IGNvZGUgYSBi aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNj YWRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNw cAppbmRleCA2ODgwNzI2MDNjMDEzMWYyYjZiZTUwY2ZlMDdmMzMyNjc3ZWM4ODRhLi4zOWY5MjM3 OTk1OWFiZDdjZjZlNjVjMTMzNjc2YzI5ZTZjNjA3YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCkBAIC0yOTcsMTEgKzI5NywxMSBA QCBmbG9hdCBGb250Q2FzY2FkZTo6ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBUZXh0UnVuJiBydW4sIGNvbnN0CiB7CiAgICAgdW5zaWduZWQgZGVzdGluYXRpb24gPSB0 by52YWx1ZU9yKHJ1bi5sZW5ndGgoKSk7CiAgICAgYXV0byBnbHlwaEJ1ZmZlciA9IGxheW91dFRl eHQoY29kZVBhdGgocnVuLCBmcm9tLCB0byksIHJ1biwgZnJvbSwgZGVzdGluYXRpb24pOwotICAg IEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHBvaW50ICsgRmxvYXRTaXplKGdseXBoQnVmZmVyLmlu aXRpYWxBZHZhbmNlKCkpOwotICAgIC8vIFdlIGNvdWxkbid0IGdlbmVyYXRlIGFueSBnbHlwaHMg Zm9yIHRoZSBydW4uIEdpdmUgdXAuCisKICAgICBpZiAoZ2x5cGhCdWZmZXIuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm4gMDsKLSAgICAvLyBEcmF3IHRoZSBnbHlwaCBidWZmZXIgbm93IGF0IHRo ZSBzdGFydGluZyBwb2ludCByZXR1cm5lZCBpbiBzdGFydFguCisKKyAgICBGbG9hdFBvaW50IHN0 YXJ0UG9pbnQgPSBwb2ludCArIEZsb2F0U2l6ZShnbHlwaEJ1ZmZlci5pbml0aWFsQWR2YW5jZSgp KTsKICAgICBmbG9hdCBvbGRTdGFydFggPSBzdGFydFBvaW50LngoKTsKICAgICBkcmF3R2x5cGhC dWZmZXIoY29udGV4dCwgZ2x5cGhCdWZmZXIsIHN0YXJ0UG9pbnQsIGN1c3RvbUZvbnROb3RSZWFk eUFjdGlvbik7CiAgICAgcmV0dXJuIHN0YXJ0UG9pbnQueCgpIC0gb2xkU3RhcnRYOwpAQCAtMzM0 LDggKzMzNCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxEaXNwbGF5TGlzdDo6RGlzcGxheUxpc3Q+IEZv bnRDYXNjYWRlOjpkaXNwbGF5TGlzdEZvclRleHRSdW4oR3JhCiAgICAgICAgIGNvZGVQYXRoVG9V c2UgPSBDb21wbGV4OwogCiAgICAgYXV0byBnbHlwaEJ1ZmZlciA9IGxheW91dFRleHQoY29kZVBh dGhUb1VzZSwgcnVuLCBmcm9tLCBkZXN0aW5hdGlvbik7Ci0gICAgRmxvYXRQb2ludCBzdGFydFBv aW50ID0gdG9GbG9hdFBvaW50KEZsb2F0U2l6ZShnbHlwaEJ1ZmZlci5pbml0aWFsQWR2YW5jZSgp KSk7Ci0gICAgLy8gV2UgY291bGRuJ3QgZ2VuZXJhdGUgYW55IGdseXBocyBmb3IgdGhlIHJ1bi4g R2l2ZSB1cC4KKwogICAgIGlmIChnbHlwaEJ1ZmZlci5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIApAQCAtMzQ0LDYgKzM0Myw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxEaXNw bGF5TGlzdDo6RGlzcGxheUxpc3Q+IEZvbnRDYXNjYWRlOjpkaXNwbGF5TGlzdEZvclRleHRSdW4o R3JhCiAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPERpc3BsYXlMaXN0OjpSZWNvcmRlcj4oZGlz cGxheUxpc3RDb250ZXh0LCAqZGlzcGxheUxpc3QsIGNvbnRleHQuc3RhdGUoKSwgRmxvYXRSZWN0 KCksIEFmZmluZVRyYW5zZm9ybSgpKTsKICAgICB9KTsKICAgICAKKyAgICBGbG9hdFBvaW50IHN0 YXJ0UG9pbnQgPSB0b0Zsb2F0UG9pbnQoRmxvYXRTaXplKGdseXBoQnVmZmVyLmluaXRpYWxBZHZh bmNlKCkpKTsKICAgICBkcmF3R2x5cGhCdWZmZXIocmVjb3JkaW5nQ29udGV4dCwgZ2x5cGhCdWZm ZXIsIHN0YXJ0UG9pbnQsIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbik7CiAgICAgcmV0dXJuIGRp c3BsYXlMaXN0OwogfQpAQCAtMTM5NSw2ICsxMzk1LDcgQEAgR2x5cGhCdWZmZXIgRm9udENhc2Nh ZGU6OmxheW91dFNpbXBsZVRleHQoY29uc3QgVGV4dFJ1biYgcnVuLCB1bnNpZ25lZCBmcm9tLCB1 bnMKICAgICAgICAgaW5pdGlhbEFkdmFuY2UgPSBmaW5hbFJvdW5kaW5nV2lkdGggKyBpdC5ydW5X aWR0aFNvRmFyKCkgLSBhZnRlcldpZHRoOwogICAgIH0gZWxzZQogICAgICAgICBpbml0aWFsQWR2 YW5jZSA9IGJlZm9yZVdpZHRoOworICAgIC8vIEZJWE1FOiBEZWFsIHdpdGggdGhlIEdseXBoQnVm ZmVyJ3MgY3VycmVudCBpbml0aWFsQWR2YW5jZS4KICAgICBnbHlwaEJ1ZmZlci5zZXRJbml0aWFs QWR2YW5jZShGbG9hdFNpemUoaW5pdGlhbEFkdmFuY2UsIDApKTsKIAogICAgIGlmIChydW4ucnRs KCkpCkBAIC0xNTU4LDExICsxNTU5LDEwIEBAIHZvaWQgRm9udENhc2NhZGU6OmFkanVzdFNlbGVj dGlvblJlY3RGb3JTaW1wbGVUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgTGF5b3V0UmVjCiAgICAg ZmxvYXQgYmVmb3JlV2lkdGggPSBpdC5ydW5XaWR0aFNvRmFyKCk7CiAgICAgaXQuYWR2YW5jZSh0 bywgJmdseXBoQnVmZmVyKTsKICAgICBmbG9hdCBhZnRlcldpZHRoID0gaXQucnVuV2lkdGhTb0Zh cigpOwotICAgIGZsb2F0IHRvdGFsV2lkdGggPSAtMTsKIAogICAgIGlmIChydW4ucnRsKCkpIHsK ICAgICAgICAgaXQuYWR2YW5jZShydW4ubGVuZ3RoKCksICZnbHlwaEJ1ZmZlcik7Ci0gICAgICAg IHRvdGFsV2lkdGggPSBpdC5ydW5XaWR0aFNvRmFyKCk7CisgICAgICAgIGZsb2F0IHRvdGFsV2lk dGggPSBpdC5ydW5XaWR0aFNvRmFyKCk7CiAgICAgICAgIHNlbGVjdGlvblJlY3QubW92ZSh0b3Rh bFdpZHRoIC0gYWZ0ZXJXaWR0aCwgMCk7CiAgICAgfSBlbHNlCiAgICAgICAgIHNlbGVjdGlvblJl Y3QubW92ZShiZWZvcmVXaWR0aCwgMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCmluZGV4IGIzYzJmZjZhMTM5OTBhNjZmZWU2YWVl OWUwZTU5NmNkZDg3ZDYyZjcuLjhhMDQ0NjFmMGJlM2I4MTg2YzA3MGJjNmVhMTcwNzU2MmMwNzZl NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRl cmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRl cmF0b3IuY3BwCkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSAiU3Vycm9nYXRlUGFpckF3YXJl VGV4dEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAotCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBXVEY6OlVuaWNvZGU7CkBAIC0xNzAsNyAr MTY5LDcgQEAgc3RhdGljIGlubGluZSBzdGQ6OnBhaXI8Ym9vbCwgYm9vbD4gZXhwYW5zaW9uTG9j YXRpb24oYm9vbCBpZGVvZ3JhcGgsIGJvb2wgdHJlYXQKIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1l IFRleHRJdGVyYXRvcj4KLWlubGluZSB1bnNpZ25lZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlSW50 ZXJuYWwoVGV4dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZl cikKK2lubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0 b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIFRo ZSBjb3JlIGxvZ2ljIGhlcmUgbmVlZHMgdG8gbWF0Y2ggU2ltcGxlTGluZUxheW91dDo6d2lkdGhG b3JTaW1wbGVUZXh0KCkKICAgICBib29sIHJ0bCA9IG1fcnVuLnJ0bCgpOwpAQCAtMzY2LDE0ICsz NjUsMTIgQEAgaW5saW5lIHVuc2lnbmVkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbChU ZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGgKICAgICAgICAgICAgIGdseXBoQnVmZmVy LT5zaHJpbmsobGFzdEdseXBoQ291bnQpOwogICAgIH0KIAotICAgIHVuc2lnbmVkIGNvbnN1bWVk Q2hhcmFjdGVycyA9IHRleHRJdGVyYXRvci5jdXJyZW50SW5kZXgoKSAtIG1fY3VycmVudENoYXJh Y3RlcjsKICAgICBtX2N1cnJlbnRDaGFyYWN0ZXIgPSB0ZXh0SXRlcmF0b3IuY3VycmVudEluZGV4 KCk7CiAgICAgbV9ydW5XaWR0aFNvRmFyICs9IHdpZHRoU2luY2VMYXN0Um91bmRpbmc7CiAgICAg bV9maW5hbFJvdW5kaW5nV2lkdGggPSBsYXN0Um91bmRpbmdXaWR0aDsKLSAgICByZXR1cm4gY29u c3VtZWRDaGFyYWN0ZXJzOwogfQogCi11bnNpZ25lZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlKHVu c2lnbmVkIG9mZnNldCwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQordm9pZCBXaWR0aEl0ZXJh dG9yOjphZHZhbmNlKHVuc2lnbmVkIG9mZnNldCwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQog ewogICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fcnVuLmxlbmd0aCgpOwogCkBAIC0zODEsMTUgKzM3 OCwxNiBAQCB1bnNpZ25lZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlKHVuc2lnbmVkIG9mZnNldCwg R2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogICAgICAgICBvZmZzZXQgPSBsZW5ndGg7CiAKICAg ICBpZiAobV9jdXJyZW50Q2hhcmFjdGVyID49IG9mZnNldCkKLSAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX3J1bi5pczhCaXQoKSkgewogICAgICAgICBMYXRp bjFUZXh0SXRlcmF0b3IgdGV4dEl0ZXJhdG9yKG1fcnVuLmRhdGE4KG1fY3VycmVudENoYXJhY3Rl ciksIG1fY3VycmVudENoYXJhY3Rlciwgb2Zmc2V0LCBsZW5ndGgpOwotICAgICAgICByZXR1cm4g YWR2YW5jZUludGVybmFsKHRleHRJdGVyYXRvciwgZ2x5cGhCdWZmZXIpOworICAgICAgICBhZHZh bmNlSW50ZXJuYWwodGV4dEl0ZXJhdG9yLCBnbHlwaEJ1ZmZlcik7CisgICAgICAgIHJldHVybjsK ICAgICB9CiAKICAgICBTdXJyb2dhdGVQYWlyQXdhcmVUZXh0SXRlcmF0b3IgdGV4dEl0ZXJhdG9y KG1fcnVuLmRhdGExNihtX2N1cnJlbnRDaGFyYWN0ZXIpLCBtX2N1cnJlbnRDaGFyYWN0ZXIsIG9m ZnNldCwgbGVuZ3RoKTsKLSAgICByZXR1cm4gYWR2YW5jZUludGVybmFsKHRleHRJdGVyYXRvciwg Z2x5cGhCdWZmZXIpOworICAgIGFkdmFuY2VJbnRlcm5hbCh0ZXh0SXRlcmF0b3IsIGdseXBoQnVm ZmVyKTsKIH0KIAogYm9vbCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlT25lQ2hhcmFjdGVyKGZsb2F0 JiB3aWR0aCwgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCmluZGV4IGNkMGQyZmM4NzRmNTQ5ZjZh Zjk1MmQyNDI3NzFkOWIwZDBmZWEwOWEuLmMwOWRkODcyN2U1YWU1ODBkNjRjM2MxNTI0NjdhNGRl YTUwNmIyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dp ZHRoSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0 aEl0ZXJhdG9yLmgKQEAgLTQyLDcgKzQyLDcgQEAgc3RydWN0IFdpZHRoSXRlcmF0b3IgewogcHVi bGljOgogICAgIFdpZHRoSXRlcmF0b3IoY29uc3QgRm9udENhc2NhZGUqLCBjb25zdCBUZXh0UnVu JiwgSGFzaFNldDxjb25zdCBGb250Kj4qIGZhbGxiYWNrRm9udHMgPSAwLCBib29sIGFjY291bnRG b3JHbHlwaEJvdW5kcyA9IGZhbHNlLCBib29sIGZvclRleHRFbXBoYXNpcyA9IGZhbHNlKTsKIAot ICAgIHVuc2lnbmVkIGFkdmFuY2UodW5zaWduZWQgdG8sIEdseXBoQnVmZmVyKik7CisgICAgdm9p ZCBhZHZhbmNlKHVuc2lnbmVkIHRvLCBHbHlwaEJ1ZmZlciopOwogICAgIGJvb2wgYWR2YW5jZU9u ZUNoYXJhY3RlcihmbG9hdCYgd2lkdGgsIEdseXBoQnVmZmVyJik7CiAKICAgICBmbG9hdCBtYXhH bHlwaEJvdW5kaW5nQm94WSgpIGNvbnN0IHsgQVNTRVJUKG1fYWNjb3VudEZvckdseXBoQm91bmRz KTsgcmV0dXJuIG1fbWF4R2x5cGhCb3VuZGluZ0JveFk7IH0KQEAgLTU4LDcgKzU4LDcgQEAgcHVi bGljOgogcHJpdmF0ZToKICAgICBHbHlwaERhdGEgZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKFVDaGFy MzIsIGJvb2wgbWlycm9yKTsKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVGV4dEl0ZXJhdG9yPgot ICAgIGlubGluZSB1bnNpZ25lZCBhZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiwgR2x5cGhC dWZmZXIqKTsKKyAgICBpbmxpbmUgdm9pZCBhZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiwg R2x5cGhCdWZmZXIqKTsKIAogICAgIGVudW0gY2xhc3MgVHJhbnNmb3Jtc1R5cGUgeyBOb25lLCBG b3JjZWQsIE5vdEZvcmNlZCB9OwogICAgIFRyYW5zZm9ybXNUeXBlIHNob3VsZEFwcGx5Rm9udFRy YW5zZm9ybXMoY29uc3QgR2x5cGhCdWZmZXIqLCB1bnNpZ25lZCBsYXN0R2x5cGhDb3VudCwgVUNo YXIzMiBwcmV2aW91c0NoYXJhY3RlcikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRyaWNzQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRNZXRyaWNzQnVpbGRlci5jcHAKaW5kZXggODEwYTBiODgw YThhYTRkYWUwMmZhYjQ0NmE5NDFlZGQ5YzVhNzFkMS4uMjNmODgyZjYzZTI0NmIwYmM4ZmI5ZmU0 NDgxM2M3NTdhYmMwY2I0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9TVkdUZXh0TWV0cmljc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvU1ZHVGV4dE1ldHJpY3NCdWlsZGVyLmNwcApAQCAtNTgsOCArNTgsMTAgQEAgYm9vbCBT VkdUZXh0TWV0cmljc0J1aWxkZXI6OmFkdmFuY2UoKQogdm9pZCBTVkdUZXh0TWV0cmljc0J1aWxk ZXI6OmFkdmFuY2VTaW1wbGVUZXh0KCkKIHsKICAgICBHbHlwaEJ1ZmZlciBnbHlwaEJ1ZmZlcjsK LSAgICB1bnNpZ25lZCBtZXRyaWNzTGVuZ3RoID0gbV9zaW1wbGVXaWR0aEl0ZXJhdG9yLT5hZHZh bmNlKG1fdGV4dFBvc2l0aW9uICsgMSwgJmdseXBoQnVmZmVyKTsKLSAgICBpZiAoIW1ldHJpY3NM ZW5ndGgpIHsKKyAgICBhdXRvIGJlZm9yZSA9IG1fc2ltcGxlV2lkdGhJdGVyYXRvci0+Y3VycmVu dENoYXJhY3RlcigpOworICAgIG1fc2ltcGxlV2lkdGhJdGVyYXRvci0+YWR2YW5jZShtX3RleHRQ b3NpdGlvbiArIDEsICZnbHlwaEJ1ZmZlcik7CisgICAgYXV0byBhZnRlciA9IG1fc2ltcGxlV2lk dGhJdGVyYXRvci0+Y3VycmVudENoYXJhY3RlcigpOworICAgIGlmIChiZWZvcmUgPT0gYWZ0ZXIp IHsKICAgICAgICAgbV9jdXJyZW50TWV0cmljcyA9IFNWR1RleHRNZXRyaWNzKCk7CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC02Nyw3ICs2OSw3IEBAIHZvaWQgU1ZHVGV4dE1ldHJpY3NCdWls ZGVyOjphZHZhbmNlU2ltcGxlVGV4dCgpCiAgICAgZmxvYXQgY3VycmVudFdpZHRoID0gbV9zaW1w bGVXaWR0aEl0ZXJhdG9yLT5ydW5XaWR0aFNvRmFyKCkgLSBtX3RvdGFsV2lkdGg7CiAgICAgbV90 b3RhbFdpZHRoID0gbV9zaW1wbGVXaWR0aEl0ZXJhdG9yLT5ydW5XaWR0aFNvRmFyKCk7CiAKLSAg ICBtX2N1cnJlbnRNZXRyaWNzID0gU1ZHVGV4dE1ldHJpY3MoKm1fdGV4dCwgbWV0cmljc0xlbmd0 aCwgY3VycmVudFdpZHRoKTsKKyAgICBtX2N1cnJlbnRNZXRyaWNzID0gU1ZHVGV4dE1ldHJpY3Mo Km1fdGV4dCwgYWZ0ZXIgLSBiZWZvcmUsIGN1cnJlbnRXaWR0aCk7CiB9CiAKIHZvaWQgU1ZHVGV4 dE1ldHJpY3NCdWlsZGVyOjphZHZhbmNlQ29tcGxleFRleHQoKQo=