102261 2012-11-14 11:39:28 -0800 [EFL][WK2] Avoid crashing the UI process is web process crashed 2012-11-14 12:45:50 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 102222 1 yael webkit-unassigned lucas.de.marchi oldest_to_newest 767128 0 yael 2012-11-14 11:39:28 -0800 We need to check that there is a valid drawingArea before we update the screen, since it is done asynchronously, and the web process could crash while we are trying to update. 767136 1 174214 yael 2012-11-14 11:43:25 -0800 Created attachment 174214 Patch 767194 2 yael 2012-11-14 12:45:34 -0800 This is probably not the right fix anyways. Closing for now. 174214 2012-11-14 11:43:25 -0800 2012-11-14 12:45:50 -0800 Patch 102122.patch text/plain 10102 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwu aAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTU2LDcgKzE1Niw3IEBACiAgICAgdm9p ZCBkaXNtaXNzQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCi0gICAgV0tQYWdlUmVmIGNyZWF0ZU5l d1BhZ2UoKTsKKyAgICBXS1BhZ2VSZWYgY3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2lu ZG93RmVhdHVyZXMpOwogICAgIHZvaWQgY2xvc2VQYWdlKCk7CiAKICAgICB2b2lkIHJlcXVlc3RQ b3B1cE1lbnUoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUVmbCosIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBkb3VibGUgcGFnZVNjYWxlRmFjdG9yLCBj b25zdCBWZWN0b3I8V2ViS2l0OjpXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxlY3Rl ZEluZGV4KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDYgKzE0NywxMCBAQAogICAgIC8v IHN0b3JhZ2U6CiAgICAgLy8gICAtIFdlYiBkYXRhYmFzZS4KICAgICB1bnNpZ25lZCBsb25nIGxv bmcgKCpleGNlZWRlZF9kYXRhYmFzZV9xdW90YSkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGNv bnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgY29uc3QgY2hhciAqZGlzcGxheU5hbWUsIHVuc2lnbmVk IGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2lu VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQg bG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UpOworCisgICAgLy8gbmV3IHdpbmRvdzoKKyAgICAvLyAg IC0gQ3JlYXRlIGEgbmV3IHdpbmRvdyB3aXRoIHNwZWNpZmllZCBzaXplCisgICAgRXZhc19PYmpl Y3QqICgqd2luZG93X2NyZWF0ZV9uZXcpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nv b3JkIHdpZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCk7CiB9OwogCiAvKioKQEAgLTE2NSw3ICsxNjks NyBAQAogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX1ZFUlNJT04KICAqIEBzZWUg RVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04KICAqLwotI2RlZmluZSBFV0tf VklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0 LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQorI2RlZmluZSBFV0tfVklFV19TTUFS VF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0LCBFV0tfVklF V19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAvKioKICAqIEluaXRpYWxpemVyIHRvIHpl cm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBzdHJ1Y3R1cmUuCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCShyZXZpc2lv biAxMzQ0MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDkgQEAKICNpbmNsdWRlICJQYWdlUG9s aWN5Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiUGFnZVVJQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VMb2FkQ2xpZW50RWZsLmgiCisjaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCisjaW5j bHVkZSAiV0tHZW9tZXRyeS5oIgorI2luY2x1ZGUgIldLTnVtYmVyLmgiCiAjaW5jbHVkZSAiV0tT dHJpbmcuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdyb3Vw LmgiCkBAIC04MjYsMTQgKzgyOSwyOCBAQAogICAgIGluZm9ybUljb25DaGFuZ2UoKTsKIH0KIAot V0tQYWdlUmVmIEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQYWdlKCkKK1dLUGFnZVJlZiBFd2tWaWV3 SW1wbDo6Y3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMpCiB7Cisg ICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKyAgICBBU1NFUlQoc2Qt PmFwaSk7CisKICAgICBFdmFzX09iamVjdCogbmV3RXdrVmlldyA9IDA7Ci0gICAgc21hcnRDYWxs YmFjazxDcmVhdGVXaW5kb3c+KCkuY2FsbCgmbmV3RXdrVmlldyk7CiAKLSAgICBpZiAoIW5ld0V3 a1ZpZXcpCisgICAgLy8gRXh0cmFjdCB0aGUgd2lkdGggYW5kIGhlaWdodCBmcm9tIHRoZSB3aW5k b3cgYXR0cmlidXRlcyBhbmQgcGFzcyB0aGVtIGFsb25nIHRvIHRoZSBlbWJlZGRlci4KKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2lkdGhTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoIndpZHRoIikpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBo ZWlnaHRTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImhlaWdodCIp KTsKKworICAgIFdLVHlwZVJlZiByZWYgPSBXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdpbmRv d0ZlYXR1cmVzLCB3aWR0aFN0ci5nZXQoKSk7CisgICAgdW5zaWduZWQgd2lkdGggPSByZWYgPyBX S0RvdWJsZUdldFZhbHVlKHN0YXRpY19jYXN0PFdLRG91YmxlUmVmPihyZWYpKSA6IDA7CisgICAg cmVmID0gV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleSh3aW5kb3dGZWF0dXJlcywgaGVpZ2h0U3Ry LmdldCgpKTsKKyAgICB1bnNpZ25lZCBoZWlnaHQgPSByZWYgPyBXS0RvdWJsZUdldFZhbHVlKHN0 YXRpY19jYXN0PFdLRG91YmxlUmVmPihyZWYpKSA6IDA7CisKKyAgICBpZiAoIXNkLT5hcGktPndp bmRvd19jcmVhdGVfbmV3KQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlmICghKG5ld0V3a1Zp ZXcgPSBzZC0+YXBpLT53aW5kb3dfY3JlYXRlX25ldyhzZCwgd2lkdGgsIGhlaWdodCkpKQorICAg ICAgICByZXR1cm4gMDsKKwogICAgIEV3a1ZpZXdJbXBsKiBuZXdWaWV3SW1wbCA9IEV3a1ZpZXdJ bXBsOjpmcm9tRXZhc09iamVjdChuZXdFd2tWaWV3KTsKICAgICBBU1NFUlQobmV3Vmlld0ltcGwp OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGll bnRFZmwuY3BwCShyZXZpc2lvbiAxMzQ0MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDkgKzQ5LDkgQEAK ICAgICB0b1BhZ2VVSUNsaWVudEVmbChjbGllbnRJbmZvKS0+bV92aWV3SW1wbC0+Y2xvc2VQYWdl KCk7CiB9CiAKLVdLUGFnZVJlZiBQYWdlVUlDbGllbnRFZmw6OmNyZWF0ZU5ld1BhZ2UoV0tQYWdl UmVmLCBXS1VSTFJlcXVlc3RSZWYsIFdLRGljdGlvbmFyeVJlZiwgV0tFdmVudE1vZGlmaWVycywg V0tFdmVudE1vdXNlQnV0dG9uLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorV0tQYWdlUmVmIFBh Z2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwg V0tEaWN0aW9uYXJ5UmVmIHdpbmRvd0ZlYXR1cmVzLCBXS0V2ZW50TW9kaWZpZXJzLCBXS0V2ZW50 TW91c2VCdXR0b24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgcmV0dXJuIHRvUGFn ZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5jcmVhdGVOZXdQYWdlKCk7Cisg ICAgcmV0dXJuIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5jcmVh dGVOZXdQYWdlKHdpbmRvd0ZlYXR1cmVzKTsKIH0KIAogdm9pZCBQYWdlVUlDbGllbnRFZmw6OnJ1 bkphdmFTY3JpcHRBbGVydChXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFt ZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEz NDQzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEyLTExLTEzICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNv bT4KKworICAgICAgICBbRUZMXVtXSzJdIE5ldyB3aW5kb3cgc2l6ZSBzaG91bGQgY29uc3VsdCB0 aGUgd2luZG93IGF0dHJpYnV0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjEyMgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUg Q2hyaXN0aWFuc2VuLgorCisgICAgICAgIFBhc3MgdGhlIHNpemUgdGhhdCB3YXMgc3BlY2lmaWVk IGluIHdpbmRvdy5vcGVuIHRvIHRoZSBlbWJlZGRlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmNwcDoKKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQ YWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oOgorICAgICAg ICAoRXdrVmlld0ltcGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwOgorICAgICAgICAo V2ViS2l0OjpQYWdlVUlDbGllbnRFZmw6OmNyZWF0ZU5ld1BhZ2UpOgorCiAyMDEyLTExLTEzICBN aWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAg ICAgIFtXSzJdIFRpbGVkQmFja2luZ1N0b3JlOiBXZWJDaHJvbWVDbGllbnQ6OnBhZ2VSZWN0KCkg c2hvdWxkIGNvbnNpZGVyIHZpZXdwb3J0IHNpemUKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDQzNCkKKysrIFRvb2xzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTEzICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIE5l dyB3aW5kb3cgc2l6ZSBzaG91bGQgY29uc3VsdCB0aGUgd2luZG93IGF0dHJpYnV0ZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjEyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFRh a2UgaW50byBhY2NvdW50IHRoZSBzaXplIHRoYXQgd2FzIHNwZWNpZmllZCBpbiB3aW5kb3cub3Bl bgorICAgICAgICB3aGVuIGNyZWF0aW5nIGEgbmV3IHdpbmRvdy4gVGhpcyBhdm9pZHMgdWdseSBm bGFzaGluZyBvbiB0aGUgc2NyZWVuLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4u YzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX25ld193aW5kb3cpOgorICAg ICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAgIChlbG1fbWFpbik6CisKIDIwMTItMTEtMTMg IFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJhcGhhZWwua3Viby5kYS5jb3N0YUBpbnRlbC5jb20+ CiAKICAgICAgICAgW0NNYWtlXSBJbmNvcnJlY3QgZGVwZW5kZW5jeSBjYWxjdWxhdGlvbiB3aGVu IGdlbmVyYXRpbmcgZm9yd2FyZGluZyBoZWFkZXJzCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9l ZmwvbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHJl dmlzaW9uIDEzNDQzNCkKKysrIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHdvcmtpbmcg Y29weSkKQEAgLTkyLDcgKzkyLDcgQEAKICAgICB9CiB9OwogCi1zdGF0aWMgQnJvd3Nlcl9XaW5k b3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKTsKK3N0YXRpYyBCcm93c2VyX1dpbmRv dyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCk7 CiAKIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqYnJvd3Nlcl93aW5kb3dfZmluZChFdmFzX09iamVj dCAqd2luZG93KQogewpAQCAtMTg0LDcgKzE4NCw4IEBACiAgICAgICAgICAgICBpbmZvKCJDaGFu Z2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGJ1dCBOT1QgY2hhbmdlZCEiKTsK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewog ICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIp OwotICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShERUZBVUxU X1VSTCk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKERF RkFVTFRfVVJMLCAwLCAwKTsKKyAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQg aGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5k b3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2Vk KSB7CiAgICAgICAgIGluZm8oIlNob3cgSW5zcGVjdG9yIChDdHJsK2kpIHdhcyBwcmVzc2VkLlxu Iik7CkBAIC0yNzAsMTMgKzI3MSwxMiBAQAogICAgIGVsbV9vYmplY3RfZGlzYWJsZWRfc2V0KHdp bmRvdy0+Zm9yd2FyZF9idXR0b24sICFld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKHdlYnZpZXcp KTsKIH0KIAotc3RhdGljIHZvaWQKLW9uX25ld193aW5kb3codm9pZCAqdXNlcl9kYXRhLCBFdmFz X09iamVjdCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3N0YXRpYyBFdmFzX09iamVjdCoK K29uX25ld193aW5kb3coRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgd2lkdGgs IEV2YXNfQ29vcmQgaGVpZ2h0KQogewotICAgIEV2YXNfT2JqZWN0ICoqbmV3X3ZpZXcgPSAoRXZh c19PYmplY3QgKiopZXZlbnRfaW5mbzsKLSAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2lu ZG93X2NyZWF0ZShOVUxMKTsKLSAgICAqbmV3X3ZpZXcgPSB3aW5kb3ctPndlYnZpZXc7CisgICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgd2lkdGgsIGhlaWdo dCk7CiAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKKyAg ICByZXR1cm4gd2luZG93LT53ZWJ2aWV3OwogfQogCiBzdGF0aWMgdm9pZApAQCAtOTM4LDcgKzkz OCw3IEBACiAgICAgcmV0dXJuIGJ1dHRvbjsKIH0KIAotc3RhdGljIEJyb3dzZXJfV2luZG93ICp3 aW5kb3dfY3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2lu ZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKICAg ICBCcm93c2VyX1dpbmRvdyAqYXBwX2RhdGEgPSBtYWxsb2Moc2l6ZW9mKEJyb3dzZXJfV2luZG93 KSk7CiAgICAgaWYgKCFhcHBfZGF0YSkgewpAQCAtMTAzMCw2ICsxMDMwLDcgQEAKICAgICBld2tW aWV3Q2xhc3MtPndpbmRvd19nZW9tZXRyeV9zZXQgPSBvbl93aW5kb3dfZ2VvbWV0cnlfc2V0Owog ICAgIGV3a1ZpZXdDbGFzcy0+ZnVsbHNjcmVlbl9lbnRlciA9IG9uX2Z1bGxzY3JlZW5fZW50ZXI7 CiAgICAgZXdrVmlld0NsYXNzLT5mdWxsc2NyZWVuX2V4aXQgPSBvbl9mdWxsc2NyZWVuX2V4aXQ7 CisgICAgZXdrVmlld0NsYXNzLT53aW5kb3dfY3JlYXRlX25ldyA9IG9uX25ld193aW5kb3c7CiAK ICAgICBFdmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQoYXBwX2RhdGEtPndpbmRvdyk7 CiAgICAgRXZhc19TbWFydCAqc21hcnQgPSBldmFzX3NtYXJ0X2NsYXNzX25ldygmZXdrVmlld0Ns YXNzLT5zYyk7CkBAIC0xMDQ3LDcgKzEwNDgsNiBAQAogCiAgICAgZXZhc19vYmplY3Rfc21hcnRf Y2FsbGJhY2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiYXV0aGVudGljYXRpb24scmVxdWVzdCIs IG9uX2F1dGhlbnRpY2F0aW9uX3JlcXVlc3QsIGFwcF9kYXRhKTsKICAgICBldmFzX29iamVjdF9z bWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJjbG9zZSx3aW5kb3ciLCBvbl9j bG9zZV93aW5kb3csIGFwcF9kYXRhKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h ZGQoYXBwX2RhdGEtPndlYnZpZXcsICJjcmVhdGUsd2luZG93Iiwgb25fbmV3X3dpbmRvdywgYXBw X2RhdGEpOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2Vi dmlldywgImRvd25sb2FkLGZhaWxlZCIsIG9uX2Rvd25sb2FkX2ZhaWxlZCwgYXBwX2RhdGEpOwog ICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2VidmlldywgImRv d25sb2FkLGZpbmlzaGVkIiwgb25fZG93bmxvYWRfZmluaXNoZWQsIGFwcF9kYXRhKTsKICAgICBl dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJkb3dubG9h ZCxyZXF1ZXN0Iiwgb25fZG93bmxvYWRfcmVxdWVzdCwgYXBwX2RhdGEpOwpAQCAtMTA3Miw3ICsx MDcyLDcgQEAKICAgICBpZiAodXJsKQogICAgICAgICBld2tfdmlld191cmxfc2V0KGFwcF9kYXRh LT53ZWJ2aWV3LCB1cmwpOwogCi0gICAgZXZhc19vYmplY3RfcmVzaXplKGFwcF9kYXRhLT53aW5k b3csIHdpbmRvd193aWR0aCwgd2luZG93X2hlaWdodCk7CisgICAgZXZhc19vYmplY3RfcmVzaXpl KGFwcF9kYXRhLT53aW5kb3csIHdpZHRoID8gd2lkdGggOiB3aW5kb3dfd2lkdGgsIGhlaWdodCA/ IGhlaWdodCA6IHdpbmRvd19oZWlnaHQpOwogICAgIGV2YXNfb2JqZWN0X3Nob3coYXBwX2RhdGEt PndpbmRvdyk7CiAKICAgICB2aWV3X2ZvY3VzX3NldChhcHBfZGF0YSwgRUlOQV9UUlVFKTsKQEAg LTExNTgsMTAgKzExNTgsMTAgQEAKIAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBj aGFyICp1cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKHVybCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUo dXJsLCAwLCAwKTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93 X2NyZWF0ZShERUZBVUxUX1VSTCwgMCwgMCk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAg cmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIg d2luZG93LlxuIik7Cg==