122485 2013-10-07 21:14:12 -0700 [EFL] Minibrowser can't load child window's location 2013-10-16 01:46:42 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi cdumez commit-queue gyuyoung.kim lucas.de.marchi mikhail.pozdnyakov rakuco r.plociennik oldest_to_newest 937359 0 ryuan.choi 2013-10-07 21:14:12 -0700 Minibrowser/Efl is not working with below simple script. <script> var a = function() { var w = window.open("", ""); w.location.href="http://www.webkit.org"; </script> It's because Minibrowser try to load "" although loaded started to load "webkit.org". 940307 1 214348 r.plociennik 2013-10-16 01:11:05 -0700 Created attachment 214348 Proposed patch 940311 2 214348 ryuan.choi 2013-10-16 01:19:46 -0700 Comment on attachment 214348 Proposed patch Looks good to me. Thanks for the patch. 940312 3 214348 gyuyoung.kim 2013-10-16 01:21:37 -0700 Comment on attachment 214348 Proposed patch Looks ok. 940324 4 214348 commit-queue 2013-10-16 01:46:39 -0700 Comment on attachment 214348 Proposed patch Clearing flags on attachment: 214348 Committed r157502: <http://trac.webkit.org/changeset/157502> 940325 5 commit-queue 2013-10-16 01:46:42 -0700 All reviewed patches have been landed. Closing bug. 214348 2013-10-16 01:11:05 -0700 2013-10-16 01:46:39 -0700 Proposed patch 122485.patch text/plain 9637 r.plociennik ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhOTRjMzIzLi40YzU3NTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTMtMTAtMTUgIFJvYmVydCBQbG9jaWVubmlrICA8ci5wbG9jaWVubmlrQHNhbXN1bmcu Y29tPgorCisgICAgICAgIFtFRkxdIE1pbmlicm93c2VyIGNhbid0IGxvYWQgY2hpbGQgd2luZG93 J3MgbG9jYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMjQ4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEV3a1ZpZXc6OmNyZWF0ZU5ld1BhZ2UoKSwgd2hpY2ggaXMgb25seSBjYWxsZWQgZHVyaW5n IGhhbmRsaW5nIG9mCisgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNyZWF0ZU5ld1Bh Z2UgbWVzc2FnZSBmcm9tIFdlYlByb2Nlc3MsIG5vIGxvbmdlciBwYXNzZXMKKyAgICAgICAgdGhl IFVSTCB0byB3aW5kb3dfY3JlYXRlKCkuIEFzIGEgcmVzdWx0LCBubyBNZXNzYWdlczo6V2ViUGFn ZTo6TG9hZFVSTCBtZXNzYWdlCisgICAgICAgIGlzIHNlbnQgYmFjaywgdGhhdCB3b3VsZCBsb2Fk IHRoZSBzYW1lIFVSTCB0d2ljZSBhbmQgZWZmZWN0aXZlbHkgY2FuY2VsIGFueQorICAgICAgICBv dGhlciBzY2hlZHVsZWQgbmF2aWdhdGlvbiBpbnNpZGUgV2ViUHJvY2Vzcy4KKworICAgICAgICBB ZGRpdGlvbmFsbHksIHNpbmNlIHRoZSB1cmwgcGFyYW1ldGVyIGluIE1pbmlCcm93c2VyJ3MgaW1w bGVtZW50YXRpb24gb2YKKyAgICAgICAgd2luZG93X2NyZWF0ZSgpIGlzIG9ubHkgdXNlZCBpbnRl cm5hbGx5IGFuZCBpcyBwcm9uZSB0byBidWdzIGFzIGRlbW9uc3RyYXRlZAorICAgICAgICBpbiBy MTM5MzAzIChkN2YxMGM4KSwgaXQgaGFzIGJlZW4gcmVtb3ZlZCBpbiBmYXZvdXIgb2YgZXhwbGlj aXQgY2FsbHMgdG8KKyAgICAgICAgZXdrX3ZpZXdfdXJsX3NldCgpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpjcmVhdGVOZXdQ YWdlKTogTm8gbG9uZ2VyIHBhc3NlcyB0aGUgVVJMIHRvIHdpbmRvd19jcmVhdGUoKSBpbXBsLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6IHdpbmRvd19jcmVhdGUoKSBu byBsb25nZXIgaGFzIHRoZSB1cmwgcGFyYW1ldGVyLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv ZWZsL3Rlc3RzL3Rlc3RfZXdrMl93aW5kb3dfZmVhdHVyZXMuY3BwOiBUZXN0IG1ldGhvZHMgdXBk YXRlZCB0bworICAgICAgICAgICAgY29tcGx5IHdpdGggdGhlIEFQSSBjaGFuZ2UuCisgICAgICAg IChFV0syV2luZG93RmVhdHVyZXNUZXN0OjpjcmVhdGVEZWZhdWx0V2luZG93KTogRGl0dG8uCisg ICAgICAgIChFV0syV2luZG93RmVhdHVyZXNUZXN0OjpjcmVhdGVXaW5kb3cpOiBEaXR0by4KKwog MjAxMy0xMC0xNSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtTb3VwXSBVbnJldmlld2VkIGJ1aWxkZml4IGFmdGVyIHIxNTc0NDUgZm9yIEVOQUJMRShO RVRXT1JLX1BST0NFU1MpIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5jcHAKaW5kZXggYzhjOWFlNC4uNjgwMTNlNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKQEAgLTEwODUsNyArMTA4NSw3IEBAIFdL UGFnZVJlZiBFd2tWaWV3OjpjcmVhdGVOZXdQYWdlKFBhc3NSZWZQdHI8RXdrVXJsUmVxdWVzdD4g cmVxdWVzdCwgV0tEaWN0aW9uYXJ5CiAKICAgICBSZWZQdHI8RXdrV2luZG93RmVhdHVyZXM+IGV3 a1dpbmRvd0ZlYXR1cmVzID0gRXdrV2luZG93RmVhdHVyZXM6OmNyZWF0ZSh3aW5kb3dGZWF0dXJl cywgdGhpcyk7CiAKLSAgICBFdmFzX09iamVjdCogbmV3RXdrVmlldyA9IHNkLT5hcGktPndpbmRv d19jcmVhdGUoc2QsIHJlcXVlc3QtPnVybCgpLCBld2tXaW5kb3dGZWF0dXJlcy5nZXQoKSk7Cisg ICAgRXZhc19PYmplY3QqIG5ld0V3a1ZpZXcgPSBzZC0+YXBpLT53aW5kb3dfY3JlYXRlKHNkLCBl d2tXaW5kb3dGZWF0dXJlcy5nZXQoKSk7CiAgICAgaWYgKCFuZXdFd2tWaWV3KQogICAgICAgICBy ZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgK aW5kZXggZTk5MTY5Mi4uMjQ0ZTQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5oCkBAIC0xNTQsNyArMTU0LDcgQEAgc3RydWN0IEV3a19WaWV3X1NtYXJ0 X0NsYXNzIHsKIAogICAgIC8vIHdpbmRvdyBjcmVhdGlvbiBhbmQgY2xvc2luZzoKICAgICAvLyAg IC0gQ3JlYXRlIGEgbmV3IHdpbmRvdyB3aXRoIHNwZWNpZmllZCBmZWF0dXJlcyBhbmQgY2xvc2Ug d2luZG93LgotICAgIEV2YXNfT2JqZWN0ICooKndpbmRvd19jcmVhdGUpKEV3a19WaWV3X1NtYXJ0 X0RhdGEgKnNkLCBjb25zdCBjaGFyKiB1cmwsIGNvbnN0IEV3a19XaW5kb3dfRmVhdHVyZXMgKndp bmRvd19mZWF0dXJlcyk7CisgICAgRXZhc19PYmplY3QgKigqd2luZG93X2NyZWF0ZSkoRXdrX1Zp ZXdfU21hcnRfRGF0YSAqc2QsIGNvbnN0IEV3a19XaW5kb3dfRmVhdHVyZXMgKndpbmRvd19mZWF0 dXJlcyk7CiAgICAgdm9pZCAoKndpbmRvd19jbG9zZSkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2Qp OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX3dpbmRvd19mZWF0dXJlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfd2luZG93X2ZlYXR1cmVzLmNwcAppbmRleCAyNGNh OWE0Li5mMzRmMjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfd2luZG93X2ZlYXR1cmVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfd2luZG93X2ZlYXR1cmVzLmNwcApA QCAtMzUsNyArMzUsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogY2xhc3MgRVdLMldp bmRvd0ZlYXR1cmVzVGVzdCA6IHB1YmxpYyBFV0syVW5pdFRlc3RCYXNlIHsKIHB1YmxpYzoKLSAg ICBzdGF0aWMgRXZhc19PYmplY3QqIGNyZWF0ZURlZmF1bHRXaW5kb3coRXdrX1ZpZXdfU21hcnRf RGF0YSogc21hcnREYXRhLCBjb25zdCBjaGFyKiwgY29uc3QgRXdrX1dpbmRvd19GZWF0dXJlcyog d2luZG93RmVhdHVyZXMpCisgICAgc3RhdGljIEV2YXNfT2JqZWN0KiBjcmVhdGVEZWZhdWx0V2lu ZG93KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QgRXdrX1dpbmRvd19GZWF0 dXJlcyogd2luZG93RmVhdHVyZXMpCiAgICAgewogICAgICAgICAvLyBkZWZhdWx0IHZhbHVlcyBv ZiBXZWJDb3JlOldpbmRvd0ZlYXR1cmVzKCkKICAgICAgICAgLy8gLSBtZW51QmFyVmlzaWJsZSh0 cnVlKQpAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAwOwogICAgIH0K IAotICAgIHN0YXRpYyBFdmFzX09iamVjdCogY3JlYXRlV2luZG93KEV3a19WaWV3X1NtYXJ0X0Rh dGEgKnNtYXJ0RGF0YSwgY29uc3QgY2hhciosIGNvbnN0IEV3a19XaW5kb3dfRmVhdHVyZXMgKndp bmRvd0ZlYXR1cmVzKQorICAgIHN0YXRpYyBFdmFzX09iamVjdCogY3JlYXRlV2luZG93KEV3a19W aWV3X1NtYXJ0X0RhdGEgKnNtYXJ0RGF0YSwgY29uc3QgRXdrX1dpbmRvd19GZWF0dXJlcyAqd2lu ZG93RmVhdHVyZXMpCiAgICAgewogICAgICAgICBFWFBFQ1RfRkFMU0UoZXdrX3dpbmRvd19mZWF0 dXJlc190b29sYmFyX3Zpc2libGVfZ2V0KHdpbmRvd0ZlYXR1cmVzKSk7CiAgICAgICAgIEVYUEVD VF9UUlVFKGV3a193aW5kb3dfZmVhdHVyZXNfc3RhdHVzYmFyX3Zpc2libGVfZ2V0KHdpbmRvd0Zl YXR1cmVzKSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggOTE5OWM3OS4uMWUzODJhMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTEwLTE1ICBSb2JlcnQgUGxv Y2llbm5payAgPHIucGxvY2llbm5pa0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBNaW5p YnJvd3NlciBjYW4ndCBsb2FkIGNoaWxkIHdpbmRvdydzIGxvY2F0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0ODUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWlu LmM6IE5vdyBjYWxsaW5nIHdpbmRvd19jcmVhdGUoKSB3aXRob3V0IHRoZSB1cmwgcGFyYW1ldGVy CisgICAgICAgICAgICBmb2xsb3dlZCBieSBhbiBleHBsaWNpdCBjYWxsIHRvIGV3a192aWV3X3Vy bF9zZXQoKSB3aGVyZSBhcHByb3ByaWF0ZS4KKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAg ICAgKG9uX3dpbmRvd19jcmVhdGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAg IChlbG1fbWFpbik6CisKIDIwMTMtMTAtMTQgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25nQGFwcGxl LmNvbT4KIAogICAgICAgICBBZGRpbmcgbXlzZWxmIHRvIENDIGxpc3QgZm9yIHNvbWUgY29tcG9u ZW50cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9N aW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDAzZjljZjguLmY3ZWE5YTIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYwpAQCAtMTgwLDcgKzE4MCw3IEBAIHN0YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0 aW9ucyA9IHsKIH07CiAKIHN0YXRpYyBFaW5hX1N0cmluZ3NoYXJlICpzaG93X2ZpbGVfZW50cnlf ZGlhbG9nKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIGNvbnN0IGNoYXIgKmxhYmVsX3RhZywgY29u c3QgY2hhciAqZGVmYXVsdF90ZXh0KTsKLXN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2Ny ZWF0ZShFdmFzX09iamVjdCogb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50 IGhlaWdodCwgRWluYV9Cb29sIHZpZXdfbW9kZSk7CitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndp bmRvd19jcmVhdGUoRXZhc19PYmplY3QqIG9wZW5lciwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBF aW5hX0Jvb2wgdmlld19tb2RlKTsKIAogc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfZmlu ZF93aXRoX2VsbV93aW5kb3coRXZhc19PYmplY3QgKmVsbV93aW5kb3cpCiB7CkBAIC00MjIsMTQg KzQyMiwxNiBAQCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2Jq ZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgIGluZm8oIkNoYW5n ZSBQYWdpbmF0aW9uIE1vZGUgKEY3KSB3YXMgcHJlc3NlZCwgYnV0IE5PVCBjaGFuZ2VkISIpOwog ICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjgiKSkgewogICAgICAgICBpbmZvKCJD cmVhdGUgc291Y2UgY29kZSB3aW5kb3cgKEY4KSB3YXMgcHJlc3NlZC4iKTsKLSAgICAgICAgQnJv d3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoZXdrX3ZpZXcsIGV3a192aWV3X3Vy bF9nZXQoZXdrX3ZpZXcpLCAwLCAwLCBFSU5BX1RSVUUpOworICAgICAgICBCcm93c2VyX1dpbmRv dyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShld2tfdmlldywgMCwgMCwgRUlOQV9UUlVFKTsKKyAg ICAgICAgZXdrX3ZpZXdfdXJsX3NldCh3aW5kb3ctPmV3a192aWV3LCBld2tfdmlld191cmxfZ2V0 KGV3a192aWV3KSk7CiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3Ms IHdpbmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMTEiKSkgewogICAg ICAgICBpbmZvKCJGdWxsc2NyZWVuIChGMTEpIHdhcyBwcmVzc2VkLCB0b2dnbGluZyB3aW5kb3cv ZnVsbHNjcmVlbi4iKTsKICAgICAgICAgZWxtX3dpbl9mdWxsc2NyZWVuX3NldCh3aW5kb3ctPmVs bV93aW5kb3csICFlbG1fd2luX2Z1bGxzY3JlZW5fZ2V0KHdpbmRvdy0+ZWxtX3dpbmRvdykpOwog ICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAibiIpICYmIGN0cmxQcmVzc2VkKSB7CiAg ICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChDdHJsK24pIHdhcyBwcmVzc2VkLiIpOwot ICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShOVUxMLCBERUZB VUxUX1VSTCwgMCwgMCwgRUlOQV9GQUxTRSk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIDAsIDAsIEVJTkFfRkFMU0UpOworICAgICAgICBld2tf dmlld191cmxfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIERFRkFVTFRfVVJMKTsKICAgICAgICAgLy8g MCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQgaGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0gZWlu YV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChl di0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2VkKSB7CkBAIC0xMzUzLDcgKzEzNTUsNyBAQCBzdGF0 aWMgRWluYV9Cb29sIG9uX2Z1bGxzY3JlZW5fZXhpdChFd2tfVmlld19TbWFydF9EYXRhICpzZCkK IH0KIAogc3RhdGljIEV2YXNfT2JqZWN0ICoKLW9uX3dpbmRvd19jcmVhdGUoRXdrX1ZpZXdfU21h cnRfRGF0YSAqc21hcnREYXRhLCBjb25zdCBjaGFyICp1cmwsIGNvbnN0IEV3a19XaW5kb3dfRmVh dHVyZXMgKndpbmRvd19mZWF0dXJlcykKK29uX3dpbmRvd19jcmVhdGUoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc21hcnREYXRhLCBjb25zdCBFd2tfV2luZG93X0ZlYXR1cmVzICp3aW5kb3dfZmVhdHVy ZXMpCiB7CiAgICAgaW50IHggPSAwOwogICAgIGludCB5ID0gMDsKQEAgLTEzNjgsMTIgKzEzNzAs MTIgQEAgb25fd2luZG93X2NyZWF0ZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEsIGNv bnN0IGNoYXIgKnVybCwgY29uc3QgRXdrX1dpbmQKICAgICBpZiAoIWhlaWdodCkKICAgICAgICAg aGVpZ2h0ID0gd2luZG93X2hlaWdodDsKIAotICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKHNtYXJ0RGF0YS0+c2VsZiwgdXJsLCB3aWR0aCwgaGVpZ2h0LCBFSU5BX0ZB TFNFKTsKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShzbWFydERh dGEtPnNlbGYsIHdpZHRoLCBoZWlnaHQsIEVJTkFfRkFMU0UpOwogICAgIEV2YXNfT2JqZWN0ICpu ZXdfdmlldyA9IHdpbmRvdy0+ZXdrX3ZpZXc7CiAKICAgICB3aW5kb3dzID0gZWluYV9saXN0X2Fw cGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogCi0gICAgaW5mbygibWluaWJyb3dzZXI6IGxvY2F0aW9u KCVkLCVkKSBzaXplPSglZCwlZCkgdXJsPSVzIiwgeCwgeSwgd2lkdGgsIGhlaWdodCwgdXJsKTsK KyAgICBpbmZvKCJtaW5pYnJvd3NlcjogbG9jYXRpb24oJWQsJWQpIHNpemU9KCVkLCVkKSIsIHgs IHksIHdpZHRoLCBoZWlnaHQpOwogCiAgICAgcmV0dXJuIG5ld192aWV3OwogfQpAQCAtMTY2Myw3 ICsxNjY1LDcgQEAgY3JlYXRlX3Rvb2xiYXJfYnV0dG9uKEV2YXNfT2JqZWN0ICplbG1fd2luZG93 LCBjb25zdCBjaGFyICppY29uX25hbWUpCiAgICAgcmV0dXJuIGJ1dHRvbjsKIH0KIAotc3RhdGlj IEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0 IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBFaW5hX0Jvb2wgdmlld19tb2RlKQor c3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIs IGludCB3aWR0aCwgaW50IGhlaWdodCwgRWluYV9Cb29sIHZpZXdfbW9kZSkKIHsKICAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gY2FsbG9jKDEsIHNpemVvZihCcm93c2VyX1dpbmRvdykpOwog ICAgIGlmICghd2luZG93KSB7CkBAIC0xODYzLDkgKzE4NjUsNiBAQCBzdGF0aWMgQnJvd3Nlcl9X aW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJs LCBpbnQgdwogICAgIGVsbV9ib3hfcGFja19iZWZvcmUodmVydGljYWxfbGF5b3V0LCB3aW5kb3ct PmV3a192aWV3LCB3aW5kb3ctPnNlYXJjaC5zZWFyY2hfYmFyKTsKICAgICBldmFzX29iamVjdF9z aG93KHdpbmRvdy0+ZXdrX3ZpZXcpOwogCi0gICAgaWYgKHVybCAmJiBzdHJjbXAodXJsLCAiYWJv dXQ6YmxhbmsiKSkgLy8gRG8gbm90IHJlc2V0ICdhYm91dDpibGFuaycgYXMgaXQgd291bGQgZXJh c2UgYWxsIHByZXZpb3VzIGRvY3VtZW50IG1vZGlmaWNhdGlvbnMuCi0gICAgICAgIGV3a192aWV3 X3VybF9zZXQod2luZG93LT5ld2tfdmlldywgdXJsKTsKLQogICAgIGV2YXNfb2JqZWN0X3Jlc2l6 ZSh3aW5kb3ctPmVsbV93aW5kb3csIHdpZHRoID8gd2lkdGggOiB3aW5kb3dfd2lkdGgsIGhlaWdo dCA/IGhlaWdodCA6IHdpbmRvd19oZWlnaHQpOwogICAgIGV2YXNfb2JqZWN0X3Nob3cod2luZG93 LT5lbG1fd2luZG93KTsKICAgICBzZWFyY2hfYm94X2hpZGUod2luZG93KTsKQEAgLTE5ODAsMTAg KzE5NzksMTMgQEAgZWxtX21haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogICAgIGlmIChh cmdzIDwgYXJnYykgewogICAgICAgICBjaGFyICp1cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFy Z3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIHVybCwgMCwg MCwgRUlOQV9GQUxTRSk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgMCwg MCwgRUlOQV9GQUxTRSk7CisgICAgICAgIGV3a192aWV3X3VybF9zZXQod2luZG93LT5ld2tfdmll dywgdXJsKTsKICAgICAgICAgZnJlZSh1cmwpOwotICAgIH0gZWxzZQotICAgICAgICB3aW5kb3cg PSB3aW5kb3dfY3JlYXRlKE5VTEwsIERFRkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKKyAg ICB9IGVsc2UgeworICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIDAsIDAsIEVJ TkFfRkFMU0UpOworICAgICAgICBld2tfdmlld191cmxfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIERF RkFVTFRfVVJMKTsKKyAgICB9CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuIHF1 aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93Llxu Iik7Cg==