98657 2012-10-08 09:43:16 -0700 [EFL][WK2] Simplify frame flattening support in MiniBrowser 2012-10-08 11:23:04 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98649 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi ryuan.choi tonikitoo webkit.review.bot oldest_to_newest 736730 0 cdumez 2012-10-08 09:43:16 -0700 The frame_flattening setting is currently being passed around to the window_create() function which is not the most convenient. We should find a nicer way to support frame flattening in MiniBrowser. 736741 1 167550 cdumez 2012-10-08 09:49:16 -0700 Created attachment 167550 Patch 736767 2 167550 webkit.review.bot 2012-10-08 10:20:26 -0700 Comment on attachment 167550 Patch Rejecting attachment 167550 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: er/efl/main.c Hunk #3 FAILED at 168. Hunk #4 succeeded at 226 (offset 2 lines). Hunk #5 succeeded at 304 (offset 2 lines). Hunk #6 succeeded at 335 (offset 2 lines). Hunk #7 succeeded at 372 (offset 2 lines). Hunk #8 succeeded at 396 (offset 2 lines). 1 out of 8 hunks FAILED -- saving rejects to file Tools/MiniBrowser/efl/main.c.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Kenneth Ro..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/14223295 736772 3 167555 cdumez 2012-10-08 10:25:09 -0700 Created attachment 167555 Patch for landing Rebased on master. Could someone please cq+? 736828 4 167555 webkit.review.bot 2012-10-08 11:23:00 -0700 Comment on attachment 167555 Patch for landing Clearing flags on attachment: 167555 Committed r130658: <http://trac.webkit.org/changeset/130658> 736829 5 webkit.review.bot 2012-10-08 11:23:04 -0700 All reviewed patches have been landed. Closing bug. 167550 2012-10-08 09:49:16 -0700 2012-10-08 10:25:09 -0700 Patch 98657_minibrowser_frame_flattening.patch text/plain 4291 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Yzdj MmIwLi42MTE2YTk5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMTItMTAtMDggIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIFNpbXBsaWZ5 IGZyYW1lIGZsYXR0ZW5pbmcgc3VwcG9ydCBpbiBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg2NTcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSBmcmFtZSBmbGF0dGVuaW5n IHN1cHBvcnQgY29kZSBpbiBNaW5pQnJvd3NlciB0bworICAgICAgICBhdm9pZCBwYXNzaW5nIHRo ZSBzZXR0aW5nIGFyb3VuZCB0byB3aW5kb3dfY3JlYXRlKCkKKyAgICAgICAgZnVuY3Rpb24oKS4K KworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChvbl9rZXlfZG93 bik6CisgICAgICAgIChvbl9uZXdfd2luZG93KToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgor ICAgICAgICAobWFpbik6CisKKzIwMTItMTAtMDggIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3Rv cGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAgICAgICBbRUZMXVtXSzJdIEFkZCBzdXBwb3J0IGZv ciB3aW5kb3cuY3JlYXRlIGluIE1pbmlicm93c2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY0OQogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBmMzUz NGIzLi43MjA5NDRhIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTM5LDYgKzM5LDcgQEAgc3RhdGlj IGNvbnN0IGNoYXIgQVBQX05BTUVbXSA9ICJFRkwgTWluaUJyb3dzZXIiOwogc3RhdGljIGludCB2 ZXJib3NlID0gMTsKIHN0YXRpYyBFaW5hX0xpc3QgKndpbmRvd3MgPSBOVUxMOwogc3RhdGljIGNo YXIgKmV2YXNfZW5naW5lX25hbWUgPSBOVUxMOworc3RhdGljIEVpbmFfQm9vbCBmcmFtZV9mbGF0 dGVuaW5nX2VuYWJsZWQgPSBFSU5BX0ZBTFNFOwogCiB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9X aW5kb3cgewogICAgIEVjb3JlX0V2YXMgKmVlOwpAQCAtNzIsNyArNzMsNyBAQCBzdGF0aWMgY29u c3QgRWNvcmVfR2V0b3B0IG9wdGlvbnMgPSB7CiAgICAgfQogfTsKIAotc3RhdGljIEJyb3dzZXJf V2luZG93ICp3aW5kb3dfY3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgRWluYV9Cb29sIGZyYW1lX2Zs YXR0ZW5pbmcpOworc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKGNvbnN0IGNo YXIgKnVybCk7CiAKIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqYnJvd3Nlcl93aW5kb3dfZmluZChF Y29yZV9FdmFzICplZSkKIHsKQEAgLTE2Nyw3ICsxNjgsNyBAQCBvbl9rZXlfZG93bih2b2lkICpk YXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAg ICBld2tfdmlld19zdG9wKG9iaik7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJG OSIpKSB7CiAgICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChGOSkgd2FzIHByZXNzZWQu XG4iKTsKLSAgICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoREVG QVVMVF9VUkwsIEVJTkFfRkFMU0UpOworICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0g d2luZG93X2NyZWF0ZShERUZBVUxUX1VSTCk7CiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3Rf YXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7CiAgICAgfQogfQpAQCAtMjIzLDcgKzIyNCw3IEBAIHN0 YXRpYyB2b2lkCiBvbl9uZXdfd2luZG93KHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKndl YnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAgRXZhc19PYmplY3QgKipuZXdfdmlldyA9 IChFdmFzX09iamVjdCAqKilldmVudF9pbmZvOwotICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cg PSB3aW5kb3dfY3JlYXRlKE5VTEwsIEVJTkFfRkFMU0UpOworICAgIEJyb3dzZXJfV2luZG93ICp3 aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwpOwogICAgICpuZXdfdmlldyA9IHdpbmRvdy0+d2Vi dmlldzsKICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwog fQpAQCAtMzAxLDcgKzMwMiw3IEBAIHF1aXQoRWluYV9Cb29sIHN1Y2Nlc3MsIGNvbnN0IGNoYXIg Km1zZykKICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQogCi1zdGF0aWMgQnJvd3Nlcl9XaW5k b3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsLCBFaW5hX0Jvb2wgZnJhbWVfZmxhdHRl bmluZykKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1 cmwpCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IG1hbGxvYyhzaXplb2YoQnJvd3Nl cl9XaW5kb3cpKTsKICAgICBpZiAoIXdpbmRvdykgewpAQCAtMzMyLDcgKzMzMyw3IEBAIHN0YXRp YyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIEVpbmFfQm9v bCBmcmFtZV9mbGF0dGVuaW5nCiAgICAgLyogQ3JlYXRlIHdlYnZpZXcgKi8KICAgICB3aW5kb3ct PndlYnZpZXcgPSBld2tfdmlld19hZGQod2luZG93LT5ldmFzKTsKICAgICBld2tfdmlld190aGVt ZV9zZXQod2luZG93LT53ZWJ2aWV3LCBUSEVNRV9ESVIiL2RlZmF1bHQuZWRqIik7Ci0gICAgZXdr X3NldHRpbmdzX2VuYWJsZV9mcmFtZV9mbGF0dGVuaW5nX3NldChld2tfdmlld19zZXR0aW5nc19n ZXQod2luZG93LT53ZWJ2aWV3KSwgZnJhbWVfZmxhdHRlbmluZyk7CisgICAgZXdrX3NldHRpbmdz X2VuYWJsZV9mcmFtZV9mbGF0dGVuaW5nX3NldChld2tfdmlld19zZXR0aW5nc19nZXQod2luZG93 LT53ZWJ2aWV3KSwgZnJhbWVfZmxhdHRlbmluZ19lbmFibGVkKTsKIAogICAgIEV3a19TZXR0aW5n cyAqc2V0dGluZ3MgPSBld2tfdmlld19zZXR0aW5nc19nZXQod2luZG93LT53ZWJ2aWV3KTsKICAg ICBld2tfc2V0dGluZ3NfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfYWxsb3dlZF9zZXQoc2V0 dGluZ3MsIEVJTkFfVFJVRSk7CkBAIC0zNjksMTIgKzM3MCwxMCBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqYXJndltdKQogICAgIHVuc2lnbmVkIGNoYXIgcXVpdE9wdGlvbiA9IDA7CiAgICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdzsKIAotICAgIEVpbmFfQm9vbCBmcmFtZV9mbGF0dGVuaW5n ID0gRUlOQV9GQUxTRTsKLQogICAgIEVjb3JlX0dldG9wdF9WYWx1ZSB2YWx1ZXNbXSA9IHsKICAg ICAgICAgRUNPUkVfR0VUT1BUX1ZBTFVFX1NUUihldmFzX2VuZ2luZV9uYW1lKSwKICAgICAgICAg RUNPUkVfR0VUT1BUX1ZBTFVFX0JPT0wocXVpdE9wdGlvbiksCi0gICAgICAgIEVDT1JFX0dFVE9Q VF9WQUxVRV9CT09MKGZyYW1lX2ZsYXR0ZW5pbmcpLAorICAgICAgICBFQ09SRV9HRVRPUFRfVkFM VUVfQk9PTChmcmFtZV9mbGF0dGVuaW5nX2VuYWJsZWQpLAogICAgICAgICBFQ09SRV9HRVRPUFRf VkFMVUVfQk9PTChxdWl0T3B0aW9uKSwKICAgICAgICAgRUNPUkVfR0VUT1BUX1ZBTFVFX0JPT0wo cXVpdE9wdGlvbiksCiAgICAgICAgIEVDT1JFX0dFVE9QVF9WQUxVRV9CT09MKHF1aXRPcHRpb24p LApAQCAtMzk1LDEwICszOTQsMTAgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBjaGFyICp1cmwgPSB1cmxfZnJvbV91 c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKHVy bCwgZnJhbWVfZmxhdHRlbmluZyk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUodXJs KTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5kb3cgPSB3aW5k b3dfY3JlYXRlKERFRkFVTFRfVVJMLCBmcmFtZV9mbGF0dGVuaW5nKTsKKyAgICAgICAgd2luZG93 ID0gd2luZG93X2NyZWF0ZShERUZBVUxUX1VSTCk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAg ICAgcmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dz ZXIgd2luZG93LlxuIik7Cg== 167555 2012-10-08 10:25:09 -0700 2012-10-08 11:23:00 -0700 Patch for landing 98657_minibrowser_frame_flattening.patch text/plain 4344 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiOTI4 ZDQwLi44NmM1NjUzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMTItMTAtMDggIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIFNpbXBsaWZ5 IGZyYW1lIGZsYXR0ZW5pbmcgc3VwcG9ydCBpbiBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg2NTcKKworICAgICAgICBSZXZpZXdl ZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBTaW1wbGlmeSBmcmFt ZSBmbGF0dGVuaW5nIHN1cHBvcnQgY29kZSBpbiBNaW5pQnJvd3NlciB0bworICAgICAgICBhdm9p ZCBwYXNzaW5nIHRoZSBzZXR0aW5nIGFyb3VuZCB0byB3aW5kb3dfY3JlYXRlKCkKKyAgICAgICAg ZnVuY3Rpb24oKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAg IChvbl9rZXlfZG93bik6CisgICAgICAgIChvbl9uZXdfd2luZG93KToKKyAgICAgICAgKHdpbmRv d19jcmVhdGUpOgorICAgICAgICAobWFpbik6CisKKzIwMTItMTAtMDggIENocmlzdG9waGUgRHVt ZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAgICAgICBbRUZMXSBVc2UgQ3Ry bCtuIHNob3J0Y3V0IHRvIGNyZWF0ZSBhIG5ldyB3aW5kb3cgaW4gTWluaUJyb3dzZXIgLyBFV2Vi TGF1bmNoZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk4NjU1CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDgzNGVmZjMuLjM3OWNjZjAgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYwpAQCAtMzksNiArMzksNyBAQCBzdGF0aWMgY29uc3QgY2hhciBBUFBfTkFNRVtd ID0gIkVGTCBNaW5pQnJvd3NlciI7CiBzdGF0aWMgaW50IHZlcmJvc2UgPSAxOwogc3RhdGljIEVp bmFfTGlzdCAqd2luZG93cyA9IE5VTEw7CiBzdGF0aWMgY2hhciAqZXZhc19lbmdpbmVfbmFtZSA9 IE5VTEw7CitzdGF0aWMgRWluYV9Cb29sIGZyYW1lX2ZsYXR0ZW5pbmdfZW5hYmxlZCA9IEVJTkFf RkFMU0U7CiAKIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgRWNvcmVfRXZh cyAqZWU7CkBAIC03Miw3ICs3Myw3IEBAIHN0YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0aW9u cyA9IHsKICAgICB9CiB9OwogCi1zdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUo Y29uc3QgY2hhciAqdXJsLCBFaW5hX0Jvb2wgZnJhbWVfZmxhdHRlbmluZyk7CitzdGF0aWMgQnJv d3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKTsKIAogc3RhdGljIEJy b3dzZXJfV2luZG93ICpicm93c2VyX3dpbmRvd19maW5kKEVjb3JlX0V2YXMgKmVlKQogewpAQCAt MTY5LDcgKzE3MCw3IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2Jq ZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIGV3a192aWV3X3N0b3Aob2JqKTsK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewog ICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIp OwotICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShERUZBVUxU X1VSTCwgRUlOQV9GQUxTRSk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5k b3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKICAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBl bmQod2luZG93cywgd2luZG93KTsKICAgICB9CiB9CkBAIC0yMjUsNyArMjI2LDcgQEAgc3RhdGlj IHZvaWQKIG9uX25ld193aW5kb3codm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqd2Vidmll dywgdm9pZCAqZXZlbnRfaW5mbykKIHsKICAgICBFdmFzX09iamVjdCAqKm5ld192aWV3ID0gKEV2 YXNfT2JqZWN0ICoqKWV2ZW50X2luZm87Ci0gICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdp bmRvd19jcmVhdGUoTlVMTCwgRUlOQV9GQUxTRSk7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRv dyA9IHdpbmRvd19jcmVhdGUoTlVMTCk7CiAgICAgKm5ld192aWV3ID0gd2luZG93LT53ZWJ2aWV3 OwogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7CiB9CkBA IC0zMDMsNyArMzA0LDcgQEAgcXVpdChFaW5hX0Jvb2wgc3VjY2VzcywgY29uc3QgY2hhciAqbXNn KQogICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKLXN0YXRpYyBCcm93c2VyX1dpbmRvdyAq d2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIEVpbmFfQm9vbCBmcmFtZV9mbGF0dGVuaW5n KQorc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKGNvbnN0IGNoYXIgKnVybCkK IHsKICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gbWFsbG9jKHNpemVvZihCcm93c2VyX1dp bmRvdykpOwogICAgIGlmICghd2luZG93KSB7CkBAIC0zMzQsNyArMzM1LDcgQEAgc3RhdGljIEJy b3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgRWluYV9Cb29sIGZy YW1lX2ZsYXR0ZW5pbmcKICAgICAvKiBDcmVhdGUgd2VidmlldyAqLwogICAgIHdpbmRvdy0+d2Vi dmlldyA9IGV3a192aWV3X2FkZCh3aW5kb3ctPmV2YXMpOwogICAgIGV3a192aWV3X3RoZW1lX3Nl dCh3aW5kb3ctPndlYnZpZXcsIFRIRU1FX0RJUiIvZGVmYXVsdC5lZGoiKTsKLSAgICBld2tfc2V0 dGluZ3NfZW5hYmxlX2ZyYW1lX2ZsYXR0ZW5pbmdfc2V0KGV3a192aWV3X3NldHRpbmdzX2dldCh3 aW5kb3ctPndlYnZpZXcpLCBmcmFtZV9mbGF0dGVuaW5nKTsKKyAgICBld2tfc2V0dGluZ3NfZW5h YmxlX2ZyYW1lX2ZsYXR0ZW5pbmdfc2V0KGV3a192aWV3X3NldHRpbmdzX2dldCh3aW5kb3ctPndl YnZpZXcpLCBmcmFtZV9mbGF0dGVuaW5nX2VuYWJsZWQpOwogCiAgICAgRXdrX1NldHRpbmdzICpz ZXR0aW5ncyA9IGV3a192aWV3X3NldHRpbmdzX2dldCh3aW5kb3ctPndlYnZpZXcpOwogICAgIGV3 a19zZXR0aW5nc19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19hbGxvd2VkX3NldChzZXR0aW5n cywgRUlOQV9UUlVFKTsKQEAgLTM3MSwxMiArMzcyLDEwIEBAIGludCBtYWluKGludCBhcmdjLCBj aGFyICphcmd2W10pCiAgICAgdW5zaWduZWQgY2hhciBxdWl0T3B0aW9uID0gMDsKICAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93OwogCi0gICAgRWluYV9Cb29sIGZyYW1lX2ZsYXR0ZW5pbmcgPSBF SU5BX0ZBTFNFOwotCiAgICAgRWNvcmVfR2V0b3B0X1ZhbHVlIHZhbHVlc1tdID0gewogICAgICAg ICBFQ09SRV9HRVRPUFRfVkFMVUVfU1RSKGV2YXNfZW5naW5lX25hbWUpLAogICAgICAgICBFQ09S RV9HRVRPUFRfVkFMVUVfQk9PTChxdWl0T3B0aW9uKSwKLSAgICAgICAgRUNPUkVfR0VUT1BUX1ZB TFVFX0JPT0woZnJhbWVfZmxhdHRlbmluZyksCisgICAgICAgIEVDT1JFX0dFVE9QVF9WQUxVRV9C T09MKGZyYW1lX2ZsYXR0ZW5pbmdfZW5hYmxlZCksCiAgICAgICAgIEVDT1JFX0dFVE9QVF9WQUxV RV9CT09MKHF1aXRPcHRpb24pLAogICAgICAgICBFQ09SRV9HRVRPUFRfVkFMVUVfQk9PTChxdWl0 T3B0aW9uKSwKICAgICAgICAgRUNPUkVfR0VUT1BUX1ZBTFVFX0JPT0wocXVpdE9wdGlvbiksCkBA IC0zOTcsMTAgKzM5NiwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAg ICAgaWYgKGFyZ3MgPCBhcmdjKSB7CiAgICAgICAgIGNoYXIgKnVybCA9IHVybF9mcm9tX3VzZXJf aW5wdXQoYXJndlthcmdzXSk7Ci0gICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUodXJsLCBm cmFtZV9mbGF0dGVuaW5nKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSh1cmwpOwog ICAgICAgICBmcmVlKHVybCk7CiAgICAgfSBlbHNlCi0gICAgICAgIHdpbmRvdyA9IHdpbmRvd19j cmVhdGUoREVGQVVMVF9VUkwsIGZyYW1lX2ZsYXR0ZW5pbmcpOworICAgICAgICB3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKIAogICAgIGlmICghd2luZG93KQogICAgICAgICBy ZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiRVJST1I6IGNvdWxkIG5vdCBjcmVhdGUgYnJvd3NlciB3 aW5kb3cuXG4iKTsK