168710 2017-02-21 23:43:13 -0800 REGRESSION(r212786): It broke GTK+ port when using single shared process model (Requested by KaL on #webkit). 2017-02-21 23:45:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 168676 1 commit-queue commit-queue achristensen beidson oldest_to_newest 1279800 0 commit-queue 2017-02-21 23:43:13 -0800 http://trac.webkit.org/changeset/212786 broke the build: It broke GTK+ port when using single shared process model (Requested by KaL 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. 1279802 1 302374 commit-queue 2017-02-21 23:43:25 -0800 Created attachment 302374 ROLLOUT of r212786 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. 1279803 2 302374 commit-queue 2017-02-21 23:45:20 -0800 Comment on attachment 302374 ROLLOUT of r212786 Clearing flags on attachment: 302374 Committed r212810: <http://trac.webkit.org/changeset/212810> 1279804 3 commit-queue 2017-02-21 23:45:24 -0800 All reviewed patches have been landed. Closing bug. 302374 2017-02-21 23:43:25 -0800 2017-02-21 23:45:20 -0800 ROLLOUT of r212786 bug-168710-20170222024039.patch text/plain 11833 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjVhYWE5MzFlNzBkY2E5 ZDg5YTVhMGNlYmM2MzI4YTQyNmM5YTdkNy4uZTk5ZWI3YjhjNzIzZWY4MTdmMjljN2I0MThlMzM3 NDQxNjIyODNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAyLTIxICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjEyNzg2LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY4NzEwCisKKyAgICAgICAgSXQgYnJva2UgR1RLKyBwb3J0IHdoZW4g dXNpbmcgc2luZ2xlIHNoYXJlZCBwcm9jZXNzIG1vZGVsCisgICAgICAgIChSZXF1ZXN0ZWQgYnkg S2FMIG9uICN3ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAg ICAiUmVmYWN0b3IgV2ViVmlld0ltcGwgY3JlYXRpb24gaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBv cnRpbmcKKyAgICAgICAgbXVsdGlwbGUgV2Vic2l0ZURhdGFTdG9yZXMuIgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Njc2CisgICAgICAgIGh0dHA6 Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIxMjc4NgorCiAyMDE3LTAyLTIxICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBXZWJWaWV3SW1w bCBjcmVhdGlvbiBpbiBwcmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyBtdWx0aXBsZSBXZWJzaXRl RGF0YVN0b3Jlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KaW5kZXggNjgxODhhZDBhYzdkYjhmZWY4MTIzNWZiNWI0NjMzMzFhYTZiOGQ3Yy4u NDQ1MzQxZjNiZjY2Yjc1ZjNjZDFlMjY1ODlkYTI3NjQwYzFmZWJmMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTU0OSwxMiArNTQ5 LDcgQEAgc3RhdGljIHVpbnQzMl90IGNvbnZlcnRTeXN0ZW1MYXlvdXREaXJlY3Rpb24oTlNVc2Vy SW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIGRpcmUKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oTUFD KQotICAgIF9pbXBsID0gV2ViS2l0OjpXZWJWaWV3SW1wbDo6bWF5YmVDcmVhdGUoc2VsZiwgc2Vs ZiwgcHJvY2Vzc1Bvb2wsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKLSAgICBpZiAoIV9p bXBsKSB7Ci0gICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludGVybmFsSW5jb25zaXN0ZW5j eUV4Y2VwdGlvbiBmb3JtYXQ6QCJXS1dlYlZpZXcgaW5pdGlhbGl6YXRpb24gZmFpbGVkLiBVbmFi bGUgdG8gY3JlYXRlIGEgbmV3IFdlYlByb2Nlc3MuIl07Ci0gICAgICAgIHJldHVybjsKLSAgICB9 Ci0KKyAgICBfaW1wbCA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpXZWJWaWV3SW1wbD4oc2Vs Ziwgc2VsZiwgcHJvY2Vzc1Bvb2wsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBf cGFnZSA9ICZfaW1wbC0+cGFnZSgpOwogCiAgICAgX2ltcGwtPnNldEF1dG9tYXRpY2FsbHlBZGp1 c3RzQ29udGVudEluc2V0cyh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbQppbmRleCAyMDczZGY4NjJhNTZkNGEwOGNmMzhlNzNiNTk2OTAyOTBhNjQ4MGE4 Li5jMDNhOGMzNzExZjVhZGI3ODQ3NDUwZDZjZTI1N2MyYmQ2OTEwM2QzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC05MDQsMTIgKzkwNCw3IEBAIFNv bWUgb3RoZXIgZWRpdGluZy1yZWxhdGVkIG1ldGhvZHMgc3RpbGwgdW5pbXBsZW1lbnRlZDoKICAg ICBJbml0aWFsaXplV2ViS2l0MigpOwogCiAgICAgX2RhdGEgPSBbW1dLVmlld0RhdGEgYWxsb2Nd IGluaXRdOwotCi0gICAgX2RhdGEtPl9pbXBsID0gV2ViVmlld0ltcGw6Om1heWJlQ3JlYXRlKHNl bGYsIG51bGxwdHIsIHByb2Nlc3NQb29sLCBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pKTsKLSAgICBp ZiAoIV9kYXRhLT5faW1wbCkgewotICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnRlcm5h bEluY29uc2lzdGVuY3lFeGNlcHRpb24gZm9ybWF0OkAiW1dLVmlldyBpbml0V2l0aEZyYW1lOnBy b2Nlc3NQb29sOmNvbmZpZ3VyYXRpb246XSBmYWlsZWQgdG8gY3JlYXRlIGEgbmV3IFdlYlByb2Nl c3MiXTsKLSAgICAgICAgcmV0dXJuIG5pbDsKLSAgICB9CisgICAgX2RhdGEtPl9pbXBsID0gc3Rk OjptYWtlX3VuaXF1ZTxXZWJWaWV3SW1wbD4oc2VsZiwgbnVsbHB0ciwgcHJvY2Vzc1Bvb2wsIFdU Rk1vdmUoY29uZmlndXJhdGlvbikpOwogCiAgICAgW3NlbGYgbWF5YmVJbnN0YWxsSWNvbkxvYWRp bmdDbGllbnRdOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2Ev V2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5oCmluZGV4IDZkMDc5NWI2MDNjMWI4OTNjOTg2NzNkOTYzMDZmMmIyMTJlMTE0MzYuLjY5MmE5 MjRhY2Y0YmQ5ZjFkN2NkYjFhOGQ1ZDg5Yjc2YmJmMzNhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCkBAIC0xMjAsNyArMTIwLDcgQEAgY2xhc3Mg V2ViVmlld0ltcGwgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIFdURl9NQUtF X05PTkNPUFlBQkxFKFdlYlZpZXdJbXBsKTsKIHB1YmxpYzoKLSAgICBzdGF0aWMgc3RkOjp1bmlx dWVfcHRyPFdlYlZpZXdJbXBsPiBtYXliZUNyZWF0ZShOU1ZpZXcgPFdlYlZpZXdJbXBsRGVsZWdh dGU+ICosIFdLV2ViVmlldyAqb3V0ZXJXZWJWaWV3LCBXZWJQcm9jZXNzUG9vbCYsIFJlZjxBUEk6 OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKKyAgICBXZWJWaWV3SW1wbChOU1ZpZXcgPFdlYlZpZXdJ bXBsRGVsZWdhdGU+ICosIFdLV2ViVmlldyAqb3V0ZXJXZWJWaWV3LCBXZWJQcm9jZXNzUG9vbCYs IFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKIAogICAgIH5XZWJWaWV3SW1wbCgpOwog CkBAIC01MjMsOCArNTIzLDYgQEAgcHVibGljOgogI2VuZGlmIC8vIEhBVkUoVE9VQ0hfQkFSKQog CiBwcml2YXRlOgotICAgIFdlYlZpZXdJbXBsKE5TVmlldyA8V2ViVmlld0ltcGxEZWxlZ2F0ZT4g Kiwgc3RkOjp1bmlxdWVfcHRyPFBhZ2VDbGllbnRJbXBsPiYmLCBSZWY8V2ViUGFnZVByb3h5PiYm LCBXZWJQcm9jZXNzUG9vbCYpOwotCiAjaWYgSEFWRShUT1VDSF9CQVIpCiAgICAgdm9pZCBzZXRV cFRleHRUb3VjaEJhcihOU1RvdWNoQmFyICopOwogICAgIHZvaWQgdXBkYXRlVGV4dFRvdWNoQmFy KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0lt cGwubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5k ZXggMjVlYjFiNzNlOTU5OWY3MmI5NGZmN2Q1ZDRmY2MzNzE3Y2I2ZThmYy4uZWNhOWVhNGZkNTc1 YWM1OTY0MTY1YTNjYmQ4MDA2MjI2YjgzZmY3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpAQCAtMTIyOSwyMCArMTIyOSwxMCBAQCBzdGF0aWMg TlNUcmFja2luZ0FyZWFPcHRpb25zIHRyYWNraW5nQXJlYU9wdGlvbnMoKQogICAgIHJldHVybiBv cHRpb25zOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8V2ViVmlld0ltcGw+IFdlYlZpZXdJbXBsOjpt YXliZUNyZWF0ZShOU1ZpZXcgPFdlYlZpZXdJbXBsRGVsZWdhdGU+ICp2aWV3LCBXS1dlYlZpZXcg Km91dGVyV2ViVmlldywgV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sLCBSZWY8QVBJOjpQYWdl Q29uZmlndXJhdGlvbj4mJiBjb25maWd1cmF0aW9uKQotewotICAgIGF1dG8gcGFnZUNsaWVudCA9 IHN0ZDo6bWFrZV91bmlxdWU8UGFnZUNsaWVudEltcGw+KHZpZXcsIG91dGVyV2ViVmlldyk7Ci0g ICAgYXV0byB3ZWJQYWdlID0gcHJvY2Vzc1Bvb2wuY3JlYXRlV2ViUGFnZSgqcGFnZUNsaWVudCwg V1RGTW92ZShjb25maWd1cmF0aW9uKSk7Ci0gICAgaWYgKCF3ZWJQYWdlKQotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKLQotICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8V2ViVmlld0ltcGw+KG5l dyBXZWJWaWV3SW1wbCh2aWV3LCBXVEZNb3ZlKHBhZ2VDbGllbnQpLCAqd2ViUGFnZSwgcHJvY2Vz c1Bvb2wpKTsKLX0KLQotV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKE5TVmlldyA8V2ViVmlld0lt cGxEZWxlZ2F0ZT4gKnZpZXcsIHN0ZDo6dW5pcXVlX3B0cjxQYWdlQ2xpZW50SW1wbD4mJiBwYWdl Q2xpZW50LCBSZWY8V2ViUGFnZVByb3h5PiYmIHBhZ2UsIFdlYlByb2Nlc3NQb29sJiBwcm9jZXNz UG9vbCkKK1dlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbChOU1ZpZXcgPFdlYlZpZXdJbXBsRGVsZWdh dGU+ICp2aWV3LCBXS1dlYlZpZXcgKm91dGVyV2ViVmlldywgV2ViUHJvY2Vzc1Bvb2wmIHByb2Nl c3NQb29sLCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJiBjb25maWd1cmF0aW9uKQogICAg IDogbV92aWV3KHZpZXcpCi0gICAgLCBtX3BhZ2VDbGllbnQoV1RGTW92ZShwYWdlQ2xpZW50KSkK LSAgICAsIG1fcGFnZShXVEZNb3ZlKHBhZ2UpKQorICAgICwgbV9wYWdlQ2xpZW50KHN0ZDo6bWFr ZV91bmlxdWU8UGFnZUNsaWVudEltcGw+KHZpZXcsIG91dGVyV2ViVmlldykpCisgICAgLCBtX3Bh Z2UocHJvY2Vzc1Bvb2wuY3JlYXRlV2ViUGFnZSgqbV9wYWdlQ2xpZW50LCBXVEZNb3ZlKGNvbmZp Z3VyYXRpb24pKSkKICAgICAsIG1fd2Vha1B0ckZhY3RvcnkodGhpcykKICAgICAsIG1fbmVlZHNW aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzKG1fcGFnZS0+cHJlZmVyZW5jZXMoKS5wbHVnaW5z RW5hYmxlZCgpKQogICAgICwgbV9pbnRyaW5zaWNDb250ZW50U2l6ZShDR1NpemVNYWtlKE5TVmll d05vSW5zdHJpbnNpY01ldHJpYywgTlNWaWV3Tm9JbnN0cmluc2ljTWV0cmljKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYjBmNWMwYWNmNmI2NjlhMTFk NzQyMDdhODk4MTA5ZGE1NTUxY2ZiOC4uZTYzZWNiZGRlNjJhODg5OTMyNWM3MjZjYTI5ZmU5MmEz N2E4OTM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAg LTcxNiwxMyArNzE2LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNz KCkKICAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UobV9wYWdlSUQpOwogICAgIG1fcHJvY2Vz cy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VS ZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwogCi0gICAgYXV0byogbmV3UHJvY2VzcyA9IG1fcHJv Y2Vzcy0+cHJvY2Vzc1Bvb2woKS5tYXliZUNyZWF0ZU5ld1dlYlByb2Nlc3NSZXNwZWN0aW5nUHJv Y2Vzc0NvdW50TGltaXQobV93ZWJzaXRlRGF0YVN0b3JlLnB0cigpKTsKLSAgICBpZiAoIW5ld1By b2Nlc3MpIHsKLSAgICAgICAgV1RGTG9nQWx3YXlzKCJDb3VsZG4ndCByZWF0dGFjaCB0byBhIG5l dyB3ZWIgcHJvY2VzcyIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIG1fcHJvY2VzcyA9 IG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1By b2Nlc3NDb3VudExpbWl0KCk7CiAKLSAgICBtX3Byb2Nlc3MgPSAqbmV3UHJvY2VzczsKICAgICBB U1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVy bWluYXRlZCk7CiAgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBDaGlsZFByb2Nlc3NQcm94 eTo6U3RhdGU6OlJ1bm5pbmcpCiAgICAgICAgIHByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDE3M2Fi ZTQ5ZWYzZTUyMDdiNzEyOGM4YjdlYmQ3NDEzNDczOTdhNmYuLjhkYTRkMjljNDE0Nzk2OTU3NDk4 YjUyY2NhMzc4MzQ0NTJiMmE0YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcApAQCAtNTU3LDcgKzU1Nyw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnJl c29sdmVQYXRoc0ZvclNhbmRib3hFeHRlbnNpb25zKCkKICAgICBwbGF0Zm9ybVJlc29sdmVQYXRo c0ZvclNhbmRib3hFeHRlbnNpb25zKCk7CiB9CiAKLVdlYlByb2Nlc3NQcm94eSYgV2ViUHJvY2Vz c1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2Vic2l0ZURhdGFT dG9yZSkKK1dlYlByb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nl c3MoKQogewogICAgIGVuc3VyZU5ldHdvcmtQcm9jZXNzKCk7CiAKQEAgLTY5Myw3ICs2OTMsNyBA QCB2b2lkIFdlYlByb2Nlc3NQb29sOjp3YXJtSW5pdGlhbFByb2Nlc3MoKQogICAgIGlmIChtX3By b2Nlc3Nlcy5zaXplKCkgPj0gbWF4aW11bU51bWJlck9mUHJvY2Vzc2VzKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNyZWF0ZU5ld1dlYlByb2Nlc3MobnVsbHB0cik7CisgICAgY3JlYXRlTmV3 V2ViUHJvY2VzcygpOwogICAgIG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3MgPSB0cnVlOwogfQog CkBAIC03NjksMjUgKzc2OSwyMCBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpkaXNjb25uZWN0UHJv Y2VzcyhXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MpCiAjZW5kaWYKIH0KIAotV2ViUHJvY2Vzc1By b3h5KiBXZWJQcm9jZXNzUG9vbDo6bWF5YmVDcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1By b2Nlc3NDb3VudExpbWl0KFdlYnNpdGVEYXRhU3RvcmUqIHdlYnNpdGVEYXRhU3RvcmUpCitXZWJQ cm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGlu Z1Byb2Nlc3NDb3VudExpbWl0KCkKIHsKICAgICBpZiAobV9wcm9jZXNzZXMuc2l6ZSgpIDwgbWF4 aW11bU51bWJlck9mUHJvY2Vzc2VzKCkpCi0gICAgICAgIHJldHVybiAmY3JlYXRlTmV3V2ViUHJv Y2Vzcyh3ZWJzaXRlRGF0YVN0b3JlKTsKLQotICAgIC8vIElmIGEgbm9uLWRlZmF1bHQgV2Vic2l0 ZURhdGFTdG9yZSB3YXMgcGFzc2VkIGluIGFuZCB3ZSBjb3VsZG4ndCBtYWtlIGEgbmV3IHdlYiBw cm9jZXNzIGZvciBpdCwKLSAgICAvLyB3ZSBzaG91bGQgbm90IHJldHVybiBhbiBleGlzdGluZyBw cm9jZXNzLgotICAgIGlmICh3ZWJzaXRlRGF0YVN0b3JlICYmIHdlYnNpdGVEYXRhU3RvcmUgIT0g JkFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0 b3JlKCkpCi0gICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICByZXR1cm4gY3JlYXRlTmV3 V2ViUHJvY2VzcygpOwogCiAgICAgLy8gQ2hvb3NlIHRoZSBwcm9jZXNzIHdpdGggZmV3ZXN0IHBh Z2VzLgogICAgIGF1dG8mIHByb2Nlc3MgPSAqc3RkOjptaW5fZWxlbWVudChtX3Byb2Nlc3Nlcy5i ZWdpbigpLCBtX3Byb2Nlc3Nlcy5lbmQoKSwgW10oY29uc3QgUmVmUHRyPFdlYlByb2Nlc3NQcm94 eT4mIGEsIGNvbnN0IFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+JiBiKSB7CiAgICAgICAgIHJldHVy biBhLT5wYWdlQ291bnQoKSA8IGItPnBhZ2VDb3VudCgpOwogICAgIH0pOwogCi0gICAgcmV0dXJu IHByb2Nlc3MuZ2V0KCk7CisgICAgcmV0dXJuICpwcm9jZXNzOwogfQogCi1SZWZQdHI8V2ViUGFn ZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xp ZW50LCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJiBwYWdlQ29uZmlndXJhdGlvbikKK1Jl ZjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQb29sOjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQm IHBhZ2VDbGllbnQsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmIHBhZ2VDb25maWd1cmF0 aW9uKQogewogICAgIGlmICghcGFnZUNvbmZpZ3VyYXRpb24tPnBhZ2VHcm91cCgpKQogICAgICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UGFnZUdyb3VwKG1fZGVmYXVsdFBhZ2VHcm91cC5wdHIo KSk7CkBAIC03OTcsMjMgKzc5MiwyMSBAQCBSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNz UG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBSZWY8QQogICAgICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0VXNlckNvbnRlbnRDb250cm9sbGVyKCZwYWdlQ29uZmln dXJhdGlvbi0+cGFnZUdyb3VwKCktPnVzZXJDb250ZW50Q29udHJvbGxlcigpKTsKICAgICBpZiAo IXBhZ2VDb25maWd1cmF0aW9uLT52aXNpdGVkTGlua1N0b3JlKCkpCiAgICAgICAgIHBhZ2VDb25m aWd1cmF0aW9uLT5zZXRWaXNpdGVkTGlua1N0b3JlKG1fdmlzaXRlZExpbmtTdG9yZS5wdHIoKSk7 Ci0KLSAgICBib29sIHBhZ2VIYXNXZWJzaXRlRGF0YVN0b3JlID0gcGFnZUNvbmZpZ3VyYXRpb24t PndlYnNpdGVEYXRhU3RvcmUoKTsKLSAgICBpZiAoIXBhZ2VIYXNXZWJzaXRlRGF0YVN0b3JlKSB7 CisgICAgaWYgKCFwYWdlQ29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpKSB7CiAgICAg ICAgIEFTU0VSVCghcGFnZUNvbmZpZ3VyYXRpb24tPnNlc3Npb25JRCgpLmlzVmFsaWQoKSk7CiAg ICAgICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRXZWJzaXRlRGF0YVN0b3JlKG1fd2Vic2l0ZURh dGFTdG9yZS5nZXQoKSk7CiAgICAgICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRTZXNzaW9uSUQo cGFnZUNvbmZpZ3VyYXRpb24tPnByZWZlcmVuY2VzKCktPnByaXZhdGVCcm93c2luZ0VuYWJsZWQo KSA/IFNlc3Npb25JRDo6bGVnYWN5UHJpdmF0ZVNlc3Npb25JRCgpIDogU2Vzc2lvbklEOjpkZWZh dWx0U2Vzc2lvbklEKCkpOwogICAgIH0KIAogICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHBy b2Nlc3M7Ci0gICAgaWYgKG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3MgJiYgIXBhZ2VIYXNXZWJz aXRlRGF0YVN0b3JlKSB7CisgICAgaWYgKG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3MpIHsKICAg ICAgICAgcHJvY2VzcyA9IG1fcHJvY2Vzc2VzLmxhc3QoKTsKICAgICAgICAgbV9oYXZlSW5pdGlh bEVtcHR5UHJvY2VzcyA9IGZhbHNlOwogICAgIH0gZWxzZSBpZiAocGFnZUNvbmZpZ3VyYXRpb24t PnJlbGF0ZWRQYWdlKCkpIHsKICAgICAgICAgLy8gU2hhcmluZyBwcm9jZXNzZXMsIGUuZy4gd2hl biBjcmVhdGluZyB0aGUgcGFnZSB2aWEgd2luZG93Lm9wZW4oKS4KICAgICAgICAgcHJvY2VzcyA9 ICZwYWdlQ29uZmlndXJhdGlvbi0+cmVsYXRlZFBhZ2UoKS0+cHJvY2VzcygpOwogICAgIH0gZWxz ZQotICAgICAgICBwcm9jZXNzID0gbWF5YmVDcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1By b2Nlc3NDb3VudExpbWl0KCZwYWdlQ29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53 ZWJzaXRlRGF0YVN0b3JlKCkpOworICAgICAgICBwcm9jZXNzID0gJmNyZWF0ZU5ld1dlYlByb2Nl c3NSZXNwZWN0aW5nUHJvY2Vzc0NvdW50TGltaXQoKTsKIAogICAgIHJldHVybiBwcm9jZXNzLT5j cmVhdGVXZWJQYWdlKHBhZ2VDbGllbnQsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggOTYzYjEyNDI1 MmNjMGE1ZjA5ZjBhNTNiZGZhMzRlZjMzYzdkZDE1ZS4uYTlmNjU2YWI4MGM3YmM3NTFmNjFkYTc3 M2MyMzcwMTYyNjU4NDYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmgKQEAgLTE3MCw3ICsxNzAsNyBAQCBwdWJsaWM6CiAKICAgICBBUEk6OldlYnNpdGVEYXRh U3RvcmUqIHdlYnNpdGVEYXRhU3RvcmUoKSBjb25zdCB7IHJldHVybiBtX3dlYnNpdGVEYXRhU3Rv cmUuZ2V0KCk7IH0KIAotICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IGNyZWF0ZVdlYlBhZ2UoUGFn ZUNsaWVudCYsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKKyAgICBSZWY8V2ViUGFn ZVByb3h5PiBjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmLCBSZWY8QVBJOjpQYWdlQ29uZmlndXJh dGlvbj4mJik7CiAKICAgICBjb25zdCBTdHJpbmcmIGluamVjdGVkQnVuZGxlUGF0aCgpIGNvbnN0 IHsgcmV0dXJuIG1fY29uZmlndXJhdGlvbi0+aW5qZWN0ZWRCdW5kbGVQYXRoKCk7IH0KIApAQCAt MjU4LDcgKzI1OCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWxsb3dTcGVjaWZpY0hUVFBTQ2Vy dGlmaWNhdGVGb3JIb3N0KGNvbnN0IFdlYkNlcnRpZmljYXRlSW5mbyosIGNvbnN0IFN0cmluZyYg aG9zdCk7CiAKLSAgICBXZWJQcm9jZXNzUHJveHkqIG1heWJlQ3JlYXRlTmV3V2ViUHJvY2Vzc1Jl c3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChXZWJzaXRlRGF0YVN0b3JlKik7IC8vIFdpbGwgcmV0 dXJuIGFuIGV4aXN0aW5nIG9uZSBpZiBsaW1pdCBpcyBtZXQuCisgICAgV2ViUHJvY2Vzc1Byb3h5 JiBjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KCk7IC8vIFdp bGwgcmV0dXJuIGFuIGV4aXN0aW5nIG9uZSBpZiBsaW1pdCBpcyBtZXQuCiAgICAgdm9pZCB3YXJt SW5pdGlhbFByb2Nlc3MoKTsKIAogICAgIGJvb2wgc2hvdWxkVGVybWluYXRlKFdlYlByb2Nlc3NQ cm94eSopOwpAQCAtMzk3LDcgKzM5Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUlu aXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmKTsKICAgICB2 b2lkIHBsYXRmb3JtSW52YWxpZGF0ZUNvbnRleHQoKTsKIAotICAgIFdlYlByb2Nlc3NQcm94eSYg Y3JlYXRlTmV3V2ViUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKik7CisgICAgV2ViUHJvY2Vzc1By b3h5JiBjcmVhdGVOZXdXZWJQcm9jZXNzKCk7CiAKICAgICB2b2lkIHJlcXVlc3RXZWJDb250ZW50 U3RhdGlzdGljcyhTdGF0aXN0aWNzUmVxdWVzdCopOwogICAgIHZvaWQgcmVxdWVzdE5ldHdvcmtp bmdTdGF0aXN0aWNzKFN0YXRpc3RpY3NSZXF1ZXN0Kik7Cg==