168156 2017-02-10 18:19:47 -0800 REGRESSION(r212154): broke internal builds (Requested by smfr on #webkit). 2017-02-10 18:21:59 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 168131 1 commit-queue commit-queue andersca bdakin oldest_to_newest 1275689 0 commit-queue 2017-02-10 18:19:47 -0800 http://trac.webkit.org/changeset/212154 broke the build: broke internal builds (Requested by smfr on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1275691 1 301232 commit-queue 2017-02-10 18:20:01 -0800 Created attachment 301232 ROLLOUT of r212154 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1275692 2 301232 commit-queue 2017-02-10 18:21:56 -0800 Comment on attachment 301232 ROLLOUT of r212154 Clearing flags on attachment: 301232 Committed r212170: <http://trac.webkit.org/changeset/212170> 1275693 3 commit-queue 2017-02-10 18:21:59 -0800 All reviewed patches have been landed. Closing bug. 301232 2017-02-10 18:20:01 -0800 2017-02-10 18:21:56 -0800 ROLLOUT of r212154 bug-168156-20170210211734.patch text/plain 21038 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg2ODA5NWRmZGRmOWFj NjM2Mzk0MDI1MzQ1ODIwNTlhMjI3YzY4OC4uZmRlYmY3YWRhZWY1NzcwZjhmMTQ2ZDU2YWIzZWUw ZmFlNmNiMjQzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAyLTEwICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjEyMTU0LCByMjEyMTU0LCBhbmQgcjIxMjE1Ni4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODE1NgorCisgICAgICAgIGJy b2tlIGludGVybmFsIGJ1aWxkcyAoUmVxdWVzdGVkIGJ5IHNtZnIgb24gI3dlYmtpdCkuCisKKyAg ICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0czoKKworICAgICAgICAiQWRkIGEgRHJhZ0ltYWdlIGNs YXNzIHRoYXQgd3JhcHMgYSBEcmFnSW1hZ2VSZWYiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjgxMzEKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0 Lm9yZy9jaGFuZ2VzZXQvMjEyMTU0CisKKyAgICAgICAgIkFkZCBhIERyYWdJbWFnZSBjbGFzcyB0 aGF0IHdyYXBzIGEgRHJhZ0ltYWdlUmVmIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MTMxCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcv Y2hhbmdlc2V0LzIxMjE1NAorCisgICAgICAgICJUcnkgdG8gZml4IHRoZSBpT1MgYW5kIFdpbmRv d3MgYnVpbGRzLiIKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjEy MTU2CisKIDIwMTctMDItMTAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4K IAogICAgICAgICBGaXggdGhlICFFTkFCTEUoV0VCR0wpIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRGF0YVRyYW5zZmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9EYXRh VHJhbnNmZXIuY3BwCmluZGV4IDA4YTkxNDk4YjcwNDcxMGM2OTYzMWFmODU4ODVhNzdmNjA2NjBm ZTMuLmFmNjlmYTBkMGM3NDI5MDBiNWJkMDM1ZTliMGFlYWZkZTA2OWNmMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9EYXRhVHJhbnNmZXIuY3BwCkBAIC0yODMsMTEgKzI4MywxMSBAQCB2b2lkIERhdGFUcmFu c2Zlcjo6dXBkYXRlRHJhZ0ltYWdlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW50UG9pbnQg Y29tcHV0ZWRIb3RTcG90OwotICAgIGF1dG8gY29tcHV0ZWRJbWFnZSA9IERyYWdJbWFnZSB7IGNy ZWF0ZURyYWdJbWFnZShjb21wdXRlZEhvdFNwb3QpIH07CisgICAgRHJhZ0ltYWdlUmVmIGNvbXB1 dGVkSW1hZ2UgPSBjcmVhdGVEcmFnSW1hZ2UoY29tcHV0ZWRIb3RTcG90KTsKICAgICBpZiAoIWNv bXB1dGVkSW1hZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcGFzdGVib2FyZC0+c2V0RHJh Z0ltYWdlKFdURk1vdmUoY29tcHV0ZWRJbWFnZSksIGNvbXB1dGVkSG90U3BvdCk7CisgICAgbV9w YXN0ZWJvYXJkLT5zZXREcmFnSW1hZ2UoY29tcHV0ZWRJbWFnZSwgY29tcHV0ZWRIb3RTcG90KTsK IH0KIAogI2lmICFQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RyYWdDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwCmluZGV4IDIxMDEyMTRlMDczZGRjYzQ2OGNmZTkxOTk4YTY1MjQ2MmE2ZWM1M2IuLjkzZTQ4 N2I3Yzc4MTZiZTYyNDIyNWU4NTM4MmJmNGVlNDI3NjE5NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC03NzIsMTMgKzc3MiwxMSBAQCBib29sIERyYWdDb250cm9s bGVyOjpzdGFydERyYWcoRnJhbWUmIHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09w ZXJhdGlvbgogICAgIGVsc2UKICAgICAgICAgc291cmNlQ29udGFpbnNIaXROb2RlID0gc3RhdGUu c291cmNlLT5jb250YWluc0luY2x1ZGluZ1NoYWRvd0RPTShoaXRUZXN0UmVzdWx0LmlubmVyTm9k ZSgpKTsKIAotICAgIGlmICghc291cmNlQ29udGFpbnNIaXROb2RlKSB7CisgICAgaWYgKCFzb3Vy Y2VDb250YWluc0hpdE5vZGUpCiAgICAgICAgIC8vIFRoZSBvcmlnaW5hbCBub2RlIGJlaW5nIGRy YWdnZWQgaXNuJ3QgdW5kZXIgdGhlIGRyYWcgb3JpZ2luIGFueW1vcmUuLi4gbWF5YmUgaXQgd2Fz CiAgICAgICAgIC8vIGhpZGRlbiBvciBtb3ZlZCBvdXQgZnJvbSB1bmRlciB0aGUgY3Vyc29yLiBS ZWdhcmRsZXNzLCB3ZSBkb24ndCB3YW50IHRvIHN0YXJ0IGEgZHJhZyBvbgogICAgICAgICAvLyBz b21ldGhpbmcgdGhhdCdzIG5vdCBhY3R1YWxseSB1bmRlciB0aGUgZHJhZyBvcmlnaW4uCiAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KICAgICBVUkwgbGlua1VSTCA9IGhpdFRlc3RSZXN1 bHQuYWJzb2x1dGVMaW5rVVJMKCk7CiAgICAgVVJMIGltYWdlVVJMID0gaGl0VGVzdFJlc3VsdC5h YnNvbHV0ZUltYWdlVVJMKCk7CiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKQEAgLTc5 MSw3ICs3ODksNyBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUmIHNyYywg Y29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgIG1fZHJhZ2dpbmdJbWFn ZVVSTCA9IFVSTCgpOwogICAgIG1fc291cmNlRHJhZ09wZXJhdGlvbiA9IHNyY09wOwogCi0gICAg RHJhZ0ltYWdlIGRyYWdJbWFnZTsKKyAgICBEcmFnSW1hZ2VSZWYgZHJhZ0ltYWdlID0gbnVsbHB0 cjsKICAgICBJbnRQb2ludCBkcmFnTG9jKDAsIDApOwogICAgIEludFBvaW50IGRyYWdJbWFnZU9m ZnNldCgwLCAwKTsKIApAQCAtNzk5LDcgKzc5Nyw3IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0 YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9u CiAKICAgICBEYXRhVHJhbnNmZXImIGRhdGFUcmFuc2ZlciA9ICpzdGF0ZS5kYXRhVHJhbnNmZXI7 CiAgICAgaWYgKHN0YXRlLnR5cGUgPT0gRHJhZ1NvdXJjZUFjdGlvbkRIVE1MKQotICAgICAgICBk cmFnSW1hZ2UgPSBEcmFnSW1hZ2UgeyBkYXRhVHJhbnNmZXIuY3JlYXRlRHJhZ0ltYWdlKGRyYWdJ bWFnZU9mZnNldCkgfTsKKyAgICAgICAgZHJhZ0ltYWdlID0gZGF0YVRyYW5zZmVyLmNyZWF0ZURy YWdJbWFnZShkcmFnSW1hZ2VPZmZzZXQpOwogICAgIGlmIChzdGF0ZS50eXBlID09IERyYWdTb3Vy Y2VBY3Rpb25TZWxlY3Rpb24gfHwgIWltYWdlVVJMLmlzRW1wdHkoKSB8fCAhbGlua1VSTC5pc0Vt cHR5KCkpCiAgICAgICAgIC8vIFNlbGVjdGlvbiwgaW1hZ2UsIGFuZCBsaW5rIGRyYWdzIHJlY2Vp dmUgYSBkZWZhdWx0IHNldCBvZiBhbGxvd2VkIGRyYWcgb3BlcmF0aW9ucyB0aGF0CiAgICAgICAg IC8vIGZvbGxvd3MgZnJvbToKQEAgLTg1Miw3ICs4NTAsNyBAQCBib29sIERyYWdDb250cm9sbGVy OjpzdGFydERyYWcoRnJhbWUmIHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJh dGlvbgogICAgICAgICB9CiAgICAgICAgIG1fY2xpZW50LndpbGxQZXJmb3JtRHJhZ1NvdXJjZUFj dGlvbihEcmFnU291cmNlQWN0aW9uU2VsZWN0aW9uLCBkcmFnT3JpZ2luLCBkYXRhVHJhbnNmZXIp OwogICAgICAgICBpZiAoIWRyYWdJbWFnZSkgewotICAgICAgICAgICAgZHJhZ0ltYWdlID0gRHJh Z0ltYWdlIHsgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uKGNyZWF0ZURyYWdJbWFnZUZvclNl bGVjdGlvbihzcmMpLCBEcmFnSW1hZ2VBbHBoYSkgfTsKKyAgICAgICAgICAgIGRyYWdJbWFnZSA9 IGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbihjcmVhdGVEcmFnSW1hZ2VGb3JTZWxlY3Rpb24o c3JjKSwgRHJhZ0ltYWdlQWxwaGEpOwogICAgICAgICAgICAgZHJhZ0xvYyA9IGRyYWdMb2NGb3JT ZWxlY3Rpb25EcmFnKHNyYyk7CiAgICAgICAgICAgICBtX2RyYWdPZmZzZXQgPSBJbnRQb2ludChk cmFnT3JpZ2luLngoKSAtIGRyYWdMb2MueCgpLCBkcmFnT3JpZ2luLnkoKSAtIGRyYWdMb2MueSgp KTsKICAgICAgICAgfQpAQCAtODYwLDcgKzg1OCw3IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0 YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9u CiAgICAgICAgIGlmICghZHJhZ0ltYWdlKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgICAgIGRvU3lzdGVtRHJhZyhXVEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdMb2MsIGRyYWdPcmln aW4sIGRyYWdJbWFnZUJvdW5kcywgZGF0YVRyYW5zZmVyLCBzcmMsIGZhbHNlKTsKKyAgICAgICAg ZG9TeXN0ZW1EcmFnKGRyYWdJbWFnZSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgZHJhZ0ltYWdlQm91 bmRzLCBkYXRhVHJhbnNmZXIsIHNyYywgZmFsc2UpOwogICAgIH0gZWxzZSBpZiAoIXNyYy5kb2N1 bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLmNhbkRpc3BsYXkobGlua1VSTCkpIHsKICAgICAgICAg c3JjLmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5 LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCAiTm90IGFsbG93ZWQgdG8gZHJhZyBsb2NhbCByZXNvdXJj ZTogIiArIGxpbmtVUkwuc3RyaW5nQ2VudGVyRWxsaXBzaXplZFRvTGVuZ3RoKCkpOwogICAgICAg ICBzdGFydGVkRHJhZyA9IGZhbHNlOwpAQCAtODgzLDcgKzg4MSw3IEBAIGJvb2wgRHJhZ0NvbnRy b2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFn T3BlcmF0aW9uCiAgICAgICAgICAgICBkb0ltYWdlRHJhZyhlbGVtZW50LCBkcmFnT3JpZ2luLCBo aXRUZXN0UmVzdWx0LmltYWdlUmVjdCgpLCBkYXRhVHJhbnNmZXIsIHNyYywgbV9kcmFnT2Zmc2V0 KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIERIVE1MIGRlZmluZWQgZHJhZyBp bWFnZQotICAgICAgICAgICAgZG9TeXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdlKSwgZHJhZ0xv YywgZHJhZ09yaWdpbiwgeyB9LCBkYXRhVHJhbnNmZXIsIHNyYywgZmFsc2UpOworICAgICAgICAg ICAgZG9TeXN0ZW1EcmFnKGRyYWdJbWFnZSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgeyB9LCBkYXRh VHJhbnNmZXIsIHNyYywgZmFsc2UpOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmICghbGlua1VS TC5pc0VtcHR5KCkgJiYgKG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25MaW5r KSkgewogICAgICAgICBpZiAoIWRhdGFUcmFuc2Zlci5wYXN0ZWJvYXJkKCkuaGFzRGF0YSgpKSB7 CkBAIC05MTIsMTQgKzkxMCwxNCBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJh bWUmIHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogCiAgICAgICAg IG1fY2xpZW50LndpbGxQZXJmb3JtRHJhZ1NvdXJjZUFjdGlvbihEcmFnU291cmNlQWN0aW9uTGlu aywgZHJhZ09yaWdpbiwgZGF0YVRyYW5zZmVyKTsKICAgICAgICAgaWYgKCFkcmFnSW1hZ2UpIHsK LSAgICAgICAgICAgIGRyYWdJbWFnZSA9IERyYWdJbWFnZSB7IGNyZWF0ZURyYWdJbWFnZUZvckxp bmsobGlua1VSTCwgaGl0VGVzdFJlc3VsdC50ZXh0Q29udGVudCgpLCBzcmMuc2V0dGluZ3MoKS5m b250UmVuZGVyaW5nTW9kZSgpKSB9OwotICAgICAgICAgICAgSW50U2l6ZSBzaXplID0gZHJhZ0lt YWdlU2l6ZShkcmFnSW1hZ2UuZ2V0KCkpOworICAgICAgICAgICAgZHJhZ0ltYWdlID0gY3JlYXRl RHJhZ0ltYWdlRm9yTGluayhsaW5rVVJMLCBoaXRUZXN0UmVzdWx0LnRleHRDb250ZW50KCksIHNy Yy5zZXR0aW5ncygpLmZvbnRSZW5kZXJpbmdNb2RlKCkpOworICAgICAgICAgICAgSW50U2l6ZSBz aXplID0gZHJhZ0ltYWdlU2l6ZShkcmFnSW1hZ2UpOwogICAgICAgICAgICAgbV9kcmFnT2Zmc2V0 ID0gSW50UG9pbnQoLXNpemUud2lkdGgoKSAvIDIsIC1MaW5rRHJhZ0JvcmRlckluc2V0KTsKICAg ICAgICAgICAgIGRyYWdMb2MgPSBJbnRQb2ludChtb3VzZURyYWdnZWRQb2ludC54KCkgKyBtX2Ry YWdPZmZzZXQueCgpLCBtb3VzZURyYWdnZWRQb2ludC55KCkgKyBtX2RyYWdPZmZzZXQueSgpKTsK ICAgICAgICAgICAgIC8vIExhdGVyIGNvZGUgZXhwZWN0cyB0aGUgZHJhZyBpbWFnZSB0byBiZSBz Y2FsZWQgYnkgZGV2aWNlJ3Mgc2NhbGUgZmFjdG9yLgotICAgICAgICAgICAgZHJhZ0ltYWdlID0g RHJhZ0ltYWdlIHsgc2NhbGVEcmFnSW1hZ2UoZHJhZ0ltYWdlLmdldCgpLCBGbG9hdFNpemUobV9w YWdlLmRldmljZVNjYWxlRmFjdG9yKCksIG1fcGFnZS5kZXZpY2VTY2FsZUZhY3RvcigpKSkgfTsK KyAgICAgICAgICAgIGRyYWdJbWFnZSA9IHNjYWxlRHJhZ0ltYWdlKGRyYWdJbWFnZSwgRmxvYXRT aXplKG1fcGFnZS5kZXZpY2VTY2FsZUZhY3RvcigpLCBtX3BhZ2UuZGV2aWNlU2NhbGVGYWN0b3Io KSkpOwogICAgICAgICB9Ci0gICAgICAgIGRvU3lzdGVtRHJhZyhXVEZNb3ZlKGRyYWdJbWFnZSks IGRyYWdMb2MsIG1vdXNlRHJhZ2dlZFBvaW50LCB7IH0sIGRhdGFUcmFuc2Zlciwgc3JjLCB0cnVl KTsKKyAgICAgICAgZG9TeXN0ZW1EcmFnKGRyYWdJbWFnZSwgZHJhZ0xvYywgbW91c2VEcmFnZ2Vk UG9pbnQsIHsgfSwgZGF0YVRyYW5zZmVyLCBzcmMsIHRydWUpOwogI2lmIEVOQUJMRShBVFRBQ0hN RU5UX0VMRU1FTlQpCiAgICAgfSBlbHNlIGlmICghYXR0YWNobWVudFVSTC5pc0VtcHR5KCkgJiYg KG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25BdHRhY2htZW50KSkgewogICAg ICAgICBpZiAoIWRhdGFUcmFuc2Zlci5wYXN0ZWJvYXJkKCkuaGFzRGF0YSgpKSB7CkBAIC05MzEs MTcgKzkyOSwxNyBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUmIHNyYywg Y29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgICAgICBtX2NsaWVudC53 aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24oRHJhZ1NvdXJjZUFjdGlvbkF0dGFjaG1lbnQsIGRy YWdPcmlnaW4sIGRhdGFUcmFuc2Zlcik7CiAgICAgICAgIAogICAgICAgICBpZiAoIWRyYWdJbWFn ZSkgewotICAgICAgICAgICAgZHJhZ0ltYWdlID0gRHJhZ0ltYWdlIHsgZGlzc29sdmVEcmFnSW1h Z2VUb0ZyYWN0aW9uKGNyZWF0ZURyYWdJbWFnZUZvclNlbGVjdGlvbihzcmMpLCBEcmFnSW1hZ2VB bHBoYSkgfTsKKyAgICAgICAgICAgIGRyYWdJbWFnZSA9IGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFj dGlvbihjcmVhdGVEcmFnSW1hZ2VGb3JTZWxlY3Rpb24oc3JjKSwgRHJhZ0ltYWdlQWxwaGEpOwog ICAgICAgICAgICAgZHJhZ0xvYyA9IGRyYWdMb2NGb3JTZWxlY3Rpb25EcmFnKHNyYyk7CiAgICAg ICAgICAgICBtX2RyYWdPZmZzZXQgPSBJbnRQb2ludChkcmFnT3JpZ2luLngoKSAtIGRyYWdMb2Mu eCgpLCBkcmFnT3JpZ2luLnkoKSAtIGRyYWdMb2MueSgpKTsKICAgICAgICAgfQotICAgICAgICBk b1N5c3RlbURyYWcoV1RGTW92ZShkcmFnSW1hZ2UpLCBkcmFnTG9jLCBkcmFnT3JpZ2luLCB7IH0s IGRhdGFUcmFuc2Zlciwgc3JjLCBmYWxzZSk7CisgICAgICAgIGRvU3lzdGVtRHJhZyhkcmFnSW1h Z2UsIGRyYWdMb2MsIGRyYWdPcmlnaW4sIHsgfSwgZGF0YVRyYW5zZmVyLCBzcmMsIGZhbHNlKTsK ICNlbmRpZgogICAgIH0gZWxzZSBpZiAoc3RhdGUudHlwZSA9PSBEcmFnU291cmNlQWN0aW9uREhU TUwpIHsKICAgICAgICAgaWYgKGRyYWdJbWFnZSkgewogICAgICAgICAgICAgQVNTRVJUKG1fZHJh Z1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25ESFRNTCk7CiAgICAgICAgICAgICBtX2Ns aWVudC53aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24oRHJhZ1NvdXJjZUFjdGlvbkRIVE1MLCBk cmFnT3JpZ2luLCBkYXRhVHJhbnNmZXIpOwotICAgICAgICAgICAgZG9TeXN0ZW1EcmFnKFdURk1v dmUoZHJhZ0ltYWdlKSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgeyB9LCBkYXRhVHJhbnNmZXIsIHNy YywgZmFsc2UpOworICAgICAgICAgICAgZG9TeXN0ZW1EcmFnKGRyYWdJbWFnZSwgZHJhZ0xvYywg ZHJhZ09yaWdpbiwgeyB9LCBkYXRhVHJhbnNmZXIsIHNyYywgZmFsc2UpOwogICAgICAgICB9IGVs c2UKICAgICAgICAgICAgIHN0YXJ0ZWREcmFnID0gZmFsc2U7CiAgICAgfSBlbHNlIHsKQEAgLTk1 MCwxMyArOTQ4LDE1IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSYgc3Jj LCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9uCiAgICAgICAgIHN0YXJ0ZWRE cmFnID0gZmFsc2U7CiAgICAgfQogCisgICAgaWYgKGRyYWdJbWFnZSkKKyAgICAgICAgZGVsZXRl RHJhZ0ltYWdlKGRyYWdJbWFnZSk7CiAgICAgcmV0dXJuIHN0YXJ0ZWREcmFnOwogfQogCiB2b2lk IERyYWdDb250cm9sbGVyOjpkb0ltYWdlRHJhZyhFbGVtZW50JiBlbGVtZW50LCBjb25zdCBJbnRQ b2ludCYgZHJhZ09yaWdpbiwgY29uc3QgSW50UmVjdCYgbGF5b3V0UmVjdCwgRGF0YVRyYW5zZmVy JiBkYXRhVHJhbnNmZXIsIEZyYW1lJiBmcmFtZSwgSW50UG9pbnQmIGRyYWdJbWFnZU9mZnNldCkK IHsKICAgICBJbnRQb2ludCBtb3VzZURvd25Qb2ludCA9IGRyYWdPcmlnaW47Ci0gICAgRHJhZ0lt YWdlIGRyYWdJbWFnZTsKKyAgICBEcmFnSW1hZ2VSZWYgZHJhZ0ltYWdlID0gbnVsbHB0cjsKICAg ICBJbnRQb2ludCBzY2FsZWRPcmlnaW47CiAKICAgICBpZiAoIWVsZW1lbnQucmVuZGVyZXIoKSkK QEAgLTk2NiwxMyArOTY2LDEzIEBAIHZvaWQgRHJhZ0NvbnRyb2xsZXI6OmRvSW1hZ2VEcmFnKEVs ZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEludFBvaW50JiBkcmFnT3JpZ2luLCBjCiAKICAgICBJbWFn ZSogaW1hZ2UgPSBnZXRJbWFnZShlbGVtZW50KTsKICAgICBpZiAoaW1hZ2UgJiYgaW1hZ2UtPnNp emUoKS5oZWlnaHQoKSAqIGltYWdlLT5zaXplKCkud2lkdGgoKSA8PSBNYXhPcmlnaW5hbEltYWdl QXJlYQotICAgICAgICAmJiAoZHJhZ0ltYWdlID0gRHJhZ0ltYWdlIHsgY3JlYXRlRHJhZ0ltYWdl RnJvbUltYWdlKGltYWdlLCBlbGVtZW50LnJlbmRlcmVyKCkgPyBvcmllbnRhdGlvbkRlc2NyaXB0 aW9uIDogSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpIH0pKSB7CisgICAgICAgICYmIChk cmFnSW1hZ2UgPSBjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UoaW1hZ2UsIGVsZW1lbnQucmVuZGVy ZXIoKSA/IG9yaWVudGF0aW9uRGVzY3JpcHRpb24gOiBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRp b24oKSkpKSB7CiAKLSAgICAgICAgZHJhZ0ltYWdlID0gRHJhZ0ltYWdlIHsgZml0RHJhZ0ltYWdl VG9NYXhTaXplKGRyYWdJbWFnZS5nZXQoKSwgbGF5b3V0UmVjdC5zaXplKCksIG1heERyYWdJbWFn ZVNpemUoKSkgfTsKLSAgICAgICAgSW50U2l6ZSBmaXR0ZWRTaXplID0gZHJhZ0ltYWdlU2l6ZShk cmFnSW1hZ2UuZ2V0KCkpOworICAgICAgICBkcmFnSW1hZ2UgPSBmaXREcmFnSW1hZ2VUb01heFNp emUoZHJhZ0ltYWdlLCBsYXlvdXRSZWN0LnNpemUoKSwgbWF4RHJhZ0ltYWdlU2l6ZSgpKTsKKyAg ICAgICAgSW50U2l6ZSBmaXR0ZWRTaXplID0gZHJhZ0ltYWdlU2l6ZShkcmFnSW1hZ2UpOwogCi0g ICAgICAgIGRyYWdJbWFnZSA9IERyYWdJbWFnZSB7IHNjYWxlRHJhZ0ltYWdlKGRyYWdJbWFnZS5n ZXQoKSwgRmxvYXRTaXplKG1fcGFnZS5kZXZpY2VTY2FsZUZhY3RvcigpLCBtX3BhZ2UuZGV2aWNl U2NhbGVGYWN0b3IoKSkpIH07Ci0gICAgICAgIGRyYWdJbWFnZSA9IERyYWdJbWFnZSB7IGRpc3Nv bHZlRHJhZ0ltYWdlVG9GcmFjdGlvbihkcmFnSW1hZ2UuZ2V0KCksIERyYWdJbWFnZUFscGhhKSB9 OworICAgICAgICBkcmFnSW1hZ2UgPSBzY2FsZURyYWdJbWFnZShkcmFnSW1hZ2UsIEZsb2F0U2l6 ZShtX3BhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV9wYWdlLmRldmljZVNjYWxlRmFjdG9yKCkp KTsKKyAgICAgICAgZHJhZ0ltYWdlID0gZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uKGRyYWdJ bWFnZSwgRHJhZ0ltYWdlQWxwaGEpOwogCiAgICAgICAgIC8vIFByb3Blcmx5IG9yaWVudCB0aGUg ZHJhZyBpbWFnZSBhbmQgb3JpZW50IGl0IGRpZmZlcmVudGx5IGlmIGl0J3Mgc21hbGxlciB0aGFu IHRoZSBvcmlnaW5hbC4KICAgICAgICAgZmxvYXQgc2NhbGUgPSBmaXR0ZWRTaXplLndpZHRoKCkg LyAoZmxvYXQpbGF5b3V0UmVjdC53aWR0aCgpOwpAQCAtOTg2LDkgKzk4Niw5IEBAIHZvaWQgRHJh Z0NvbnRyb2xsZXI6OmRvSW1hZ2VEcmFnKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEludFBvaW50 JiBkcmFnT3JpZ2luLCBjCiAgICAgICAgIHNjYWxlZE9yaWdpbiA9IEludFBvaW50KChpbnQpKGR4 ICsgMC41KSwgKGludCkoZHkgKyAwLjUpKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAoQ2Fj aGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gZ2V0Q2FjaGVkSW1hZ2UoZWxlbWVudCkpIHsKLSAgICAg ICAgICAgIGRyYWdJbWFnZSA9IERyYWdJbWFnZSB7IGNyZWF0ZURyYWdJbWFnZUljb25Gb3JDYWNo ZWRJbWFnZUZpbGVuYW1lKGNhY2hlZEltYWdlLT5yZXNwb25zZSgpLnN1Z2dlc3RlZEZpbGVuYW1l KCkpIH07CisgICAgICAgICAgICBkcmFnSW1hZ2UgPSBjcmVhdGVEcmFnSW1hZ2VJY29uRm9yQ2Fj aGVkSW1hZ2VGaWxlbmFtZShjYWNoZWRJbWFnZS0+cmVzcG9uc2UoKS5zdWdnZXN0ZWRGaWxlbmFt ZSgpKTsKICAgICAgICAgICAgIGlmIChkcmFnSW1hZ2UpCi0gICAgICAgICAgICAgICAgc2NhbGVk T3JpZ2luID0gSW50UG9pbnQoRHJhZ0ljb25SaWdodEluc2V0IC0gZHJhZ0ltYWdlU2l6ZShkcmFn SW1hZ2UuZ2V0KCkpLndpZHRoKCksIERyYWdJY29uQm90dG9tSW5zZXQpOworICAgICAgICAgICAg ICAgIHNjYWxlZE9yaWdpbiA9IEludFBvaW50KERyYWdJY29uUmlnaHRJbnNldCAtIGRyYWdJbWFn ZVNpemUoZHJhZ0ltYWdlKS53aWR0aCgpLCBEcmFnSWNvbkJvdHRvbUluc2V0KTsKICAgICAgICAg fQogICAgIH0KIApAQCAtOTk2LDEwICs5OTYsMTIgQEAgdm9pZCBEcmFnQ29udHJvbGxlcjo6ZG9J bWFnZURyYWcoRWxlbWVudCYgZWxlbWVudCwgY29uc3QgSW50UG9pbnQmIGRyYWdPcmlnaW4sIGMK ICAgICAgICAgcmV0dXJuOwogCiAgICAgZHJhZ0ltYWdlT2Zmc2V0ID0gbW91c2VEb3duUG9pbnQg KyBzY2FsZWRPcmlnaW47Ci0gICAgZG9TeXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdlKSwgZHJh Z0ltYWdlT2Zmc2V0LCBkcmFnT3JpZ2luLCBlbGVtZW50LmJvdW5kc0luUm9vdFZpZXdTcGFjZSgp LCBkYXRhVHJhbnNmZXIsIGZyYW1lLCBmYWxzZSk7CisgICAgZG9TeXN0ZW1EcmFnKGRyYWdJbWFn ZSwgZHJhZ0ltYWdlT2Zmc2V0LCBkcmFnT3JpZ2luLCBlbGVtZW50LmJvdW5kc0luUm9vdFZpZXdT cGFjZSgpLCBkYXRhVHJhbnNmZXIsIGZyYW1lLCBmYWxzZSk7CisKKyAgICBkZWxldGVEcmFnSW1h Z2UoZHJhZ0ltYWdlKTsKIH0KIAotdm9pZCBEcmFnQ29udHJvbGxlcjo6ZG9TeXN0ZW1EcmFnKERy YWdJbWFnZSBpbWFnZSwgY29uc3QgSW50UG9pbnQmIGRyYWdMb2MsIGNvbnN0IEludFBvaW50JiBl dmVudFBvcywgY29uc3QgSW50UmVjdCYgZHJhZ0ltYWdlQm91bmRzLCBEYXRhVHJhbnNmZXImIGRh dGFUcmFuc2ZlciwgRnJhbWUmIGZyYW1lLCBib29sIGZvckxpbmspCit2b2lkIERyYWdDb250cm9s bGVyOjpkb1N5c3RlbURyYWcoRHJhZ0ltYWdlUmVmIGltYWdlLCBjb25zdCBJbnRQb2ludCYgZHJh Z0xvYywgY29uc3QgSW50UG9pbnQmIGV2ZW50UG9zLCBjb25zdCBJbnRSZWN0JiBkcmFnSW1hZ2VC b3VuZHMsIERhdGFUcmFuc2ZlciYgZGF0YVRyYW5zZmVyLCBGcmFtZSYgZnJhbWUsIGJvb2wgZm9y TGluaykKIHsKICAgICBGbG9hdFBvaW50IGRyYWdJbWFnZUFuY2hvciA9IHsgMC41LCAwLjUgfTsK ICAgICBpZiAoIWRyYWdJbWFnZUJvdW5kcy5pc0VtcHR5KCkpIHsKQEAgLTEwMTIsNyArMTAxNCw3 IEBAIHZvaWQgRHJhZ0NvbnRyb2xsZXI6OmRvU3lzdGVtRHJhZyhEcmFnSW1hZ2UgaW1hZ2UsIGNv bnN0IEludFBvaW50JiBkcmFnTG9jLCBjb25zCiAgICAgLy8gUHJvdGVjdCB0aGlzIGZyYW1lIGFu ZCB2aWV3LCBhcyBhIGxvYWQgbWF5IG9jY3VyIG1pZCBkcmFnIGFuZCBhdHRlbXB0IHRvIHVubG9h ZCB0aGlzIGZyYW1lCiAgICAgUmVmPE1haW5GcmFtZT4gZnJhbWVQcm90ZWN0b3IobV9wYWdlLm1h aW5GcmFtZSgpKTsKICAgICBSZWZQdHI8RnJhbWVWaWV3PiB2aWV3UHJvdGVjdG9yID0gZnJhbWVQ cm90ZWN0b3ItPnZpZXcoKTsKLSAgICBtX2NsaWVudC5zdGFydERyYWcoaW1hZ2UuZ2V0KCksIHZp ZXdQcm90ZWN0b3ItPnJvb3RWaWV3VG9Db250ZW50cyhmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9S b290VmlldyhkcmFnTG9jKSksIHZpZXdQcm90ZWN0b3ItPnJvb3RWaWV3VG9Db250ZW50cyhmcmFt ZS52aWV3KCktPmNvbnRlbnRzVG9Sb290VmlldyhldmVudFBvcykpLCBkcmFnSW1hZ2VBbmNob3Is IGRhdGFUcmFuc2ZlciwgZnJhbWVQcm90ZWN0b3IuZ2V0KCksIGZvckxpbmspOworICAgIG1fY2xp ZW50LnN0YXJ0RHJhZyhpbWFnZSwgdmlld1Byb3RlY3Rvci0+cm9vdFZpZXdUb0NvbnRlbnRzKGZy YW1lLnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3KGRyYWdMb2MpKSwgdmlld1Byb3RlY3Rvci0+ cm9vdFZpZXdUb0NvbnRlbnRzKGZyYW1lLnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3KGV2ZW50 UG9zKSksIGRyYWdJbWFnZUFuY2hvciwgZGF0YVRyYW5zZmVyLCBmcmFtZVByb3RlY3Rvci5nZXQo KSwgZm9yTGluayk7CiAgICAgLy8gRHJhZ0NsaWVudDo6c3RhcnREcmFnIGNhbiBjYXVzZSBvdXIg UGFnZSB0byBkaXNwZWFyLCBkZWFsbG9jYXRpbmcgfHRoaXN8LgogICAgIGlmICghZnJhbWVQcm90 ZWN0b3ItPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJv bGxlci5oCmluZGV4IGQ3MWY0MjQ5N2Y4NmUwYzI2ZjVjYjIwZDQyYTAwMDQ4NDU0MTQwNzIuLjc4 MjEwNGYyZDZiYWVlNDQ0OTRjOGQ5MGE2MzRiZDZhZDg3NjQ0ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RyYWdDb250cm9sbGVyLmgKQEAgLTExMiw3ICsxMTIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHZvaWQgbW91c2VNb3ZlZEludG9Eb2N1bWVudChEb2N1bWVudCopOwogCiAgICAg ICAgIHZvaWQgZG9JbWFnZURyYWcoRWxlbWVudCYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50 UmVjdCYsIERhdGFUcmFuc2ZlciYsIEZyYW1lJiwgSW50UG9pbnQmKTsKLSAgICAgICAgdm9pZCBk b1N5c3RlbURyYWcoRHJhZ0ltYWdlLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFBvaW50Jiwg Y29uc3QgSW50UmVjdCYgZHJhZ0ltYWdlQm91bmRzLCBEYXRhVHJhbnNmZXImLCBGcmFtZSYsIGJv b2wgZm9yTGluayk7CisgICAgICAgIHZvaWQgZG9TeXN0ZW1EcmFnKERyYWdJbWFnZVJlZiwgY29u c3QgSW50UG9pbnQmLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3QmIGRyYWdJbWFnZUJv dW5kcywgRGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBib29sIGZvckxpbmspOwogICAgICAgICB2b2lk IGNsZWFudXBBZnRlclN5c3RlbURyYWcoKTsKICAgICAgICAgdm9pZCBkZWNsYXJlQW5kV3JpdGVE cmFnSW1hZ2UoRGF0YVRyYW5zZmVyJiwgRWxlbWVudCYsIGNvbnN0IFVSTCYsIGNvbnN0IFN0cmlu ZyYgbGFiZWwpOwogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9EcmFnSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vRHJhZ0ltYWdlLmNwcAppbmRleCBiYjcxNmFhYjgzNWFhY2IzNjQyYmE1ZjM0ZTJhNmVj NDNjN2M5MmJiLi5kOGI1ZGVhN2M2YmRkOTVjYTMxMjc4NjZkMjVjNDVkOTA5NGFiNGQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9EcmFnSW1hZ2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5jcHAKQEAgLTIxNywzNiArMjE3LDUgQEAgRHJh Z0ltYWdlUmVmIGNyZWF0ZURyYWdJbWFnZUZvckxpbmsoVVJMJiwgY29uc3QgU3RyaW5nJiwgRm9u dFJlbmRlcmluZ01vZGUpCiB9CiAjZW5kaWYKIAotRHJhZ0ltYWdlOjpEcmFnSW1hZ2UoKQotICAg IDogbV9kcmFnSW1hZ2VSZWYgeyBudWxscHRyIH0KLXsKLX0KLQotRHJhZ0ltYWdlOjpEcmFnSW1h Z2UoRHJhZ0ltYWdlUmVmIGRyYWdJbWFnZVJlZikKLSAgICA6IG1fZHJhZ0ltYWdlUmVmIHsgZHJh Z0ltYWdlUmVmIH0KLXsKLX0KLQotRHJhZ0ltYWdlOjpEcmFnSW1hZ2UoRHJhZ0ltYWdlJiYgb3Ro ZXIpCi0gICAgOiBtX2RyYWdJbWFnZVJlZiB7IHN0ZDo6ZXhjaGFuZ2Uob3RoZXIubV9kcmFnSW1h Z2VSZWYsIG51bGxwdHIpIH0KLXsKLX0KLQotRHJhZ0ltYWdlJiBEcmFnSW1hZ2U6Om9wZXJhdG9y PShEcmFnSW1hZ2UmJiBvdGhlcikKLXsKLSAgICBpZiAobV9kcmFnSW1hZ2VSZWYpCi0gICAgICAg IGRlbGV0ZURyYWdJbWFnZShtX2RyYWdJbWFnZVJlZik7Ci0KLSAgICBtX2RyYWdJbWFnZVJlZiA9 IHN0ZDo6ZXhjaGFuZ2Uob3RoZXIubV9kcmFnSW1hZ2VSZWYsIG51bGxwdHIpOwotCi0gICAgcmV0 dXJuICp0aGlzOwotfQotCi1EcmFnSW1hZ2U6On5EcmFnSW1hZ2UoKQotewotICAgIGlmIChtX2Ry YWdJbWFnZVJlZikKLSAgICAgICAgZGVsZXRlRHJhZ0ltYWdlKG1fZHJhZ0ltYWdlUmVmKTsKLX0K LQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9EcmFnSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5o CmluZGV4IGRhNTJhYjllODk0MjVhMWY4OWVhNDZkYjJjMDcxZGE4MGJiZWIwODQuLmMzYjY2NWM2 YjUyMDNlYjY3YTYyYmJiNTU0YzY2Njk4MDFiODVlMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Ry YWdJbWFnZS5oCkBAIC05MCwyMCArOTAsNCBAQCBEcmFnSW1hZ2VSZWYgY3JlYXRlRHJhZ0ltYWdl Rm9ySW1hZ2UoRnJhbWUmLCBOb2RlJiwgSW50UmVjdCYgaW1hZ2VSZWN0LCBJbnRSZWN0JgogRHJh Z0ltYWdlUmVmIGNyZWF0ZURyYWdJbWFnZUZvckxpbmsoVVJMJiwgY29uc3QgU3RyaW5nJiBsYWJl bCwgRm9udFJlbmRlcmluZ01vZGUpOwogdm9pZCBkZWxldGVEcmFnSW1hZ2UoRHJhZ0ltYWdlUmVm KTsKIAotY2xhc3MgRHJhZ0ltYWdlIGZpbmFsIHsKLXB1YmxpYzoKLSAgICBEcmFnSW1hZ2UoKTsK LSAgICBleHBsaWNpdCBEcmFnSW1hZ2UoRHJhZ0ltYWdlUmVmKTsKLSAgICBEcmFnSW1hZ2UoRHJh Z0ltYWdlJiYpOwotICAgIH5EcmFnSW1hZ2UoKTsKLQotICAgIERyYWdJbWFnZSYgb3BlcmF0b3I9 KERyYWdJbWFnZSYmKTsKLQotICAgIGV4cGxpY2l0IG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJl dHVybiAhIW1fZHJhZ0ltYWdlUmVmOyB9Ci0gICAgRHJhZ0ltYWdlUmVmIGdldCgpIGNvbnN0IHsg cmV0dXJuIG1fZHJhZ0ltYWdlUmVmOyB9Ci0KLXByaXZhdGU6Ci0gICAgRHJhZ0ltYWdlUmVmIG1f ZHJhZ0ltYWdlUmVmOwotfTsKLQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vUGFzdGVib2FyZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCmlu ZGV4IDllY2Q5ZmFjNmE3MDllMjE5NjgwNjRiNmZmOWE3MzkzZThiYTljY2UuLjA2YzNkZTc1ZWJj YWVjNTYxYjkxOGRlZDUxMDg1YzhlNGFlYjdiNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Bhc3RlYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0 ZWJvYXJkLmgKQEAgLTIzLDcgKzIzLDggQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI3ByYWdt YSBvbmNlCisjaWZuZGVmIFBhc3RlYm9hcmRfaAorI2RlZmluZSBQYXN0ZWJvYXJkX2gKIAogI2lu Y2x1ZGUgIkRyYWdJbWFnZS5oIgogI2luY2x1ZGUgIlVSTC5oIgpAQCAtMTgxLDcgKzE4Miw3IEBA IHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFBhc3Rl Ym9hcmQ+IGNyZWF0ZUZvckRyYWdBbmREcm9wKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IHN0ZDo6dW5pcXVlX3B0cjxQYXN0ZWJvYXJkPiBjcmVhdGVGb3JEcmFnQW5kRHJvcChjb25zdCBE cmFnRGF0YSYpOwogCi0gICAgdmlydHVhbCB2b2lkIHNldERyYWdJbWFnZShEcmFnSW1hZ2UsIGNv bnN0IEludFBvaW50JiBob3RTcG90KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RHJhZ0ltYWdlKERy YWdJbWFnZVJlZiwgY29uc3QgSW50UG9pbnQmIGhvdFNwb3QpOwogI2VuZGlmCiAKICNpZiBQTEFU Rk9STShXSU4pCkBAIC0yNjEsMyArMjYyLDUgQEAgaW5saW5lIFBhc3RlYm9hcmQ6On5QYXN0ZWJv YXJkKCkKICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBQYXN0 ZWJvYXJkX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1N0YXRpY1Bhc3Rl Ym9hcmQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1N0YXRpY1Bhc3RlYm9hcmQuaAppbmRl eCBkZTcyYzA0ODJlZjhkYTA1NDFjNTEyYTgxYTNmYjEzY2MxYmZiMzE2Li5kODY0NzkyZDMzY2Zj MWY2ZDcxNzI5YzI0YTRkZmY0MzhlYmIxNGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TdGF0aWNQYXN0ZWJvYXJkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U3RhdGljUGFzdGVib2FyZC5oCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdy aXRlUGFzdGVib2FyZChjb25zdCBQYXN0ZWJvYXJkJikgZmluYWwgeyB9CiAKICNpZiBFTkFCTEUo RFJBR19TVVBQT1JUKQotICAgIHZvaWQgc2V0RHJhZ0ltYWdlKERyYWdJbWFnZSwgY29uc3QgSW50 UG9pbnQmKSBmaW5hbCB7IH0KKyAgICB2b2lkIHNldERyYWdJbWFnZShEcmFnSW1hZ2VSZWYsIGNv bnN0IEludFBvaW50JikgZmluYWwgeyB9CiAjZW5kaWYKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QYXN0ZWJvYXJkRWZsLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9QYXN0ZWJvYXJkRWZsLmNwcAppbmRleCA3Y2Q5NjBlYTE3ZmEy ZmEwMGJmNjgxOGJiNzhmZTk2YTQ4MjQwYWZhLi5iNWI1YzI5YWE4YjMyYWZmYTkyNmMzMzhiN2Ri ODA1NGM0OTU2OTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUGFz dGVib2FyZEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Bhc3RlYm9h cmRFZmwuY3BwCkBAIC0xMTksNyArMTE5LDcgQEAgVmVjdG9yPFN0cmluZz4gUGFzdGVib2FyZDo6 cmVhZEZpbGVuYW1lcygpCiB9CiAKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQotdm9pZCBQYXN0 ZWJvYXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0ltYWdlLCBjb25zdCBJbnRQb2ludCYpCit2b2lkIFBh c3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFnSW1hZ2VSZWYsIGNvbnN0IEludFBvaW50JikKIHsK ICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Bhc3RlYm9hcmRHdGsuY3BwCmluZGV4IDdlNTEzMGEzYjA0MjQyZDE5ZTk1OWIyMTVjZjAwNzI2 ZjFjNTdjZTkuLjM4N2RiZWU5OTBmMzkzYmY4M2Y5ZTVhODdlMTBkMzU5NGRhZjc0MGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKQEAgLTI3MSw3 ICsyNzEsNyBAQCBib29sIFBhc3RlYm9hcmQ6OmNhblNtYXJ0UmVwbGFjZSgpCiB9CiAKICNpZiBF TkFCTEUoRFJBR19TVVBQT1JUKQotdm9pZCBQYXN0ZWJvYXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0lt YWdlLCBjb25zdCBJbnRQb2ludCYpCit2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFn SW1hZ2VSZWYsIGNvbnN0IEludFBvaW50JikKIHsKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0RyYWdJbWFnZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9EcmFnSW1hZ2VJT1MubW0KaW5kZXggMjJhYmNhYmFiMzUxZDZmOTM1OTg0 NTcwM2ZkMThkZGZjYzZjMmQ0MS4uMzY4MmEwN2NmNDM1N2UzMTQxYzBhOWNkNWZmYTljODJmNzg3 OWM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0RyYWdJbWFnZUlP Uy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvRHJhZ0ltYWdlSU9TLm1tCkBA IC0zNiwxMiArMzYsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXZvaWQgZGVsZXRlRHJh Z0ltYWdlKFJldGFpblB0cjxDR0ltYWdlUmVmPikKLXsKLSAgICAvLyBTaW5jZSB0aGlzIGlzIGEg UmV0YWluUHRyLCB0aGVyZSdzIG5vdGhpbmcgYWRkaXRpb25hbCB3ZSBuZWVkIHRvIGRvIHRvCi0g ICAgLy8gZGVsZXRlIGl0LiBJdCB3aWxsIGJlIHJlbGVhc2VkIHdoZW4gaXQgZmFsbHMgb3V0IG9m IHNjb3BlLgotfQotCiAvLyBGSVhNRTogZml4IHNpZ25hdHVyZSBvZiBkcmFnSW1hZ2VTaXplKCkg dG8gYXZvaWQgY29weWluZyB0aGUgYXJndW1lbnQuCiBJbnRTaXplIGRyYWdJbWFnZVNpemUoUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGltYWdlKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvUGFzdGVib2FyZE1hYy5tbQppbmRleCA3ZjliODU3NTA5MGIzOTc4YTgxNTI1NWMyMmY2NGNj ZDA1YWM5ODA1Li5lZGJjMjlhNmRmNGRiYTI1NmRiZjVlMzJhMDkxNzJmNjBiODIwZmQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQpAQCAtNjYzLDcg KzY2Myw3IEBAIFZlY3RvcjxTdHJpbmc+IFBhc3RlYm9hcmQ6OnJlYWRGaWxlbmFtZXMoKQogfQog CiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKLXZvaWQgUGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdl KERyYWdJbWFnZSBpbWFnZSwgY29uc3QgSW50UG9pbnQmIGxvY2F0aW9uKQordm9pZCBQYXN0ZWJv YXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0ltYWdlUmVmIGltYWdlLCBjb25zdCBJbnRQb2ludCYgbG9j YXRpb24pCiB7CiAgICAgLy8gRG9uJ3QgYWxsb3cgc2V0dGluZyB0aGUgZHJhZyBpbWFnZSBpZiBz b21lb25lIGtlcHQgYSBwYXN0ZWJvYXJkIGFuZCBpcyB0cnlpbmcgdG8gc2V0IHRoZSBpbWFnZSB0 b28gbGF0ZS4KICAgICBpZiAobV9jaGFuZ2VDb3VudCAhPSBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+ cGFzdGVib2FyZFN0cmF0ZWd5KCktPmNoYW5nZUNvdW50KG1fcGFzdGVib2FyZE5hbWUpKQpAQCAt NjcxLDcgKzY3MSw3IEBAIHZvaWQgUGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKERyYWdJbWFnZSBp bWFnZSwgY29uc3QgSW50UG9pbnQmIGxvY2F0aW9uKQogCiAgICAgLy8gRGFzaGJvYXJkIHdhbnRz IHRvIGJlIGFibGUgdG8gc2V0IHRoZSBkcmFnIGltYWdlIGR1cmluZyBkcmFnZ2luZywgYnV0IENv Y29hIGRvZXMgbm90IGFsbG93IHRoaXMuCiAgICAgLy8gSW5zdGVhZCB3ZSBtdXN0IGRyb3AgZG93 biB0byB0aGUgQ29yZUdyYXBoaWNzIEFQSS4KLSAgICB3a1NldERyYWdJbWFnZShpbWFnZS5nZXQo KS5nZXQoKSwgbG9jYXRpb24pOworICAgIHdrU2V0RHJhZ0ltYWdlKGltYWdlLmdldCgpLCBsb2Nh dGlvbik7CiAKICAgICAvLyBIYWNrOiBXZSBtdXN0IHBvc3QgYW4gZXZlbnQgdG8gd2FrZSB1cCB0 aGUgTlNEcmFnTWFuYWdlciwgd2hpY2ggaXMgc2l0dGluZyBpbiBhIG5leHRFdmVudCBjYWxsCiAg ICAgLy8gdXAgdGhlIHN0YWNrIGZyb20gdXMgYmVjYXVzZSB0aGUgQ29yZUZvdW5kYXRpb24gZHJh ZyBtYW5hZ2VyIGRvZXMgbm90IHVzZSB0aGUgcnVuIGxvb3AgYnkgaXRzZWxmLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCmluZGV4IGZkMzRiMDIyMDdi ZDM5YWI5YmQ4NWJjYjdjOWNmNWI4M2FhZDU3OTUuLjcyZmE4NDM2Mzc4NWY3NWYwMGFmYjg2Njky NDMzNjA3Y2QyMzQwZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Q YXN0ZWJvYXJkV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFzdGVi b2FyZFdpbi5jcHAKQEAgLTQwOSw3ICs0MDksNyBAQCB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlU3Ry aW5nKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQogfQogCiAjaWYgRU5B QkxFKERSQUdfU1VQUE9SVCkKLXZvaWQgUGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKERyYWdJbWFn ZSwgY29uc3QgSW50UG9pbnQmKQordm9pZCBQYXN0ZWJvYXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0lt YWdlUmVmLCBjb25zdCBJbnRQb2ludCYpCiB7CiAgICAgLy8gRG8gbm90aGluZyBpbiBXaW5kb3dz LgogfQo=