161006 2016-08-19 12:38:51 -0700 Migrate from ints to unsigneds in a few more places in rendering code 2016-08-19 14:49:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield oldest_to_newest 1221435 0 mmaxfield 2016-08-19 12:38:51 -0700 Migrate from ints to unsigneds in a few more places in rendering code 1221444 1 286469 mmaxfield 2016-08-19 12:46:49 -0700 Created attachment 286469 Patch 1221489 2 mmaxfield 2016-08-19 14:49:25 -0700 Committed r204654: <http://trac.webkit.org/changeset/204654> 286469 2016-08-19 12:46:49 -0700 2016-08-19 14:15:57 -0700 Patch bug-161006-20160819124458.patch text/plain 11275 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYyYTVmN2NiNDAxOTky YmRhMWM4NjgwMGIzMjhkMjU2OGU1ZjY4MC4uMTc5M2JiNTEyMDhjODVhZWNjMGJiMmYyOWU0MDdh YTAxYWMzOGZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2LTA4LTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSBm cm9tIGludHMgdG8gdW5zaWduZWRzIGluIGEgZmV3IG1vcmUgcGxhY2VzIGluIHJlbmRlcmluZyBj b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjEw MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL21v Y2svTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1Jl YWx0aW1lVmlkZW9Tb3VyY2U6OmRyYXdUZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0Jp ZGlSZXNvbHZlci5oOgorICAgICAgICAoV2ViQ29yZTo6QmlkaUNoYXJhY3RlclJ1bjo6QmlkaUNo YXJhY3RlclJ1bik6CisgICAgICAgIChXZWJDb3JlOjpCaWRpQ2hhcmFjdGVyUnVuOjpzdGFydCk6 CisgICAgICAgIChXZWJDb3JlOjpCaWRpQ2hhcmFjdGVyUnVuOjpzdG9wKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvQmlkaVJ1bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaWRpUnVuOjpCaWRpUnVu KToKKyAgICAgICAgKiByZW5kZXJpbmcvQmlkaVJ1bi5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0TG9naWNhbFdp ZHRoRm9yVGV4dFJ1bik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1 dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OmZpbmRGaXJzdFRyYWlsaW5nU3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tG bG93OjpoYW5kbGVUcmFpbGluZ1NwYWNlcyk6CisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvQnJl YWtpbmdDb250ZXh0Lmg6CisKIDIwMTYtMDgtMTkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNv bkBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gZml4IFBpUCBjb250ZXh0IG1lbnUgdHlwb3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuY3BwCmluZGV4IGVkZjYwNTM4Yjg5MzBiZTBiODk3OTk5YTVlNDMxMGM3NTBhNDc3MjkuLmI5 ZjUwZjdmZmU5YzRlOTc4NDgwOWUxZjA4MDE4ZDYzNjgyYWE0ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtNjkx LDcgKzY5MSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRleHQoY29uc3QgRm9u dENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwKICAgICAgICAgc3VicnVuLnNldERp cmVjdGlvbihpc1JUTCA/IFJUTCA6IExUUik7CiAgICAgICAgIHN1YnJ1bi5zZXREaXJlY3Rpb25h bE92ZXJyaWRlKGJpZGlSdW4tPmRpck92ZXJyaWRlKGZhbHNlKSk7CiAKLSAgICAgICAgZmxvYXQg d2lkdGggPSBmb250LmRyYXdUZXh0KCp0aGlzLCBzdWJydW4sIGN1cnJQb2ludCwgMCwgLTEsIGN1 c3RvbUZvbnROb3RSZWFkeUFjdGlvbik7CisgICAgICAgIGZsb2F0IHdpZHRoID0gZm9udC5kcmF3 VGV4dCgqdGhpcywgc3VicnVuLCBjdXJyUG9pbnQsIDAsIE51bGxvcHQsIGN1c3RvbUZvbnROb3RS ZWFkeUFjdGlvbik7CiAgICAgICAgIGN1cnJQb2ludC5tb3ZlKHdpZHRoLCAwKTsKIAogICAgICAg ICBiaWRpUnVuID0gYmlkaVJ1bi0+bmV4dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCBhZTZiYjVj NWRhZGU2YzQyOTA3M2Y0ZjIxMGUzNjA0YTFiMTEzZDQ0Li4yZTJkOTVjZWY3OTZjYzI4Zjc3NjBj ZTY2OTY5MDQ5ODhlNGUzNDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t b2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtMjY4LDE5ICsyNjgsMTkg QEAgdm9pZCBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0KQogICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjp3aGl0ZSk7CiAgICAg Y29udGV4dC5zZXRUZXh0RHJhd2luZ01vZGUoVGV4dE1vZGVGaWxsKTsKICAgICBTdHJpbmcgc3Ry aW5nID0gU3RyaW5nOjpmb3JtYXQoIiUwMnU6JTAydTolMDJ1LiUwM3UiLCBob3VycywgbWludXRl cywgc2Vjb25kcywgbWlsbGlzZWNvbmRzICUgMTAwMCk7Ci0gICAgY29udGV4dC5kcmF3VGV4dCht X3RpbWVGb250LCBUZXh0UnVuKChTdHJpbmdWaWV3KHN0cmluZykpKSwgdGltZUxvY2F0aW9uLCAw LCAtMSk7CisgICAgY29udGV4dC5kcmF3VGV4dChtX3RpbWVGb250LCBUZXh0UnVuKChTdHJpbmdW aWV3KHN0cmluZykpKSwgdGltZUxvY2F0aW9uKTsKIAogICAgIHN0cmluZyA9IFN0cmluZzo6Zm9y bWF0KCIlMDZ1IiwgbV9mcmFtZU51bWJlcisrKTsKICAgICB0aW1lTG9jYXRpb24ubW92ZSgwLCBt X2Jhc2VGb250U2l6ZSk7Ci0gICAgY29udGV4dC5kcmF3VGV4dChtX3RpbWVGb250LCBUZXh0UnVu KChTdHJpbmdWaWV3KHN0cmluZykpKSwgdGltZUxvY2F0aW9uLCAwLCAtMSk7CisgICAgY29udGV4 dC5kcmF3VGV4dChtX3RpbWVGb250LCBUZXh0UnVuKChTdHJpbmdWaWV3KHN0cmluZykpKSwgdGlt ZUxvY2F0aW9uKTsKIAogICAgIEZsb2F0UG9pbnQgc3RhdHNMb2NhdGlvbihtX3NpemUud2lkdGgo KSAqIC42NSwgbV9zaXplLmhlaWdodCgpICogLjc1KTsKICAgICBzdHJpbmcgPSBTdHJpbmc6OmZv cm1hdCgiRnJhbWUgcmF0ZTogJXVmcHMiLCBtX2ZyYW1lUmF0ZSk7Ci0gICAgY29udGV4dC5kcmF3 VGV4dChtX3N0YXRzRm9udCwgVGV4dFJ1bigoU3RyaW5nVmlldyhzdHJpbmcpKSksIHN0YXRzTG9j YXRpb24sIDAsIC0xKTsKKyAgICBjb250ZXh0LmRyYXdUZXh0KG1fc3RhdHNGb250LCBUZXh0UnVu KChTdHJpbmdWaWV3KHN0cmluZykpKSwgc3RhdHNMb2NhdGlvbik7CiAKICAgICBzdHJpbmcgPSBT dHJpbmc6OmZvcm1hdCgiU2l6ZTogJXUgeCAldSIsIG1fc2l6ZS53aWR0aCgpLCBtX3NpemUuaGVp Z2h0KCkpOwogICAgIHN0YXRzTG9jYXRpb24ubW92ZSgwLCBtX3N0YXRzRm9udFNpemUpOwotICAg IGNvbnRleHQuZHJhd1RleHQobV9zdGF0c0ZvbnQsIFRleHRSdW4oKFN0cmluZ1ZpZXcoc3RyaW5n KSkpLCBzdGF0c0xvY2F0aW9uLCAwLCAtMSk7CisgICAgY29udGV4dC5kcmF3VGV4dChtX3N0YXRz Rm9udCwgVGV4dFJ1bigoU3RyaW5nVmlldyhzdHJpbmcpKSksIHN0YXRzTG9jYXRpb24pOwogCiAg ICAgY29uc3QgY2hhciogY2FtZXJhOwogICAgIHN3aXRjaCAoc2V0dGluZ3MoKS5mYWNpbmdNb2Rl KCkpIHsKQEAgLTMwMiwxOCArMzAyLDE4IEBAIHZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6 OmRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAgICB9CiAgICAgc3RyaW5nID0g U3RyaW5nOjpmb3JtYXQoIkNhbWVyYTogJXMiLCBjYW1lcmEpOwogICAgIHN0YXRzTG9jYXRpb24u bW92ZSgwLCBtX3N0YXRzRm9udFNpemUpOwotICAgIGNvbnRleHQuZHJhd1RleHQobV9zdGF0c0Zv bnQsIFRleHRSdW4oKFN0cmluZ1ZpZXcoc3RyaW5nKSkpLCBzdGF0c0xvY2F0aW9uLCAwLCAtMSk7 CisgICAgY29udGV4dC5kcmF3VGV4dChtX3N0YXRzRm9udCwgVGV4dFJ1bigoU3RyaW5nVmlldyhz dHJpbmcpKSksIHN0YXRzTG9jYXRpb24pOwogCiAgICAgRmxvYXRQb2ludCBiaXBCb3BMb2NhdGlv bihtX3NpemUud2lkdGgoKSAqIC42LCBtX3NpemUuaGVpZ2h0KCkgKiAuNik7CiAgICAgdW5zaWdu ZWQgZnJhbWVNb2QgPSBtX2ZyYW1lTnVtYmVyICUgNjA7CiAgICAgaWYgKGZyYW1lTW9kIDw9IDE1 KSB7CiAgICAgICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjpncmF5KTsKICAgICAgICAg U3RyaW5nIGJpcChBU0NJSUxpdGVyYWwoIkJpcCIpKTsKLSAgICAgICAgY29udGV4dC5kcmF3VGV4 dChtX2JpcEJvcEZvbnQsIFRleHRSdW4oU3RyaW5nVmlldyhiaXApKSwgYmlwQm9wTG9jYXRpb24s IDAsIC0xKTsKKyAgICAgICAgY29udGV4dC5kcmF3VGV4dChtX2JpcEJvcEZvbnQsIFRleHRSdW4o U3RyaW5nVmlldyhiaXApKSwgYmlwQm9wTG9jYXRpb24pOwogICAgIH0gZWxzZSBpZiAoZnJhbWVN b2QgPiAzMCAmJiBmcmFtZU1vZCA8PSA0NSkgewogICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xv cihDb2xvcjo6d2hpdGUpOwogICAgICAgICBTdHJpbmcgYm9wKEFTQ0lJTGl0ZXJhbCgiQm9wIikp OwotICAgICAgICBjb250ZXh0LmRyYXdUZXh0KG1fYmlwQm9wRm9udCwgVGV4dFJ1bihTdHJpbmdW aWV3KGJvcCkpLCBiaXBCb3BMb2NhdGlvbiwgMCwgLTEpOworICAgICAgICBjb250ZXh0LmRyYXdU ZXh0KG1fYmlwQm9wRm9udCwgVGV4dFJ1bihTdHJpbmdWaWV3KGJvcCkpLCBiaXBCb3BMb2NhdGlv bik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0JpZGlSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2 ZXIuaAppbmRleCBjZDlkMWVjZWIzZTQ3OTdlNjY1MTkwNzI4MDE0YTc4MzlmYTdmZTAxLi40OWNm ZDIzNDE5ODM2M2M4M2VhYjQxYjE5YzVhNWMyNDQ1NzQ5ZGFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKQEAgLTE0MSw3ICsxNDEsNyBAQCBpbmxpbmUg Ym9vbCBvcGVyYXRvciE9KGNvbnN0IEJpZGlTdGF0dXMmIHN0YXR1czEsIGNvbnN0IEJpZGlTdGF0 dXMmIHN0YXR1czIpCiBzdHJ1Y3QgQmlkaUNoYXJhY3RlclJ1biB7CiAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgQmlkaUNoYXJhY3RlclJ1bihpbnQgc3RhcnQsIGlu dCBzdG9wLCBCaWRpQ29udGV4dCogY29udGV4dCwgVUNoYXJEaXJlY3Rpb24gZGlyZWN0aW9uKQor ICAgIEJpZGlDaGFyYWN0ZXJSdW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIHN0b3AsIEJpZGlD b250ZXh0KiBjb250ZXh0LCBVQ2hhckRpcmVjdGlvbiBkaXJlY3Rpb24pCiAgICAgICAgIDogbV9z dGFydChzdGFydCkKICAgICAgICAgLCBtX3N0b3Aoc3RvcCkKICAgICAgICAgLCBtX292ZXJyaWRl KGNvbnRleHQtPm92ZXJyaWRlKCkpCkBAIC0xNzEsOCArMTcxLDggQEAgcHVibGljOgogICAgICAg ICAgICAgbmV4dCA9IFdURk1vdmUobmV4dC0+bV9uZXh0KTsKICAgICB9CiAKLSAgICBpbnQgc3Rh cnQoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0OyB9Ci0gICAgaW50IHN0b3AoKSBjb25zdCB7IHJl dHVybiBtX3N0b3A7IH0KKyAgICB1bnNpZ25lZCBzdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1fc3Rh cnQ7IH0KKyAgICB1bnNpZ25lZCBzdG9wKCkgY29uc3QgeyByZXR1cm4gbV9zdG9wOyB9CiAgICAg dW5zaWduZWQgY2hhciBsZXZlbCgpIGNvbnN0IHsgcmV0dXJuIG1fbGV2ZWw7IH0KICAgICBib29s IHJldmVyc2VkKGJvb2wgdmlzdWFsbHlPcmRlcmVkKSB7IHJldHVybiBtX2xldmVsICUgMiAmJiAh dmlzdWFsbHlPcmRlcmVkOyB9CiAgICAgYm9vbCBkaXJPdmVycmlkZShib29sIHZpc3VhbGx5T3Jk ZXJlZCkgeyByZXR1cm4gbV9vdmVycmlkZSB8fCB2aXN1YWxseU9yZGVyZWQ7IH0KQEAgLTE4NSw4 ICsxODUsOCBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxCaWRpQ2hhcmFjdGVyUnVu PiBtX25leHQ7CiAKIHB1YmxpYzoKLSAgICBpbnQgbV9zdGFydDsKLSAgICBpbnQgbV9zdG9wOwor ICAgIHVuc2lnbmVkIG1fc3RhcnQ7CisgICAgdW5zaWduZWQgbV9zdG9wOwogICAgIHVuc2lnbmVk IGNoYXIgbV9sZXZlbDsKICAgICBib29sIG1fb3ZlcnJpZGUgOiAxOwogICAgIGJvb2wgbV9oYXNI eXBoZW4gOiAxOyAvLyBVc2VkIGJ5IEJpZGlSdW4gc3ViY2xhc3Mgd2hpY2ggaXMgYSBsYXllcmlu ZyB2aW9sYXRpb24gYnV0IGVuYWJsZXMgdXMgdG8gc2F2ZSA4IGJ5dGVzIHBlciBvYmplY3Qgb24g NjQtYml0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JpZGlSdW4uY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JpZGlSdW4uY3BwCmluZGV4IGM0YmI0N2FlMTEz NDU4NTg3MzVmOTY4MWE0YmE3MzdiOTdhYTlkY2QuLmY0NjgxNzY1YTY3ZjUzNTc0MGQyODliZGY3 N2RkYWI5OTA5NzA3YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9CaWRp UnVuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQmlkaVJ1bi5jcHAKQEAgLTMz LDcgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBERUZJTkVfREVCVUdfT05MWV9HTE9C QUwoUmVmQ291bnRlZExlYWtDb3VudGVyLCBiaWRpUnVuQ291bnRlciwgKCJCaWRpUnVuIikpOwog Ci1CaWRpUnVuOjpCaWRpUnVuKGludCBzdGFydCwgaW50IHN0b3AsIFJlbmRlck9iamVjdCYgcmVu ZGVyZXIsIEJpZGlDb250ZXh0KiBjb250ZXh0LCBVQ2hhckRpcmVjdGlvbiBkaXIpCitCaWRpUnVu OjpCaWRpUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBzdG9wLCBSZW5kZXJPYmplY3QmIHJl bmRlcmVyLCBCaWRpQ29udGV4dCogY29udGV4dCwgVUNoYXJEaXJlY3Rpb24gZGlyKQogICAgIDog QmlkaUNoYXJhY3RlclJ1bihzdGFydCwgc3RvcCwgY29udGV4dCwgZGlyKQogICAgICwgbV9yZW5k ZXJlcihyZW5kZXJlcikKICAgICAsIG1fYm94KG51bGxwdHIpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvQmlkaVJ1bi5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Jp ZGlSdW4uaAppbmRleCA5ZGQ5ODgxMjJhYTAwNjFiNmFkZTg1ODhmZmI5MDU3MDEwOGM5MWEyLi5j Y2FmYjVkYWNlYzYzMGU4NGEzOTU5MzZlZjUzZGYzMzUwOWQ1YTk1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvQmlkaVJ1bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9CaWRpUnVuLmgKQEAgLTM0LDcgKzM0LDcgQEAgY2xhc3MgSW5saW5lQm94OwogY2xhc3Mg UmVuZGVyT2JqZWN0OwogCiBzdHJ1Y3QgQmlkaVJ1biA6IEJpZGlDaGFyYWN0ZXJSdW4gewotICAg IEJpZGlSdW4oaW50IHN0YXJ0LCBpbnQgc3RvcCwgUmVuZGVyT2JqZWN0JiwgQmlkaUNvbnRleHQq LCBVQ2hhckRpcmVjdGlvbik7CisgICAgQmlkaVJ1bih1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQg c3RvcCwgUmVuZGVyT2JqZWN0JiwgQmlkaUNvbnRleHQqLCBVQ2hhckRpcmVjdGlvbik7CiAgICAg fkJpZGlSdW4oKTsKIAogICAgIEJpZGlSdW4qIG5leHQoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxC aWRpUnVuKj4oQmlkaUNoYXJhY3RlclJ1bjo6bmV4dCgpKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAyNmE4NzFlZTdm MTg3OTk4ZDAyYWJjYTdiMjNlNTcyNTRlMDNjY2JjLi42MzJjNWMwNmUyOTkzM2RkNWYyY2EyODVl MWJkY2VmOTI2Mjc0M2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNDg4LDcgKzQ4OCw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBzZXRMb2dpY2FsV2lkdGhGb3JUZXh0UnVuKFJvb3RJbmxpbmVCb3gqIGxpbmVCb3gsIEJp ZGlSdW4qIHJ1CiAgICAgLy8gdGhlIHN0eWxlIGlzIGxpbmVib3gtY29udGFpbjogZ2x5cGguCiAg ICAgCiAgICAgaWYgKCFsaW5lQm94LT5maXRzVG9HbHlwaHMoKSAmJiBjYW5Vc2VTaW1wbGVGb250 Q29kZVBhdGgpIHsKLSAgICAgICAgaW50IGxhc3RFbmRPZmZzZXQgPSBydW4tPm1fc3RhcnQ7Cisg ICAgICAgIHVuc2lnbmVkIGxhc3RFbmRPZmZzZXQgPSBydW4tPm1fc3RhcnQ7CiAgICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwLCBzaXplID0gd29yZE1lYXN1cmVtZW50cy5zaXplKCk7IGkgPCBzaXpl ICYmIGxhc3RFbmRPZmZzZXQgPCBydW4tPm1fc3RvcDsgKytpKSB7CiAgICAgICAgICAgICBXb3Jk TWVhc3VyZW1lbnQmIHdvcmRNZWFzdXJlbWVudCA9IHdvcmRNZWFzdXJlbWVudHNbaV07CiAgICAg ICAgICAgICBpZiAod29yZE1lYXN1cmVtZW50LndpZHRoIDw9IDAgfHwgd29yZE1lYXN1cmVtZW50 LnN0YXJ0T2Zmc2V0ID09IHdvcmRNZWFzdXJlbWVudC5lbmRPZmZzZXQpCkBAIC04ODgsOSArODg4 LDEwIEBAIEJpZGlSdW4qIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBv c2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZUJvCiAgICAgICAgICAgICAgICAgZXhwYW5zaW9u T3Bwb3J0dW5pdHlDb3VudCArPSBvcHBvcnR1bml0aWVzSW5SdW47CiAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgIGlmIChpbnQgbGVuZ3RoID0gcmVuZGVyVGV4dC50ZXh0TGVuZ3RoKCkpIHsK KyAgICAgICAgICAgIGlmICh1bnNpZ25lZCBsZW5ndGggPSByZW5kZXJUZXh0LnRleHRMZW5ndGgo KSkgewogICAgICAgICAgICAgICAgIGlmICghcnVuLT5tX3N0YXJ0ICYmIG5lZWRzV29yZFNwYWNp bmcgJiYgaXNTcGFjZU9yTmV3bGluZShyZW5kZXJUZXh0LmNoYXJhY3RlckF0KHJ1bi0+bV9zdGFy dCkpKQogICAgICAgICAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCArPSBsaW5lU3R5bGUo KnJlbmRlclRleHQucGFyZW50KCksIGxpbmVJbmZvKS5mb250Q2FzY2FkZSgpLndvcmRTcGFjaW5n KCk7CisgICAgICAgICAgICAgICAgQVNTRVJUKHJ1bi0+bV9zdG9wID4gMCk7CiAgICAgICAgICAg ICAgICAgbmVlZHNXb3JkU3BhY2luZyA9ICFpc1NwYWNlT3JOZXdsaW5lKHJlbmRlclRleHQuY2hh cmFjdGVyQXQocnVuLT5tX3N0b3AgLSAxKSkgJiYgcnVuLT5tX3N0b3AgPT0gbGVuZ3RoOwogICAg ICAgICAgICAgfQogCkBAIC0xMDI1LDkgKzEwMjYsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXND b2xsYXBzaWJsZVNwYWNlKFVDaGFyIGNoYXJhY3RlciwgY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVy ZQogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRpYyBpbmxpbmUg aW50IGZpbmRGaXJzdFRyYWlsaW5nU3BhY2UoY29uc3QgUmVuZGVyVGV4dCYgbGFzdFRleHQsIGNv bnN0IENoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIGludCBzdGFydCwgaW50IHN0b3ApCitzdGF0 aWMgaW5saW5lIHVuc2lnbmVkIGZpbmRGaXJzdFRyYWlsaW5nU3BhY2UoY29uc3QgUmVuZGVyVGV4 dCYgbGFzdFRleHQsIGNvbnN0IENoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBzdG9wKQogewotICAgIGludCBmaXJzdFNwYWNlID0gc3RvcDsKKyAgICB1 bnNpZ25lZCBmaXJzdFNwYWNlID0gc3RvcDsKICAgICB3aGlsZSAoZmlyc3RTcGFjZSA+IHN0YXJ0 KSB7CiAgICAgICAgIFVDaGFyIGN1cnJlbnQgPSBjaGFyYWN0ZXJzW2ZpcnN0U3BhY2UgLSAxXTsK ICAgICAgICAgaWYgKCFpc0NvbGxhcHNpYmxlU3BhY2UoY3VycmVudCwgbGFzdFRleHQpKQpAQCAt MTA1MSw3ICsxMDUyLDcgQEAgaW5saW5lIEJpZGlSdW4qIFJlbmRlckJsb2NrRmxvdzo6aGFuZGxl VHJhaWxpbmdTcGFjZXMoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mIGJpZGkKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAKICAgICBjb25zdCBSZW5kZXJUZXh0JiBsYXN0VGV4dCA9IGRvd25jYXN0PFJl bmRlclRleHQ+KGxhc3RPYmplY3QpOwotICAgIGludCBmaXJzdFNwYWNlOworICAgIHVuc2lnbmVk IGZpcnN0U3BhY2U7CiAgICAgaWYgKGxhc3RUZXh0LmlzOEJpdCgpKQogICAgICAgICBmaXJzdFNw YWNlID0gZmluZEZpcnN0VHJhaWxpbmdTcGFjZShsYXN0VGV4dCwgbGFzdFRleHQuY2hhcmFjdGVy czgoKSwgdHJhaWxpbmdTcGFjZVJ1bi0+c3RhcnQoKSwgdHJhaWxpbmdTcGFjZVJ1bi0+c3RvcCgp KTsKICAgICBlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9C cmVha2luZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5n Q29udGV4dC5oCmluZGV4IDIxNmY1YTY5YWYyNjliYjdjNjQ1NDBmMWViZGI3ZmNjMjRkYjI2YmMu LjNiNzUzNzcwMTQxMjMwYzZkYjgxMWIwOWU4NDU4NDgwY2QxMWZjNTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dC5oCkBAIC01OCw4ICs1OCw4 IEBAIHN0cnVjdCBXb3JkTWVhc3VyZW1lbnQgewogCiAgICAgUmVuZGVyVGV4dCogcmVuZGVyZXI7 CiAgICAgZmxvYXQgd2lkdGg7Ci0gICAgaW50IHN0YXJ0T2Zmc2V0OwotICAgIGludCBlbmRPZmZz ZXQ7CisgICAgdW5zaWduZWQgc3RhcnRPZmZzZXQ7CisgICAgdW5zaWduZWQgZW5kT2Zmc2V0Owog ICAgIEhhc2hTZXQ8Y29uc3QgRm9udCo+IGZhbGxiYWNrRm9udHM7CiB9OwogCg==