63014 2011-06-20 14:30:09 -0700 Remove some unsafe static_cast in rendering/ 2011-06-20 16:14:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 1 jchaffraix jchaffraix webkit.review.bot oldest_to_newest 423952 0 jchaffraix 2011-06-20 14:30:09 -0700 There was a couple of helper methods that were introduced to do some checks in DEBUG before doing a static_cast. Let's use them instead. 423957 1 97859 jchaffraix 2011-06-20 14:34:03 -0700 Created attachment 97859 Trivial fix: Use the proper conversion methods. 424042 2 97859 webkit.review.bot 2011-06-20 16:14:36 -0700 Comment on attachment 97859 Trivial fix: Use the proper conversion methods. Clearing flags on attachment: 97859 Committed r89304: <http://trac.webkit.org/changeset/89304> 424043 3 webkit.review.bot 2011-06-20 16:14:39 -0700 All reviewed patches have been landed. Closing bug. 97859 2011-06-20 14:34:03 -0700 2011-06-20 16:14:36 -0700 Trivial fix: Use the proper conversion methods. bug-63014-20110620143401.patch text/plain 9933 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogODkyNDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZTZkMGUxODlhNjdhYWYz YTMxMTg2Mzg5ZjEwZDlmMWZmY2FmN2NiLi5kZTcyYzllNjViMThkMWY2NzE3Zjc3NWRhZTM4OTU0 MGI5ZGQ0ZTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDYtMjAgIEp1bGll biBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUgdW5zYWZlIHN0YXRpY19j YXN0IGluIHJlbmRlcmluZy8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYzMDE0CisKKyAgICAgICAgTWVjaGFuaWNhbCByZWZhY3RvcmluZywgbm8gdGVz dCBuZWVkZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpwbGFjZUJveGVzSW5CbG9ja0RpcmVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94Ojpjb21wdXRlT3ZlckFubm90YXRpb25B ZGp1c3RtZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpnZXRFbXBoYXNpc01hcmtQb3NpdGlvbik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6TGluZUJyZWFrZXI6Om5leHRMaW5lQnJlYWspOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6ZGVzdHJveVNjcm9sbGJhcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJ1Ynku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6cnVieUJlZm9yZUJsb2NrKToKKyAgICAgICAgKFdlYkNv cmU6OnJ1YnlBZnRlckJsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6Omxhc3RSdWJ5UnVuKToKKyAg ICAgICAgKFdlYkNvcmU6OmZpbmRSdWJ5UnVuUGFyZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyUnVieUJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUnVieUJhc2U6OnJ1 YnlSdW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSdWJ5UnVuLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclJ1YnlSdW46OnJlbW92ZUNoaWxkKToKKyAgICAgICAgVXNlIHRoZSBw cm9wZXIgY29udmVyc2lvbiBtZXRob2RzIGF0IHRoZSBwcmV2aW91cyBjYWxsLXNpdGVzLgorCiAy MDExLTA2LTE5ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAKaW5kZXggOWZiYTg0YzcwOTY2NWI4NTNiOTdjNTVkNjc2ZjY3MGJhNWM0 ZmY5Yi4uNGJlNWU5YzJiMTVhOTYzODYzNTFmNjNlZjY1N2NmYzIwNmFiZWNiZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcApAQCAtNjQ2LDcgKzY0Niw3IEBA IHZvaWQgSW5saW5lRmxvd0JveDo6cGxhY2VCb3hlc0luQmxvY2tEaXJlY3Rpb24oaW50IHRvcCwg aW50IG1heEhlaWdodCwgaW50IG1heEFzCiAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICBoYXNBbm5vdGF0aW9uc0FmdGVyID0gdHJ1ZTsKIAotICAgICAgICAgICAgICAg IFJlbmRlclJ1YnlSdW4qIHJ1YnlSdW4gPSBzdGF0aWNfY2FzdDxSZW5kZXJSdWJ5UnVuKj4oY3Vy ci0+cmVuZGVyZXIoKSk7CisgICAgICAgICAgICAgICAgUmVuZGVyUnVieVJ1biogcnVieVJ1biA9 IHRvUmVuZGVyUnVieVJ1bihjdXJyLT5yZW5kZXJlcigpKTsKICAgICAgICAgICAgICAgICBpZiAo UmVuZGVyUnVieUJhc2UqIHJ1YnlCYXNlID0gcnVieVJ1bi0+cnVieUJhc2UoKSkgewogICAgICAg ICAgICAgICAgICAgICBpbnQgYm90dG9tUnVieUJhc2VMZWFkaW5nID0gKGN1cnItPmxvZ2ljYWxI ZWlnaHQoKSAtIHJ1YnlCYXNlLT5sb2dpY2FsQm90dG9tKCkpICsgcnVieUJhc2UtPmxvZ2ljYWxI ZWlnaHQoKSAtIChydWJ5QmFzZS0+bGFzdFJvb3RCb3goKSA/IHJ1YnlCYXNlLT5sYXN0Um9vdEJv eCgpLT5saW5lQm90dG9tKCkgOiAwKTsKICAgICAgICAgICAgICAgICAgICAgaW50IHRvcFJ1YnlC YXNlTGVhZGluZyA9IHJ1YnlCYXNlLT5sb2dpY2FsVG9wKCkgKyAocnVieUJhc2UtPmZpcnN0Um9v dEJveCgpID8gcnVieUJhc2UtPmZpcnN0Um9vdEJveCgpLT5saW5lVG9wKCkgOiAwKTsKQEAgLTEz MDgsNyArMTMwOCw3IEBAIGludCBJbmxpbmVGbG93Qm94Ojpjb21wdXRlT3ZlckFubm90YXRpb25B ZGp1c3RtZW50KGludCBhbGxvd2VkUG9zaXRpb24pIGNvbnN0CiAgICAgICAgICAgICByZXN1bHQg PSBtYXgocmVzdWx0LCBzdGF0aWNfY2FzdDxJbmxpbmVGbG93Qm94Kj4oY3VyciktPmNvbXB1dGVP dmVyQW5ub3RhdGlvbkFkanVzdG1lbnQoYWxsb3dlZFBvc2l0aW9uKSk7CiAgICAgICAgIAogICAg ICAgICBpZiAoY3Vyci0+cmVuZGVyZXIoKS0+aXNSZXBsYWNlZCgpICYmIGN1cnItPnJlbmRlcmVy KCktPmlzUnVieVJ1bigpKSB7Ci0gICAgICAgICAgICBSZW5kZXJSdWJ5UnVuKiBydWJ5UnVuID0g c3RhdGljX2Nhc3Q8UmVuZGVyUnVieVJ1bio+KGN1cnItPnJlbmRlcmVyKCkpOworICAgICAgICAg ICAgUmVuZGVyUnVieVJ1biogcnVieVJ1biA9IHRvUmVuZGVyUnVieVJ1bihjdXJyLT5yZW5kZXJl cigpKTsKICAgICAgICAgICAgIFJlbmRlclJ1YnlUZXh0KiBydWJ5VGV4dCA9IHJ1YnlSdW4tPnJ1 YnlUZXh0KCk7CiAgICAgICAgICAgICBpZiAoIXJ1YnlUZXh0KQogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmluZGV4 IGI4MWI4ZmE2YjBiNjhhODgwZGVmODQwYWMxZTAzNGZjMzNhZThhNTUuLjRlYTQ1YTcyMTBmMWFk NjkyMGE4MDExNThkYTA3OTMwOTg5MjU4ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lVGV4dEJveC5jcHAKQEAgLTQ1Miw3ICs0NTIsNyBAQCBib29sIElubGluZVRleHRCb3g6 OmdldEVtcGhhc2lzTWFya1Bvc2l0aW9uKFJlbmRlclN0eWxlKiBzdHlsZSwgVGV4dEVtcGhhc2lz UG9zaQogICAgIGlmICghY29udGFpbmluZ0Jsb2NrLT5wYXJlbnQoKS0+aXNSdWJ5UnVuKCkpCiAg ICAgICAgIHJldHVybiB0cnVlOyAvLyBDYW5ub3QgZ2V0IHRoZSBydWJ5IHRleHQuCiAKLSAgICBS ZW5kZXJSdWJ5VGV4dCogcnVieVRleHQgPSBzdGF0aWNfY2FzdDxSZW5kZXJSdWJ5UnVuKj4oY29u dGFpbmluZ0Jsb2NrLT5wYXJlbnQoKSktPnJ1YnlUZXh0KCk7CisgICAgUmVuZGVyUnVieVRleHQq IHJ1YnlUZXh0ID0gdG9SZW5kZXJSdWJ5UnVuKGNvbnRhaW5pbmdCbG9jay0+cGFyZW50KCkpLT5y dWJ5VGV4dCgpOwogCiAgICAgLy8gVGhlIGVtcGhhc2lzIG1hcmtzIG92ZXIgYXJlIHN1cHByZXNz ZWQgb25seSBpZiB0aGVyZSBpcyBhIHJ1YnkgdGV4dCBib3ggYW5kIGl0IG5vdCBlbXB0eS4KICAg ICByZXR1cm4gIXJ1YnlUZXh0IHx8ICFydWJ5VGV4dC0+Zmlyc3RMaW5lQm94KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4 IGNhNjMyMzhjZWFmY2E0ODgwODQ1MmE0NDdkMDAzYWU4YjUyYmIwNjQuLjMxMWJhNTVjMWY5NWI3 NDAwNDAzZDgxNjliNzc5ZTQyZjcyYzU3ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC0yMjU0LDcgKzIyNTQsNyBAQCBJ bmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6TGluZUJyZWFrZXI6Om5leHRMaW5lQnJlYWsoSW5s aW5lQmlkaVJlc29sdmVyJiByZXNvbAogI2lmIEVOQUJMRShTVkcpCiAgICAgICAgICAgICAgICAg aWYgKGlzU1ZHVGV4dCAmJiBjdXJyZW50Lm1fcG9zID4gMCkgewogICAgICAgICAgICAgICAgICAg ICAvLyBGb3JjZSBjcmVhdGlvbiBvZiBuZXcgSW5saW5lQm94ZXMgZm9yIGVhY2ggYWJzb2x1dGUg cG9zaXRpb25lZCBjaGFyYWN0ZXIgKHRob3NlIHRoYXQgc3RhcnQgbmV3IHRleHQgY2h1bmtzKS4K LSAgICAgICAgICAgICAgICAgICAgaWYgKHN0YXRpY19jYXN0PFJlbmRlclNWR0lubGluZVRleHQq Pih0KS0+Y2hhcmFjdGVyU3RhcnRzTmV3VGV4dENodW5rKGN1cnJlbnQubV9wb3MpKSB7CisgICAg ICAgICAgICAgICAgICAgIGlmICh0b1JlbmRlclNWR0lubGluZVRleHQodCktPmNoYXJhY3RlclN0 YXJ0c05ld1RleHRDaHVuayhjdXJyZW50Lm1fcG9zKSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgYWRkTWlkcG9pbnQobGluZU1pZHBvaW50U3RhdGUsIElubGluZUl0ZXJhdG9yKDAsIGN1cnJl bnQubV9vYmosIGN1cnJlbnQubV9wb3MgLSAxKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBh ZGRNaWRwb2ludChsaW5lTWlkcG9pbnRTdGF0ZSwgSW5saW5lSXRlcmF0b3IoMCwgY3VycmVudC5t X29iaiwgY3VycmVudC5tX3BvcykpOwogICAgICAgICAgICAgICAgICAgICB9CkBAIC0yMjcyLDcg KzIyNzIsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6TGluZUJyZWFrZXI6Om5leHRM aW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbAogICAgICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgICAgIGlmIChjb2xsYXBzZVdoaXRlU3BhY2UgJiYgY3VycmVudENoYXJhY3Rl cklzU3BhY2UgJiYgIWlnbm9yaW5nU3BhY2VzKQotICAgICAgICAgICAgICAgICAgICB0cmFpbGlu Z09iamVjdHMuc2V0VHJhaWxpbmdXaGl0ZXNwYWNlKHN0YXRpY19jYXN0PFJlbmRlclRleHQqPihj dXJyZW50Lm1fb2JqKSk7CisgICAgICAgICAgICAgICAgICAgIHRyYWlsaW5nT2JqZWN0cy5zZXRU cmFpbGluZ1doaXRlc3BhY2UodG9SZW5kZXJUZXh0KGN1cnJlbnQubV9vYmopKTsKICAgICAgICAg ICAgICAgICBlbHNlIGlmICghY3VycmVudC5tX29iai0+c3R5bGUoKS0+Y29sbGFwc2VXaGl0ZVNw YWNlKCkgfHwgIWN1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlKQogICAgICAgICAgICAgICAgICAgICB0 cmFpbGluZ09iamVjdHMuY2xlYXIoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggZjdmMjQ4MTQ5YTJhZTZkMWQzNTc4ODUzMzJmODcxM2I1ZWY0NThlMC4u NDAzNTIzNzk2ZDFhNGM0M2VhZGJmZTBjOWFjOTNlMzBjMDU5YTE5YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0xOTAzLDcgKzE5MDMsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpkZXN0cm95U2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0 aW9uKQogICAgIFJlZlB0cjxTY3JvbGxiYXI+JiBzY3JvbGxiYXIgPSBvcmllbnRhdGlvbiA9PSBI b3Jpem9udGFsU2Nyb2xsYmFyID8gbV9oQmFyIDogbV92QmFyOwogICAgIGlmIChzY3JvbGxiYXIp IHsKICAgICAgICAgaWYgKHNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkKLSAgICAgICAg ICAgIHN0YXRpY19jYXN0PFJlbmRlclNjcm9sbGJhcio+KHNjcm9sbGJhci5nZXQoKSktPmNsZWFy T3duaW5nUmVuZGVyZXIoKTsKKyAgICAgICAgICAgIHRvUmVuZGVyU2Nyb2xsYmFyKHNjcm9sbGJh ci5nZXQoKSktPmNsZWFyT3duaW5nUmVuZGVyZXIoKTsKICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKICAgICAgICAgICAg ICAgICB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnkuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnkuY3BwCmluZGV4IDBiNTEzODQ1NTUzZjBkNTIy NTg1NjIzMDAyYzhiMWQ5NGY2NThmOTQuLjE2YjBhNzYzZjk5YTc3NDJmNDMwMjdkZTQyZjZlYjFh ZTYyNTc1MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieS5jcHAKQEAgLTUy LDEzICs1MiwxMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBbm9ueW1vdXNSdWJ5SW5saW5lQmxv Y2soUmVuZGVyT2JqZWN0KiBvYmplY3QpCiBzdGF0aWMgaW5saW5lIFJlbmRlckJsb2NrKiBydWJ5 QmVmb3JlQmxvY2soY29uc3QgUmVuZGVyT2JqZWN0KiBydWJ5KQogewogICAgIFJlbmRlck9iamVj dCogY2hpbGQgPSBydWJ5LT5maXJzdENoaWxkKCk7Ci0gICAgcmV0dXJuIGNoaWxkICYmICFjaGls ZC0+aXNSdWJ5UnVuKCkgJiYgY2hpbGQtPmlzUmVuZGVyQmxvY2soKSAmJiBjaGlsZC0+c3R5bGUo KS0+c3R5bGVUeXBlKCkgPT0gQkVGT1JFID8gc3RhdGljX2Nhc3Q8UmVuZGVyQmxvY2sqPihjaGls ZCkgOiAwOworICAgIHJldHVybiBjaGlsZCAmJiAhY2hpbGQtPmlzUnVieVJ1bigpICYmIGNoaWxk LT5pc1JlbmRlckJsb2NrKCkgJiYgY2hpbGQtPnN0eWxlKCktPnN0eWxlVHlwZSgpID09IEJFRk9S RSA/IHRvUmVuZGVyQmxvY2soY2hpbGQpIDogMDsKIH0KIAogc3RhdGljIGlubGluZSBSZW5kZXJC bG9jayogcnVieUFmdGVyQmxvY2soY29uc3QgUmVuZGVyT2JqZWN0KiBydWJ5KQogewogICAgIFJl bmRlck9iamVjdCogY2hpbGQgPSBydWJ5LT5sYXN0Q2hpbGQoKTsKLSAgICByZXR1cm4gY2hpbGQg JiYgIWNoaWxkLT5pc1J1YnlSdW4oKSAmJiBjaGlsZC0+aXNSZW5kZXJCbG9jaygpICYmIGNoaWxk LT5zdHlsZSgpLT5zdHlsZVR5cGUoKSA9PSBBRlRFUiA/IHN0YXRpY19jYXN0PFJlbmRlckJsb2Nr Kj4oY2hpbGQpIDogMDsKKyAgICByZXR1cm4gY2hpbGQgJiYgIWNoaWxkLT5pc1J1YnlSdW4oKSAm JiBjaGlsZC0+aXNSZW5kZXJCbG9jaygpICYmIGNoaWxkLT5zdHlsZSgpLT5zdHlsZVR5cGUoKSA9 PSBBRlRFUiA/IHRvUmVuZGVyQmxvY2soY2hpbGQpIDogMDsKIH0KIAogc3RhdGljIFJlbmRlckJs b2NrKiBjcmVhdGVBbm9ueW1vdXNSdWJ5SW5saW5lQmxvY2soUmVuZGVyT2JqZWN0KiBydWJ5LCBQ c2V1ZG9JZCBzdHlsZVR5cGUpCkBAIC03OCwxNCArNzgsMTQgQEAgc3RhdGljIFJlbmRlclJ1YnlS dW4qIGxhc3RSdWJ5UnVuKGNvbnN0IFJlbmRlck9iamVjdCogcnVieSkKICAgICBpZiAoY2hpbGQg JiYgIWNoaWxkLT5pc1J1YnlSdW4oKSkKICAgICAgICAgY2hpbGQgPSBjaGlsZC0+cHJldmlvdXNT aWJsaW5nKCk7CiAgICAgQVNTRVJUKCFjaGlsZCB8fCBjaGlsZC0+aXNSdWJ5UnVuKCkgfHwgY2hp bGQtPmlzQmVmb3JlQ29udGVudCgpIHx8IGNoaWxkID09IHJ1YnlCZWZvcmVCbG9jayhydWJ5KSk7 Ci0gICAgcmV0dXJuIGNoaWxkICYmIGNoaWxkLT5pc1J1YnlSdW4oKSA/IHN0YXRpY19jYXN0PFJl bmRlclJ1YnlSdW4qPihjaGlsZCkgOiAwOworICAgIHJldHVybiBjaGlsZCAmJiBjaGlsZC0+aXNS dWJ5UnVuKCkgPyB0b1JlbmRlclJ1YnlSdW4oY2hpbGQpIDogMDsKIH0KIAogc3RhdGljIGlubGlu ZSBSZW5kZXJSdWJ5UnVuKiBmaW5kUnVieVJ1blBhcmVudChSZW5kZXJPYmplY3QqIGNoaWxkKQog ewogICAgIHdoaWxlIChjaGlsZCAmJiAhY2hpbGQtPmlzUnVieVJ1bigpKQogICAgICAgICBjaGls ZCA9IGNoaWxkLT5wYXJlbnQoKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVuZGVyUnVieVJ1 bio+KGNoaWxkKTsKKyAgICByZXR1cm4gdG9SZW5kZXJSdWJ5UnVuKGNoaWxkKTsKIH0KIAogLy89 PT0gcnVieSBhcyBpbmxpbmUgb2JqZWN0ID09PQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSdWJ5QmFzZS5jcHAKaW5kZXggZDI4NTE1NzI4YTg3OGY3MWE4MjhjMmFmYWJmMWRmODcx MzlhMDdjYS4uNDY0MzQ2ZGU4YTMwMjE3NWNjMGFjZWI3NTJhMDI4ZmY2NmIwMWNhNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieUJhc2UuY3BwCkBAIC0xOTEsNyArMTkx LDcgQEAgUmVuZGVyUnVieVJ1biogUmVuZGVyUnVieUJhc2U6OnJ1YnlSdW4oKSBjb25zdAogICAg IEFTU0VSVChwYXJlbnQoKSk7CiAgICAgQVNTRVJUKHBhcmVudCgpLT5pc1J1YnlSdW4oKSk7CiAK LSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVuZGVyUnVieVJ1bio+KHBhcmVudCgpKTsKKyAgICBy ZXR1cm4gdG9SZW5kZXJSdWJ5UnVuKHBhcmVudCgpKTsKIH0KIAogRVRleHRBbGlnbiBSZW5kZXJS dWJ5QmFzZTo6dGV4dEFsaWdubWVudEZvckxpbmUoYm9vbCAvKiBlbmRzV2l0aFNvZnRCcmVhayAq LykgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5 UnVuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5UnVuLmNwcAppbmRl eCAxMzI5ZDY1NTdiMWRhZDViMDZiMDQ2ZTlkMjhiYWU0MWNlNDM2ODk0Li42M2QyYmQ0OWNiNDU3 YzM1ZTJjZWM4Y2U4YzIwZWZiNmM5ZWQ5YmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJ1YnlSdW4uY3BwCkBAIC0xNTksNyArMTU5LDcgQEAgdm9pZCBSZW5kZXJSdWJ5UnVu OjpyZW1vdmVDaGlsZChSZW5kZXJPYmplY3QqIGNoaWxkKQogICAgICAgICBSZW5kZXJPYmplY3Qq IHJpZ2h0TmVpZ2hib3VyID0gbmV4dFNpYmxpbmcoKTsKICAgICAgICAgaWYgKGJhc2UgJiYgcmln aHROZWlnaGJvdXIgJiYgcmlnaHROZWlnaGJvdXItPmlzUnVieVJ1bigpKSB7CiAgICAgICAgICAg ICAvLyBSdWJ5IHJ1biB3aXRob3V0IGEgYmFzZSBjYW4gaGFwcGVuIG9ubHkgYXQgdGhlIGZpcnN0 IHJ1bi4KLSAgICAgICAgICAgIFJlbmRlclJ1YnlSdW4qIHJpZ2h0UnVuID0gc3RhdGljX2Nhc3Q8 UmVuZGVyUnVieVJ1bio+KHJpZ2h0TmVpZ2hib3VyKTsKKyAgICAgICAgICAgIFJlbmRlclJ1YnlS dW4qIHJpZ2h0UnVuID0gdG9SZW5kZXJSdWJ5UnVuKHJpZ2h0TmVpZ2hib3VyKTsKICAgICAgICAg ICAgIGlmIChyaWdodFJ1bi0+aGFzUnVieUJhc2UoKSkgewogICAgICAgICAgICAgICAgIFJlbmRl clJ1YnlCYXNlKiByaWdodEJhc2UgPSByaWdodFJ1bi0+cnVieUJhc2VTYWZlKCk7CiAgICAgICAg ICAgICAgICAgLy8gQ29sbGVjdCBhbGwgY2hpbGRyZW4gaW4gYSBzaW5nbGUgYmFzZSwgdGhlbiBz d2FwIHRoZSBiYXNlcy4K