135512 2014-08-01 10:36:03 -0700 nullptr goodness in RenderLayer 2014-08-01 11:20:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1026263 0 simon.fraser 2014-08-01 10:36:03 -0700 nullptr goodness in RenderLayer 1026264 1 235893 simon.fraser 2014-08-01 10:36:59 -0700 Created attachment 235893 Patch 1026265 2 235893 bfulgham 2014-08-01 10:38:16 -0700 Comment on attachment 235893 Patch r=me! 1026280 3 235893 commit-queue 2014-08-01 11:20:27 -0700 Comment on attachment 235893 Patch Clearing flags on attachment: 235893 Committed r171925: <http://trac.webkit.org/changeset/171925> 1026281 4 commit-queue 2014-08-01 11:20:30 -0700 All reviewed patches have been landed. Closing bug. 235893 2014-08-01 10:36:59 -0700 2014-08-01 11:20:27 -0700 Patch bug-135512-20140801103646.patch text/plain 9286 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxOTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA4OTZmYjJmNWY5OGRm Y2ZiOGM4OTg4N2I4YTkwOGE4MDMxNDQzNC4uMTI0NTQ5ZWJkMjJmNDFhMmJiZTdkYTJkZDgzMjUz ZjM2MjY1OTA5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA4LTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIG51bGxwdHIgZ29v ZG5lc3MgaW4gUmVuZGVyTGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNTUxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVzZSBudWxscHRyIGluIFJlbmRlckxheWVyLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpS ZW5kZXJMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlRGVzY2Vu ZGFudERlcGVuZGVudEZsYWdzKToKKyAgICAgICAgKFdlYkNvcmU6OmFjY3VtdWxhdGVPZmZzZXRU b3dhcmRzQW5jZXN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFJl Y3RUb1Zpc2libGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmRlc3Ryb3lTY3Jv bGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50 cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6aGl0VGVzdEZpeGVkTGF5ZXJzSW5O YW1lZEZsb3dzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoaXRUZXN0TGF5ZXIp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmhpdFRlc3RMaXN0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMpOgorCiAyMDE0LTA4LTAx ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgUmVw bGFjZSBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwgd2l0aCBOZXZlckRlc3Ryb3llZDxU PiBpbiBOYXZpZ2F0b3JDb250ZW50VXRpbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCmluZGV4IGZjM2UxMWFhZTkwNjJjNWYwNmU5MGRjOThmYTkyMTMyZjljZTI3YjIu LjZkNTcyODRiZTdhMDhmNmZkNzIwYmZhMzgyMGM0MTk1NDk4OTYxNTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTkxLDE0ICsxOTEsMTQgQEAgUmVuZGVy TGF5ZXI6OlJlbmRlckxheWVyKFJlbmRlckxheWVyTW9kZWxPYmplY3QmIHJlbmRlcmVyTGF5ZXJN b2RlbE9iamVjdCkKICAgICAsIG1faGFzTm90SXNvbGF0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzU3Rh dHVzRGlydHkoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fcmVuZGVyZXIocmVuZGVyZXJMYXllck1v ZGVsT2JqZWN0KQotICAgICwgbV9wYXJlbnQoMCkKLSAgICAsIG1fcHJldmlvdXMoMCkKLSAgICAs IG1fbmV4dCgwKQotICAgICwgbV9maXJzdCgwKQotICAgICwgbV9sYXN0KDApCisgICAgLCBtX3Bh cmVudChudWxscHRyKQorICAgICwgbV9wcmV2aW91cyhudWxscHRyKQorICAgICwgbV9uZXh0KG51 bGxwdHIpCisgICAgLCBtX2ZpcnN0KG51bGxwdHIpCisgICAgLCBtX2xhc3QobnVsbHB0cikKICAg ICAsIG1fc3RhdGljSW5saW5lUG9zaXRpb24oMCkKICAgICAsIG1fc3RhdGljQmxvY2tQb3NpdGlv bigwKQotICAgICwgbV9lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIoMCkKKyAgICAsIG1fZW5jbG9z aW5nUGFnaW5hdGlvbkxheWVyKG51bGxwdHIpCiB7CiAgICAgbV9pc05vcm1hbEZsb3dPbmx5ID0g c2hvdWxkQmVOb3JtYWxGbG93T25seSgpOwogICAgIG1faXNTZWxmUGFpbnRpbmdMYXllciA9IHNo b3VsZEJlU2VsZlBhaW50aW5nTGF5ZXIoKTsKQEAgLTExMzksNyArMTEzOSw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnVwZGF0ZURlc2NlbmRhbnREZXBlbmRlbnRGbGFncyhIYXNoU2V0PGNvbnN0IFJl bmRlck9iamVjdCo+KiBvCiAgICAgICAgICAgICAgICAgICAgIGRvIHsKICAgICAgICAgICAgICAg ICAgICAgICAgIHIgPSByLT5wYXJlbnQoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChy ID09ICZyZW5kZXJlcigpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHIgPSAwOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHIgPSBudWxscHRyOwogICAgICAgICAgICAgICAgICAg ICB9IHdoaWxlIChyICYmICFyLT5uZXh0U2libGluZygpKTsKICAgICAgICAgICAgICAgICAgICAg aWYgKHIpCiAgICAgICAgICAgICAgICAgICAgICAgICByID0gci0+bmV4dFNpYmxpbmcoKTsKQEAg LTE4OTQsNyArMTg5NCw3IEBAIHN0YXRpYyBpbmxpbmUgY29uc3QgUmVuZGVyTGF5ZXIqIGFjY3Vt dWxhdGVPZmZzZXRUb3dhcmRzQW5jZXN0b3IoY29uc3QgUmVuZGVyTGF5CiAgICAgLy8gRklYTUU6 IFNwZWNpYWwgY2FzaW5nIFJlbmRlckZsb3dUaHJlYWQgc28gbXVjaCBmb3IgZml4ZWQgcG9zaXRp b25pbmcgaGVyZSBpcyBub3QgZ3JlYXQuCiAgICAgUmVuZGVyRmxvd1RocmVhZCogZml4ZWRGbG93 VGhyZWFkQ29udGFpbmVyID0gcG9zaXRpb24gPT0gRml4ZWRQb3NpdGlvbiA/IHJlbmRlcmVyLmZs b3dUaHJlYWRDb250YWluaW5nQmxvY2soKSA6IDA7CiAgICAgaWYgKGZpeGVkRmxvd1RocmVhZENv bnRhaW5lciAmJiAhZml4ZWRGbG93VGhyZWFkQ29udGFpbmVyLT5pc091dE9mRmxvd1Bvc2l0aW9u ZWQoKSkKLSAgICAgICAgZml4ZWRGbG93VGhyZWFkQ29udGFpbmVyID0gMDsKKyAgICAgICAgZml4 ZWRGbG93VGhyZWFkQ29udGFpbmVyID0gbnVsbHB0cjsKIAogICAgIC8vIEZJWE1FOiBQb3NpdGlv bmluZyBvZiBvdXQtb2YtZmxvdyhmaXhlZCwgYWJzb2x1dGUpIGVsZW1lbnRzIGNvbGxlY3RlZCBp biBhIFJlbmRlckZsb3dUaHJlYWQKICAgICAvLyBtYXkgbmVlZCB0byBiZSByZXZpc2l0ZWQgaW4g YSBmdXR1cmUgcGF0Y2guCkBAIC0xOTE2LDcgKzE5MTYsNyBAQCBzdGF0aWMgaW5saW5lIGNvbnN0 IFJlbmRlckxheWVyKiBhY2N1bXVsYXRlT2Zmc2V0VG93YXJkc0FuY2VzdG9yKGNvbnN0IFJlbmRl ckxheQogICAgICAgICAvLyBGb3IgYSBmaXhlZCBsYXllcnMsIHdlIG5lZWQgdG8gd2FsayB1cCB0 byB0aGUgcm9vdCB0byBzZWUgaWYgdGhlcmUncyBhIGZpeGVkIHBvc2l0aW9uIGNvbnRhaW5lcgog ICAgICAgICAvLyAoZS5nLiBhIHRyYW5zZm9ybWVkIGxheWVyKS4gSXQncyBhbiBlcnJvciB0byBj YWxsIG9mZnNldEZyb21BbmNlc3RvcigpIGFjcm9zcyBhIGxheWVyIHdpdGggYSB0cmFuc2Zvcm0s CiAgICAgICAgIC8vIHNvIHdlIHNob3VsZCBhbHdheXMgZmluZCB0aGUgYW5jZXN0b3IgYXQgb3Ig YmVmb3JlIHdlIGZpbmQgdGhlIGZpeGVkIHBvc2l0aW9uIGNvbnRhaW5lci4KLSAgICAgICAgUmVu ZGVyTGF5ZXIqIGZpeGVkUG9zaXRpb25Db250YWluZXJMYXllciA9IDA7CisgICAgICAgIFJlbmRl ckxheWVyKiBmaXhlZFBvc2l0aW9uQ29udGFpbmVyTGF5ZXIgPSBudWxscHRyOwogICAgICAgICBi b29sIGZvdW5kQW5jZXN0b3IgPSBmYWxzZTsKICAgICAgICAgZm9yIChSZW5kZXJMYXllciogY3Vy ckxheWVyID0gbGF5ZXItPnBhcmVudCgpOyBjdXJyTGF5ZXI7IGN1cnJMYXllciA9IGN1cnJMYXll ci0+cGFyZW50KCkpIHsKICAgICAgICAgICAgIGlmIChjdXJyTGF5ZXIgPT0gYW5jZXN0b3JMYXll cikKQEAgLTIzMzgsNyArMjMzOCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBmcmFtZUVsZW1lbnRB bmRWaWV3UGVybWl0U2Nyb2xsKEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsCiAKIHZvaWQg UmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwg Y29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblgsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxp Z25ZKQogewotICAgIFJlbmRlckxheWVyKiBwYXJlbnRMYXllciA9IDA7CisgICAgUmVuZGVyTGF5 ZXIqIHBhcmVudExheWVyID0gbnVsbHB0cjsKICAgICBMYXlvdXRSZWN0IG5ld1JlY3QgPSByZWN0 OwogCiAgICAgLy8gV2UgbWF5IGVuZCB1cCBwcm9wYWdhdGluZyBhIHNjcm9sbCBldmVudC4gSXQg aXMgaW1wb3J0YW50IHRoYXQgd2Ugc3VzcGVuZCBldmVudHMgdW50aWwgCkBAIC0yMzcyLDcgKzIz NzIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxlKGNvbnN0IExheW91 dFJlY3QmIHJlY3QsIGNvbnN0IFNjcm9sbEFsaWdubQogICAgICAgICBFbGVtZW50KiBvd25lckVs ZW1lbnQgPSByZW5kZXJlcigpLmRvY3VtZW50KCkub3duZXJFbGVtZW50KCk7CiAKICAgICAgICAg aWYgKG93bmVyRWxlbWVudCAmJiBvd25lckVsZW1lbnQtPnJlbmRlcmVyKCkpIHsKLSAgICAgICAg ICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsZW1lbnRCYXNlID0gMDsKKyAgICAgICAg ICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsZW1lbnRCYXNlID0gbnVsbHB0cjsKIAog ICAgICAgICAgICAgaWYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3du ZXJFbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpCiAgICAgICAgICAgICAgICAgZnJhbWVF bGVtZW50QmFzZSA9IHRvSFRNTEZyYW1lRWxlbWVudEJhc2Uob3duZXJFbGVtZW50KTsKQEAgLTIz OTUsNyArMjM5NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUoY29u c3QgTGF5b3V0UmVjdCYgcmVjdCwgY29uc3QgU2Nyb2xsQWxpZ25tCiAgICAgICAgICAgICAgICAg ICAgIG5ld1JlY3Quc2V0WChyZWN0LngoKSAtIGZyYW1lVmlldy5zY3JvbGxYKCkgKyBmcmFtZVZp ZXcueCgpKTsKICAgICAgICAgICAgICAgICAgICAgbmV3UmVjdC5zZXRZKHJlY3QueSgpIC0gZnJh bWVWaWV3LnNjcm9sbFkoKSArIGZyYW1lVmlldy55KCkpOwogICAgICAgICAgICAgICAgIH0gZWxz ZQotICAgICAgICAgICAgICAgICAgICBwYXJlbnRMYXllciA9IDA7CisgICAgICAgICAgICAgICAg ICAgIHBhcmVudExheWVyID0gbnVsbHB0cjsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNl IHsKICNpZiAhUExBVEZPUk0oSU9TKQpAQCAtMjk2Miw3ICsyOTYyLDcgQEAgdm9pZCBSZW5kZXJM YXllcjo6ZGVzdHJveVNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikK IAogICAgIHNjcm9sbGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgIHNjcm9sbGJhci0+ZGlz Y29ubmVjdEZyb21TY3JvbGxhYmxlQXJlYSgpOwotICAgIHNjcm9sbGJhciA9IDA7CisgICAgc2Ny b2xsYmFyID0gbnVsbHB0cjsKIH0KIAogYm9vbCBSZW5kZXJMYXllcjo6c2Nyb2xsc092ZXJmbG93 KCkgY29uc3QKQEAgLTQwNDAsNyArNDA0MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5 ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAg ICAgLy8gaXMgZG9uZSBieSBwYXNzaW5nIGEgbmlsIHN1YnRyZWVQYWludFJvb3QgZG93biB0byBv dXIgcmVuZGVyZXIgKGFzIGlmIG5vIHN1YnRyZWVQYWludFJvb3Qgd2FzIGV2ZXIgc2V0KS4KICAg ICAvLyBPdGhlcndpc2UsIG91ciByZW5kZXJlciB0cmVlIG1heSBvciBtYXkgbm90IGNvbnRhaW4g dGhlIHN1YnRyZWVQYWludFJvb3Qgcm9vdCwgc28gd2UgcGFzcyB0aGF0IHJvb3QgYWxvbmcKICAg ICAvLyBzbyBpdCB3aWxsIGJlIHRlc3RlZCBhZ2FpbnN0IGFzIHdlIGRlc2NlbmQgdGhyb3VnaCB0 aGUgcmVuZGVyZXJzLgotICAgIFJlbmRlck9iamVjdCogc3VidHJlZVBhaW50Um9vdEZvclJlbmRl cmVyID0gMDsKKyAgICBSZW5kZXJPYmplY3QqIHN1YnRyZWVQYWludFJvb3RGb3JSZW5kZXJlciA9 IG51bGxwdHI7CiAgICAgaWYgKGxvY2FsUGFpbnRpbmdJbmZvLnN1YnRyZWVQYWludFJvb3QgJiYg IXJlbmRlcmVyKCkuaXNEZXNjZW5kYW50T2YobG9jYWxQYWludGluZ0luZm8uc3VidHJlZVBhaW50 Um9vdCkpCiAgICAgICAgIHN1YnRyZWVQYWludFJvb3RGb3JSZW5kZXJlciA9IGxvY2FsUGFpbnRp bmdJbmZvLnN1YnRyZWVQYWludFJvb3Q7CiAKQEAgLTQ3MDgsNyArNDcwOCw3IEBAIFJlbmRlckxh eWVyKiBSZW5kZXJMYXllcjo6aGl0VGVzdEZpeGVkTGF5ZXJzSW5OYW1lZEZsb3dzKFJlbmRlckxh eWVyKiAvKnJvb3RMYXllCiAgICAgcmVuZGVyZXIoKS52aWV3KCkuZmxvd1RocmVhZENvbnRyb2xs ZXIoKS5jb2xsZWN0Rml4ZWRQb3NpdGlvbmVkTGF5ZXJzKGZpeGVkTGF5ZXJzKTsKIAogICAgIC8v IEhpdCB0ZXN0IHRoZSBsYXllcnMKLSAgICBSZW5kZXJMYXllciogcmVzdWx0TGF5ZXIgPSAwOwor ICAgIFJlbmRlckxheWVyKiByZXN1bHRMYXllciA9IG51bGxwdHI7CiAgICAgZm9yIChpbnQgaSA9 IGZpeGVkTGF5ZXJzLnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgICAgIFJlbmRlckxh eWVyKiBmaXhlZExheWVyID0gZml4ZWRMYXllcnMuYXQoaSk7CiAKQEAgLTQ4MjEsOCArNDgyMSw4 IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6aGl0VGVzdExheWVyKFJlbmRlckxheWVyKiBy b290TGF5ZXIsIFJlbmRlckxheWVyKiBjb250CiAgICAgLy8gVGhlIGZvbGxvd2luZyBhcmUgdXNl ZCBmb3Iga2VlcGluZyB0cmFjayBvZiB0aGUgei1kZXB0aCBvZiB0aGUgaGl0IHBvaW50IG9mIDNk LXRyYW5zZm9ybWVkCiAgICAgLy8gZGVzY2VuZGFudHMuCiAgICAgZG91YmxlIGxvY2FsWk9mZnNl dCA9IC1zdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCk7Ci0gICAgZG91Ymxl KiB6T2Zmc2V0Rm9yRGVzY2VuZGFudHNQdHIgPSAwOwotICAgIGRvdWJsZSogek9mZnNldEZvckNv bnRlbnRzUHRyID0gMDsKKyAgICBkb3VibGUqIHpPZmZzZXRGb3JEZXNjZW5kYW50c1B0ciA9IG51 bGxwdHI7CisgICAgZG91YmxlKiB6T2Zmc2V0Rm9yQ29udGVudHNQdHIgPSBudWxscHRyOwogICAg IAogICAgIGJvb2wgZGVwdGhTb3J0RGVzY2VuZGFudHMgPSBmYWxzZTsKICAgICBpZiAocHJlc2Vy dmVzM0QoKSkgewpAQCAtNDgzMSwxMyArNDgzMSwxMyBAQCBSZW5kZXJMYXllciogUmVuZGVyTGF5 ZXI6OmhpdFRlc3RMYXllcihSZW5kZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJMYXllciogY29u dAogICAgICAgICB6T2Zmc2V0Rm9yRGVzY2VuZGFudHNQdHIgPSB6T2Zmc2V0ID8gek9mZnNldCA6 ICZsb2NhbFpPZmZzZXQ7CiAgICAgICAgIHpPZmZzZXRGb3JDb250ZW50c1B0ciA9IHpPZmZzZXQg PyB6T2Zmc2V0IDogJmxvY2FsWk9mZnNldDsKICAgICB9IGVsc2UgaWYgKHpPZmZzZXQpIHsKLSAg ICAgICAgek9mZnNldEZvckRlc2NlbmRhbnRzUHRyID0gMDsKKyAgICAgICAgek9mZnNldEZvckRl c2NlbmRhbnRzUHRyID0gbnVsbHB0cjsKICAgICAgICAgLy8gQ29udGFpbmVyIG5lZWRzIHVzIHRv IGdpdmUgYmFjayBhIHogb2Zmc2V0IGZvciB0aGUgaGl0IGxheWVyLgogICAgICAgICB6T2Zmc2V0 Rm9yQ29udGVudHNQdHIgPSB6T2Zmc2V0OwogICAgIH0KIAogICAgIC8vIFRoaXMgdmFyaWFibGUg dHJhY2tzIHdoaWNoIGxheWVyIHRoZSBtb3VzZSBlbmRzIHVwIGJlaW5nIGluc2lkZS4KLSAgICBS ZW5kZXJMYXllciogY2FuZGlkYXRlTGF5ZXIgPSAwOworICAgIFJlbmRlckxheWVyKiBjYW5kaWRh dGVMYXllciA9IG51bGxwdHI7CiAKICAgICAvLyBDaGVjayB0aGUgZml4ZWQgcG9zaXRpb25lZCBs YXllcnMgd2l0aGluIGZsb3cgdGhyZWFkcyB0aGF0IGFyZSBwb3NpdGlvbmVkIGJ5IHRoZSB2aWV3 LgogICAgIFJlbmRlckxheWVyKiBoaXRMYXllciA9IGhpdFRlc3RGaXhlZExheWVyc0luTmFtZWRG bG93cyhyb290TGF5ZXIsIHJlcXVlc3QsIHJlc3VsdCwgaGl0VGVzdFJlY3QsIGhpdFRlc3RMb2Nh dGlvbiwKQEAgLTUwODQsMTIgKzUwODQsMTIgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjpo aXRUZXN0TGlzdChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbGlzdCwgUmVuZGVyTGF5ZXIqIHIKICAg ICBpZiAoIWhhc1NlbGZQYWludGluZ0xheWVyRGVzY2VuZGFudCgpKQogICAgICAgICByZXR1cm4g MDsKIAotICAgIFJlbmRlckxheWVyKiByZXN1bHRMYXllciA9IDA7CisgICAgUmVuZGVyTGF5ZXIq IHJlc3VsdExheWVyID0gbnVsbHB0cjsKICAgICBmb3IgKGludCBpID0gbGlzdC0+c2l6ZSgpIC0g MTsgaSA+PSAwOyAtLWkpIHsKICAgICAgICAgUmVuZGVyTGF5ZXIqIGNoaWxkTGF5ZXIgPSBsaXN0 LT5hdChpKTsKICAgICAgICAgaWYgKGNoaWxkTGF5ZXItPmlzRmxvd1RocmVhZENvbGxlY3RpbmdH cmFwaGljc0xheWVyc1VuZGVyUmVnaW9ucygpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgIFJlbmRlckxheWVyKiBoaXRMYXllciA9IDA7CisgICAgICAgIFJlbmRlckxheWVyKiBoaXRM YXllciA9IG51bGxwdHI7CiAgICAgICAgIEhpdFRlc3RSZXN1bHQgdGVtcFJlc3VsdChyZXN1bHQu aGl0VGVzdExvY2F0aW9uKCkpOwogICAgICAgICBoaXRMYXllciA9IGNoaWxkTGF5ZXItPmhpdFRl c3RMYXllcihyb290TGF5ZXIsIHRoaXMsIHJlcXVlc3QsIHRlbXBSZXN1bHQsIGhpdFRlc3RSZWN0 LCBoaXRUZXN0TG9jYXRpb24sIGZhbHNlLCB0cmFuc2Zvcm1TdGF0ZSwgek9mZnNldEZvckRlc2Nl bmRhbnRzKTsKIApAQCAtNjc2Nyw3ICs2NzY3LDcgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVy OjpoaXRUZXN0Rmxvd1RocmVhZElmUmVnaW9uRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ20K IAogICAgIExheW91dFJlY3QgcmVnaW9uQ29udGVudEJveCA9IHRvUmVuZGVyQmxvY2tGbG93KCZy ZW5kZXJlcigpKS0+Y29udGVudEJveFJlY3QoKTsKIAotICAgIFJlbmRlckxheWVyKiByZXN1bHRM YXllciA9IDA7CisgICAgUmVuZGVyTGF5ZXIqIHJlc3VsdExheWVyID0gbnVsbHB0cjsKICAgICBm b3IgKGludCBpID0gZnJhZ21lbnRzLnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgICAg IGNvbnN0IExheWVyRnJhZ21lbnQmIGZyYWdtZW50ID0gZnJhZ21lbnRzLmF0KGkpOwogCg==