161428 2016-08-31 00:09:30 -0700 [EFL] Small clean up in MiniBrowser 2016-08-31 22:50:03 -0700 1 1 1 Unclassified WebKit WebKit EFL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim lucas.de.marchi ossy tonikitoo oldest_to_newest 1224903 0 gyuyoung.kim 2016-08-31 00:09:30 -0700 Do below stuff. - Resize MiniBrowser size - Remove unnecessary spaces - Line breaking in too long line - Add const characters for scheme. 1224904 1 287497 gyuyoung.kim 2016-08-31 00:10:42 -0700 Created attachment 287497 Patch 1225190 2 287580 gyuyoung.kim 2016-08-31 17:52:32 -0700 Created attachment 287580 Patch 1225244 3 287580 ysuzuki 2016-08-31 21:42:39 -0700 Comment on attachment 287580 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=287580&action=review r=me > Tools/MiniBrowser/efl/main.c:-1060 > - eina_strbuf_append_printf(buf, "http://%s", arg); Why not using `eina_strbuf_append_printf(buf, "%s%s", HTTP_SCHEME, arg);`? 1225256 4 gyuyoung.kim 2016-08-31 22:49:11 -0700 Committed r205279: <http://trac.webkit.org/changeset/205279> 1225257 5 gyuyoung.kim 2016-08-31 22:50:03 -0700 (In reply to comment #3) > Comment on attachment 287580 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=287580&action=review > > r=me > > > Tools/MiniBrowser/efl/main.c:-1060 > > - eina_strbuf_append_printf(buf, "http://%s", arg); > > Why not using `eina_strbuf_append_printf(buf, "%s%s", HTTP_SCHEME, arg);`? Sure, land after fixing it. 287497 2016-08-31 00:10:42 -0700 2016-08-31 17:52:26 -0700 Patch bug-161428-20160831160829.patch text/plain 16246 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1MTc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJhMTRhYWFmNDE4N2U4MDRiMGE4MzgwMTI4OWQ4YzBl NGMzNTU0NS4uMTE2ODg3YWI3ZmNlOWVkYjcwMTUzOTJlZDNhZGRhNWU2Y2UwOGQ5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE2LTA4LTMwICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBbRUZMXSBTbWFsbCByZWZhY3RvcmluZyBpbiBNaW5pQnJvd3NlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxNDI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXNp emVzIE1pbmlCcm93c2VyLCBhZGQgKmNoYXIqIGNvbnN0YW50cyBmb3Igc2NoZW1lLAorICAgICAg ICBkb2VzIGxpbmUgYnJlYWtpbmcsIGFuZCByZW1vdmUgdW5uZWNlc3Nhcnkgc3BhY2VzLgorCisg ICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX21vdXNlX3doZWVs KToKKyAgICAgICAgKGhpc3RvcnlfbGlzdF9oaWRlKToKKyAgICAgICAgKHNjcmlwdF9leGVjdXRl X2NhbGxiYWNrKToKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX3VybF9jaGFu Z2VkKToKKyAgICAgICAgKG9uX2Vycm9yKToKKyAgICAgICAgKG9uX2NvbG9yX3BpY2tlcl9yZXF1 ZXN0KToKKyAgICAgICAgKHVybF9mcm9tX3VzZXJfaW5wdXQpOgorICAgICAgICAodXJsX2xvYWRf ZnJvbV91c2VyX2lucHV0KToKKyAgICAgICAgKG9uX2JhY2tfYnV0dG9uX2NsaWNrZWQpOgorICAg ICAgICAob25fc2VhcmNoX2Nhc2Vfb3B0aW9uX2NoYW5nZWQpOgorICAgICAgICAob25fc2VhcmNo X3dvcmRfc3RhcnRfb3B0aW9uX2NoYW5nZWQpOgorICAgICAgICAob25fbGlzdF9pdGVtX3NlbGVj dCk6CisgICAgICAgIChuYXZpZ2F0aW9uX2J1dHRvbl9sb25ncHJlc3NfcHJvY2Vzcyk6CisgICAg ICAgIChvbl9uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbik6CisgICAgICAgICh3aW5kb3dfY3Jl YXRlKToKKyAgICAgICAgKHBhcnNlX2Nvb2tpZXNfcG9saWN5KToKKwogMjAxNi0wOC0yOSAgQWFr YXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgRVdTIHBhdGNoIHN0 YXR1cyBwYWdlIHNob3VsZCBpbmRpY2F0ZSBib3QgY29ycmVzcG9uZGluZyB0byBlYWNoIHN0YXR1 cyBtZXNzYWdlCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBhNjk3ZmE0MzAyY2UxNjEwNTZjZDZmMzY0 NmE4NTAwMDQ1ZTIzNWUyLi4zMjE1Yzg3MTcyMWI2N2IyMzJmZWUwMjMxMjJmYWU5Y2FmYTIyZGUy IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTMwLDYgKzMwLDkgQEAgZXh0ZXJuIGludCBlZnJlZXRf Y2FjaGVfdXBkYXRlOwogCiBzdGF0aWMgY29uc3QgY2hhciBERUZBVUxUX1VSTFtdID0gImh0dHA6 Ly93d3cuZXdlYmtpdC5vcmcvIjsKIHN0YXRpYyBjb25zdCBjaGFyIEFQUF9OQU1FW10gPSAiRUZM IE1pbmlCcm93c2VyIjsKK3N0YXRpYyBjb25zdCBjaGFyIEpBVkFTQ1JJUFRfU0NIRU1FW10gPSAi amF2YXNjcmlwdDoiOworc3RhdGljIGNvbnN0IGNoYXIgRklMRV9TQ0hFTUVbXSA9ICJmaWxlOi8v IjsKK3N0YXRpYyBjb25zdCBjaGFyIEhUVFBfU0NIRU1FW10gPSAiaHR0cDovLyI7CiBzdGF0aWMg Y29uc3QgaW50IFRPT0xfQkFSX0lDT05fU0laRSA9IDI0Owogc3RhdGljIGNvbnN0IGludCBUT09M X0JBUl9CVVRUT05fU0laRSA9IDMyOwogc3RhdGljIGNvbnN0IGludCBTRUFSQ0hfRklFTERfU0la RSA9IDIwMDsKQEAgLTU1LDggKzU4LDggQEAgc3RhdGljIEVpbmFfQm9vbCB0b3VjaF9ldmVudHNf ZW5hYmxlZCA9IEVJTkFfRkFMU0U7CiBzdGF0aWMgRWluYV9Cb29sIGZpeGVkX2xheW91dF9lbmFi bGVkID0gRUlOQV9UUlVFOwogc3RhdGljIEVpbmFfQm9vbCBzZXBhcmF0ZWRfcHJvY2Vzc19lbmFi bGVkID0gRUlOQV9GQUxTRTsKIHN0YXRpYyBFaW5hX0Jvb2wgbG9uZ3ByZXNzX2VuYWJsZWQgPSBF SU5BX0ZBTFNFOwotc3RhdGljIGludCB3aW5kb3dfd2lkdGggPSA4MDA7Ci1zdGF0aWMgaW50IHdp bmRvd19oZWlnaHQgPSA2MDA7CitzdGF0aWMgaW50IHdpbmRvd193aWR0aCA9IDEwMDA7CitzdGF0 aWMgaW50IHdpbmRvd19oZWlnaHQgPSA4MDA7CiBzdGF0aWMgaW50IHNlYXJjaF9mbGFncyA9IEVX S19GSU5EX09QVElPTlNfU0hPV19ISUdITElHSFQgfCBFV0tfRklORF9PUFRJT05TX1dSQVBfQVJP VU5EIHwgRVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFOwogLyogRGVmYXVsdCB2YWx1 ZSBvZiBkZXZpY2VfcGl4ZWxfcmF0aW8gaXMgJzAnIHNvIHRoYXQgd2UgZG9uJ3Qgc2V0IGN1c3Rv bSBkZXZpY2UKICAqIHNjYWxlIGZhY3RvciB1bmxlc3MgaXQncyByZXF1aXJlZCBieSB0aGUgVXNl ci4gKi8KQEAgLTEyNiw3ICsxMjksNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cg ewogICAgICAgICBFdmFzX09iamVjdCAqaGlzdG9yeV9saXN0OwogICAgICAgICBFaW5hX0xpc3Qg Kmhpc3RvcnlfbGlzdF9pdGVtczsKICAgICB9IGhpc3Rvcnk7Ci0gICAgaW50IGN1cnJlbnRfem9v bV9sZXZlbDsgCisgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsKICAgICBUb29sdGlwX0luZm9y bWF0aW9uIHRvb2x0aXA7CiAgICAgQ29sb3JfU2VsZWN0b3IgY29sb3Jfc2VsZWN0b3I7CiAgICAg c3RydWN0IHsKQEAgLTMxNiw3ICszMTksNyBAQCBvbl9tb3VzZV93aGVlbCh2b2lkICp1c2VyX2Rh dGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbwogICAg ICAgICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQod2luZG93LT5mb3J3YXJkX2J1dHRvbiwg IWV3a192aWV3X2ZvcndhcmRfcG9zc2libGUoZXdrX3ZpZXcpKTsKICAgICAgICAgfSBlbHNlIGlm IChldi0+eiA9PSAxICYmIGV3a192aWV3X2JhY2tfcG9zc2libGUoZXdrX3ZpZXcpKSB7CiAgICAg ICAgICAgICBld2tfdmlld19iYWNrKGV3a192aWV3KTsKLSAgICAgICAgICAgIGVsbV9vYmplY3Rf ZGlzYWJsZWRfc2V0KHdpbmRvdy0+YmFja19idXR0b24sICFld2tfdmlld19iYWNrX3Bvc3NpYmxl KGV3a192aWV3KSk7ICAgICAgIAorICAgICAgICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQo d2luZG93LT5iYWNrX2J1dHRvbiwgIWV3a192aWV3X2JhY2tfcG9zc2libGUoZXdrX3ZpZXcpKTsK ICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQpIHsKICAgICAgICAgaWYgKGV2 LT56ID09IC0xICYmIHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9v bV9sZXZlbCArIDEpKSB7CkBAIC00NjYsMjEgKzQ2OSwyMSBAQCBzZWFyY2hfYm94X2hpZGUoQnJv d3Nlcl9XaW5kb3cgKndpbmRvdykKICAgICBldmFzX29iamVjdF9mb2N1c19zZXQod2luZG93LT5l d2tfdmlldywgRUlOQV9UUlVFKTsKIH0KIAotc3RhdGljIHZvaWQgCitzdGF0aWMgdm9pZAogaGlz dG9yeV9saXN0X2hpZGUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdykKIHsKICAgICAvKiBIaWRlIGhp c3RvcnkgbGlzdCAqLwogICAgIGV2YXNfb2JqZWN0X2hpZGUod2luZG93LT5oaXN0b3J5Lmhpc3Rv cnlfYm94KTsKICAgICBldmFzX29iamVjdF9oaWRlKHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xp c3QpOwotICAgIAorCiAgICAgLyogRGVyZWZlcmVuY2UgdGhlIGxpc3QgaXRlbXMgYW5kIGNsZWFy IHRoZSBoaXN0b3J5IGxpc3QgKi8KLSAgICB2b2lkICpkYXRhOyAgICAKKyAgICB2b2lkICpkYXRh OwogICAgIEVJTkFfTElTVF9GUkVFKHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3RfaXRlbXMs IGRhdGEpIHsKICAgICAgICAgZXdrX29iamVjdF91bnJlZihkYXRhKTsKICAgICB9CiAKICAgICBl bG1fZ2VubGlzdF9jbGVhcih3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0KTsKLSAgICAKKwog ICAgIC8qIEdpdmUgZm9jdXMgYmFjayB0byB0aGUgdmlldyAqLwogICAgIGVsbV9vYmplY3RfZm9j dXNfc2V0KHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2JveCwgRUlOQV9GQUxTRSk7CiAgICAgZWxt X29iamVjdF9mb2N1c19zZXQod2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdCwgRUlOQV9GQUxT RSk7CkBAIC00ODgsNyArNDkxLDcgQEAgaGlzdG9yeV9saXN0X2hpZGUoQnJvd3Nlcl9XaW5kb3cg KndpbmRvdykKIAogICAgIC8qIFJlc2V0IGZsYWdzICovCiAgICAgbG9uZ3ByZXNzX2VuYWJsZWQg PSBFSU5BX0ZBTFNFOwotfSAKK30KIAogc3RhdGljIHZvaWQgc2F2ZV9wYWdlX2NvbnRlbnRzX2Nh bGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSwgdm9p ZCAqdXNlcl9kYXRhKQogewpAQCAtNTE4LDcgKzUyMSw3IEBAIHN0YXRpYyB2b2lkIHNhdmVfcGFn ZV9jb250ZW50c19jYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNo YXIKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChmaWxlTmFtZSk7CiB9CiAKLXN0YXRpYyB2b2lk IAorc3RhdGljIHZvaWQKIHNjcmlwdF9leGVjdXRlX2NhbGxiYWNrKEV2YXNfT2JqZWN0ICpld2tf dmlldywgY29uc3QgY2hhciAqcmV0dXJuX3ZhbHVlLCB2b2lkICp1c2VyX2RhdGEpCiB7CiAgICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKQEAg LTUyOCw3ICs1MzEsNyBAQCBzY3JpcHRfZXhlY3V0ZV9jYWxsYmFjayhFdmFzX09iamVjdCAqZXdr X3ZpZXcsIGNvbnN0IGNoYXIgKnJldHVybl92YWx1ZSwgdm9pZCAqdQogICAgIGlmIChyZXR1cm5f dmFsdWUpIHsKICAgICAgICAgZWluYV9zdHJidWZfYXBwZW5kKHRleHRfYnVmZmVyLCByZXR1cm5f dmFsdWUpOwogICAgICAgICBJTkZPKCJzZWxlY3RlZCB0ZXh0IGlzOiAlcyIsIGVpbmFfc3RyYnVm X3N0cmluZ19nZXQodGV4dF9idWZmZXIpKTsKLSAgICAgICAgZWxtX2VudHJ5X2VudHJ5X3NldCh3 aW5kb3ctPnNlYXJjaC5zZWFyY2hfZmllbGQsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQodGV4dF9i dWZmZXIpKTsgICAKKyAgICAgICAgZWxtX2VudHJ5X2VudHJ5X3NldCh3aW5kb3ctPnNlYXJjaC5z ZWFyY2hfZmllbGQsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQodGV4dF9idWZmZXIpKTsKICAgICB9 CiAgICAgZWluYV9zdHJidWZfZnJlZSh0ZXh0X2J1ZmZlcik7CiAgICAgc2VhcmNoX2JveF9zaG93 KHdpbmRvdyk7CkBAIC02NTAsNyArNjUzLDggQEAgb25fa2V5X2Rvd24odm9pZCAqdXNlcl9kYXRh LCBFdmFzICplLCBFdmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAg ICAgIGlmICghb3Blbl9maWxlX25hbWUpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIEVp bmFfU3RyYnVmICp1cmlfcGF0aCA9IGVpbmFfc3RyYnVmX25ldygpOwotICAgICAgICBlaW5hX3N0 cmJ1Zl9hcHBlbmRfcHJpbnRmKHVyaV9wYXRoLCAiZmlsZTovLyVzIiwgb3Blbl9maWxlX25hbWUp OworICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKHVyaV9wYXRoLCAiJXMiLCBGSUxF X1NDSEVNRSk7CisgICAgICAgIGVpbmFfc3RyYnVmX2FwcGVuZF9wcmludGYodXJpX3BhdGgsICIl cyIsIG9wZW5fZmlsZV9uYW1lKTsKICAgICAgICAgSU5GTygicHJlc3NlZCAoQ1RSTCArIEwpIDog TG9hZGluZyBQYWdlICVzIiwgZWluYV9zdHJidWZfc3RyaW5nX2dldCh1cmlfcGF0aCkpOwogICAg ICAgICBld2tfdmlld191cmxfc2V0KGV3a192aWV3LCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KHVy aV9wYXRoKSk7CiAgICAgICAgIGVpbmFfc3RyYnVmX2ZyZWUodXJpX3BhdGgpOwpAQCAtNzE5LDcg KzcyMyw3IEBAIG9uX3VybF9jaGFuZ2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKmV3 a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogewogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cg PSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CiAgICAgY29uc3QgY2hhciAqdXJsID0gZXdr X3ZpZXdfdXJsX2dldCh3aW5kb3ctPmV3a192aWV3KTsKLSAgICBjaGFyICpjb252ZXJ0ZWRfdXJs ID0gZWxtX2VudHJ5X3V0ZjhfdG9fbWFya3VwKHVybCk7IAorICAgIGNoYXIgKmNvbnZlcnRlZF91 cmwgPSBlbG1fZW50cnlfdXRmOF90b19tYXJrdXAodXJsKTsKICAgICBlbG1fZW50cnlfZW50cnlf c2V0KHdpbmRvdy0+dXJsX2JhciwgY29udmVydGVkX3VybCk7CiAKICAgICBvbl9pY29uX2NoYW5n ZWRfY2IoZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9nZXQoZXdrX3ZpZXdfY29udGV4dF9n ZXQoZXdrX3ZpZXcpKSwgdXJsLCB1c2VyX2RhdGEpOwpAQCAtNzU5LDcgKzc2Myw4IEBAIG9uX2Vy cm9yKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9p bmZvKQogICAgICAgICByZXR1cm47CiAKICAgICBidWZmZXIgPSBlaW5hX3N0cmJ1Zl9uZXcoKTsK LSAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwgIjxodG1sPjxib2R5PjxkaXYg c3R5bGU9XCJjb2xvcjojZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+ RGVzY3JpcHRpb246ICVzPGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKKyAgICBlaW5h X3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwKKyAgICAgICAgIjxodG1sPjxib2R5PjxkaXYg c3R5bGU9XCJjb2xvcjojZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+ RGVzY3JpcHRpb246ICVzPGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKICAgICAgICAg ZXdrX2Vycm9yX2NvZGVfZ2V0KGVycm9yKSwgZXdrX2Vycm9yX2Rlc2NyaXB0aW9uX2dldChlcnJv ciksIGV3a19lcnJvcl91cmxfZ2V0KGVycm9yKSk7CiAKICAgICBld2tfdmlld19odG1sX3N0cmlu Z19sb2FkKGV3a192aWV3LCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KGJ1ZmZlciksIDAsIGV3a19l cnJvcl91cmxfZ2V0KGVycm9yKSk7CkBAIC0xMDA0LDEwICsxMDA5LDEzIEBAIG9uX2NvbG9yX3Bp Y2tlcl9yZXF1ZXN0KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFd2tfQ29sb3JfUGlja2VyICpj b2xvcl9waWNrZXIpCiAgICAgZXZhc19vYmplY3Rfc2hvdyhjYW5jZWxfYnV0dG9uKTsKIAogICAg IGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChva19idXR0b24sICJjbGlja2VkIiwgb25f Y29sb3JfcGlja2VyX29rX2NsaWNrZWQsICYod2luZG93LT5jb2xvcl9zZWxlY3RvcikpOwotICAg IGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChjYW5jZWxfYnV0dG9uLCAiY2xpY2tlZCIs IG9uX2NvbG9yX3BpY2tlcl9jYW5jZWxfY2xpY2tlZCwgd2luZG93LT5jb2xvcl9zZWxlY3Rvci5l d2tfcGlja2VyKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2luZG93LT5j b2xvcl9zZWxlY3Rvci5lbG1fc2VsZWN0b3Jfd2luZG93LCAiZGVsZXRlLHJlcXVlc3QiLCBvbl9j b2xvcl9waWNrZXJfY2FuY2VsX2NsaWNrZWQsIHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZXdrX3Bp Y2tlcik7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGNhbmNlbF9idXR0b24s ICJjbGlja2VkIiwgb25fY29sb3JfcGlja2VyX2NhbmNlbF9jbGlja2VkLAorICAgICAgICB3aW5k b3ctPmNvbG9yX3NlbGVjdG9yLmV3a19waWNrZXIpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh bGxiYWNrX2FkZCh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rvcl93aW5kb3csICJk ZWxldGUscmVxdWVzdCIsCisgICAgICAgIG9uX2NvbG9yX3BpY2tlcl9jYW5jZWxfY2xpY2tlZCwg d2luZG93LT5jb2xvcl9zZWxlY3Rvci5ld2tfcGlja2VyKTsKICAgICBldmFzX29iamVjdF9zbWFy dF9jYWxsYmFja19hZGQod2luZG93LT5jb2xvcl9zZWxlY3Rvci5lbG1fc2VsZWN0b3IsICJjaGFu Z2VkIiwgb25fY29sb3JfY2hhbmdlZCwgcmVjdCk7Ci0gICAgZXZhc19vYmplY3Rfc21hcnRfY2Fs bGJhY2tfYWRkKHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZWxtX3NlbGVjdG9yLCAiY29sb3IsaXRl bSxzZWxlY3RlZCIsIG9uX2NvbG9yX2l0ZW1fc2VsZWN0ZWQsIHJlY3QpOworICAgIGV2YXNfb2Jq ZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rv ciwgImNvbG9yLGl0ZW0sc2VsZWN0ZWQiLCBvbl9jb2xvcl9pdGVtX3NlbGVjdGVkLAorICAgICAg ICByZWN0KTsKIAogICAgIGVsbV93aW5fY2VudGVyKHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZWxt X3NlbGVjdG9yX3dpbmRvdywgRUlOQV9UUlVFLCBFSU5BX1RSVUUpOwogICAgIGV2YXNfb2JqZWN0 X3Jlc2l6ZSh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rvcl93aW5kb3csIDM1MCwg NTAwKTsKQEAgLTEwNDMsNyArMTA1MSw3IEBAIHN0YXRpYyBjaGFyICoKIHVybF9mcm9tX3VzZXJf aW5wdXQoY29uc3QgY2hhciAqYXJnKQogewogICAgIC8qIElmIGl0IGlzIGFscmVhZHkgYSBVUkws IHJldHVybiB0aGUgYXJndW1lbnQgYXMgaXMuICovCi0gICAgaWYgKGhhc19zY2hlbWUoYXJnKSB8 fCBlaW5hX3N0cl9oYXNfcHJlZml4KGFyZywgImphdmFzY3JpcHQ6IikgfHwgIXN0cmNhc2VjbXAo YXJnLCAiYWJvdXQ6YmxhbmsiKSkKKyAgICBpZiAoaGFzX3NjaGVtZShhcmcpIHx8IGVpbmFfc3Ry X2hhc19wcmVmaXgoYXJnLCBKQVZBU0NSSVBUX1NDSEVNRSkgfHwgIXN0cmNhc2VjbXAoYXJnLCAi YWJvdXQ6YmxhbmsiKSkKICAgICAgICAgcmV0dXJuIHN0cmR1cChhcmcpOwogCiAgICAgRWluYV9T dHJidWYgKmJ1ZiA9IGVpbmFfc3RyYnVmX21hbmFnZV9uZXcoZWluYV9maWxlX3BhdGhfc2FuaXRp emUoYXJnKSk7CkBAIC0xMDUxLDEzICsxMDU5LDE0IEBAIHVybF9mcm9tX3VzZXJfaW5wdXQoY29u c3QgY2hhciAqYXJnKQogICAgIC8qIENoZWNrIGlmIHRoZSBwYXRoIGV4aXN0cy4gKi8KICAgICBp ZiAoZWNvcmVfZmlsZV9leGlzdHMoZWluYV9zdHJidWZfc3RyaW5nX2dldChidWYpKSkgewogICAg ICAgICAvKiBGaWxlIGV4aXN0cywgY29udmVydCBsb2NhbCBwYXRoIHRvIGEgVVJMLiAqLwotICAg ICAgICBlaW5hX3N0cmJ1Zl9wcmVwZW5kKGJ1ZiwgImZpbGU6Ly8iKTsKKyAgICAgICAgZWluYV9z dHJidWZfcHJlcGVuZChidWYsIEZJTEVfU0NIRU1FKTsKICAgICB9IGVsc2UgewogICAgICAgICAv KiBUaGUgcGF0aCBkb2VzIG5vdCBleGlzdCwgY29udmVydCBpdCB0byBhIFVSTCBieQogICAgICAg ICAgICBwcmVwZW5kaW5nIGh0dHA6Ly8gc2NoZW1lOgogICAgICAgICAgICB3d3cuZ29vZ2xlLmNv bSAtPiBodHRwOi8vd3d3Lmdvb2dsZS5jb20gKi8KICAgICAgICAgZWluYV9zdHJidWZfc3RyaW5n X2ZyZWUoYnVmKTsKLSAgICAgICAgZWluYV9zdHJidWZfYXBwZW5kX3ByaW50ZihidWYsICJodHRw Oi8vJXMiLCBhcmcpOworICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZiwgIiVz IiwgSFRUUF9TQ0hFTUUpOworICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1Ziwg IiVzIiwgYXJnKTsKICAgICB9CiAgICAgY2hhciAqdXJsID0gZWluYV9zdHJidWZfc3RyaW5nX3N0 ZWFsKGJ1Zik7CiAgICAgZWluYV9zdHJidWZfZnJlZShidWYpOwpAQCAtMTA3MSw4ICsxMDgwLDgg QEAgdXJsX2xvYWRfZnJvbV91c2VyX2lucHV0KEV2YXNfT2JqZWN0ICpld2tfdmlldywgY29uc3Qg Y2hhciAqdXJsKQogICAgIGlmICghZXdrX3ZpZXcgfHwgIXVybCkKICAgICAgICAgcmV0dXJuIEVJ TkFfRkFMU0U7CiAKLSAgICBpZiAoZWluYV9zdHJfaGFzX3ByZWZpeCh1cmwsICJqYXZhc2NyaXB0 OiIpKQotICAgICAgICByZXR1cm4gZXdrX3ZpZXdfc2NyaXB0X2V4ZWN1dGUoZXdrX3ZpZXcsIHN0 cnN0cih1cmwsICJqYXZhc2NyaXB0OiIpLCAwLCAwKTsKKyAgICBpZiAoZWluYV9zdHJfaGFzX3By ZWZpeCh1cmwsIEpBVkFTQ1JJUFRfU0NIRU1FKSkKKyAgICAgICAgcmV0dXJuIGV3a192aWV3X3Nj cmlwdF9leGVjdXRlKGV3a192aWV3LCBzdHJzdHIodXJsLCBKQVZBU0NSSVBUX1NDSEVNRSksIDAs IDApOwogCiAgICAgcmV0dXJuIGV3a192aWV3X3VybF9zZXQoZXdrX3ZpZXcsIHVybCk7CiB9CkBA IC0xMTQ0LDcgKzExNTMsNyBAQCBvbl9iYWNrX2J1dHRvbl9jbGlja2VkKHZvaWQgKnVzZXJfZGF0 YSwgRXZhc19PYmplY3QgKmJhY2tfYnV0dG9uLCB2b2lkICpldmVudF9pbgogewogICAgIGlmIChs b25ncHJlc3NfZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwotICAgIAorCiAgICAgQnJvd3Nlcl9X aW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKIAogICAgIGV3a192 aWV3X2JhY2sod2luZG93LT5ld2tfdmlldyk7CkBAIC0xMTkwLDEwICsxMTk5LDEwIEBAIG9uX3Nl YXJjaF9jYXNlX29wdGlvbl9jaGFuZ2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKnNl YXJjaF9jYXNlX2NoZWNrX2JvCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93 c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKICAgICBjaGFyICp0ZXh0ID0gZWxtX2VudHJ5X21hcmt1 cF90b191dGY4KGVsbV9lbnRyeV9lbnRyeV9nZXQod2luZG93LT5zZWFyY2guc2VhcmNoX2ZpZWxk KSk7Ci0gICAgCisKICAgICAvKiBCaXQgdG9nZ2xlIHRoZSBjYXNlIHNlbnNpdGl2ZSBmbGFnICov CiAgICAgc2VhcmNoX2ZsYWdzID0gc2VhcmNoX2ZsYWdzIF4gRVdLX0ZJTkRfT1BUSU9OU19DQVNF X0lOU0VOU0lUSVZFOwotICAgIAorCiAgICAgZXdrX3ZpZXdfdGV4dF9maW5kKHdpbmRvdy0+ZXdr X3ZpZXcsIHRleHQsIHNlYXJjaF9mbGFncywgTUFYX1NFQVJDSF9DT1VOVCk7CiAgICAgZnJlZSh0 ZXh0KTsKIH0KQEAgLTEyMDMsMTAgKzEyMTIsMTAgQEAgb25fc2VhcmNoX3dvcmRfc3RhcnRfb3B0 aW9uX2NoYW5nZWQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqc2VhcmNoX3dvcmRfc3QK IHsKICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9k YXRhOwogICAgIGNoYXIgKnRleHQgPSBlbG1fZW50cnlfbWFya3VwX3RvX3V0ZjgoZWxtX2VudHJ5 X2VudHJ5X2dldCh3aW5kb3ctPnNlYXJjaC5zZWFyY2hfZmllbGQpKTsKLSAgICAKKwogICAgIC8q IEJpdCB0b2dnbGUgdGhlIHdvcmQgc3RhcnQgZmxhZyAqLwogICAgIHNlYXJjaF9mbGFncyA9IHNl YXJjaF9mbGFncyBeIEVXS19GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFM7Ci0gICAgCisKICAg ICBld2tfdmlld190ZXh0X2ZpbmQod2luZG93LT5ld2tfdmlldywgdGV4dCwgc2VhcmNoX2ZsYWdz LCBNQVhfU0VBUkNIX0NPVU5UKTsKICAgICBmcmVlKHRleHQpOwogfQpAQCAtMTI1Nyw3ICsxMjY2 LDcgQEAgc3RhdGljIHZvaWQKIG9uX2xpc3RfaXRlbV9zZWxlY3Qodm9pZCAqdXNlcl9kYXRhLCBF dmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogewogICAgIEJyb3dzZXJfV2luZG93 ICp3aW5kb3cgPSBldmFzX29iamVjdF9kYXRhX2dldChvYmosICJCcm93c2VyX1dpbmRvdyIpOwot ICAgIGV3a192aWV3X25hdmlnYXRlX3RvKHdpbmRvdy0+ZXdrX3ZpZXcsIHVzZXJfZGF0YSk7IAor ICAgIGV3a192aWV3X25hdmlnYXRlX3RvKHdpbmRvdy0+ZXdrX3ZpZXcsIHVzZXJfZGF0YSk7CiAg ICAgaGlzdG9yeV9saXN0X2hpZGUod2luZG93KTsKICAgICBldmFzX29iamVjdF9kYXRhX2RlbChv YmosICJCcm93c2VyX1dpbmRvdyIpOwogfQpAQCAtMTI3MCw3ICsxMjc5LDcgQEAgbmF2aWdhdGlv bl9idXR0b25fbG9uZ3ByZXNzX3Byb2Nlc3Modm9pZCAqdXNlcl9kYXRhLCBFaW5hX0Jvb2wgZm9y d2FyZF9uYXZpZ2F0aW8KIAogICAgIGxvbmdwcmVzc19lbmFibGVkID0gRUlOQV9UUlVFOwogICAg IEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7Ci0g ICAgCisKICAgICBFd2tfQmFja19Gb3J3YXJkX0xpc3QgKmxpc3QgPSBld2tfdmlld19iYWNrX2Zv cndhcmRfbGlzdF9nZXQod2luZG93LT5ld2tfdmlldyk7CiAgICAgY29uc3QgRWluYV9MaXN0ICps OwogICAgIHZvaWQgKmRhdGE7CkBAIC0xMjgyLDExICsxMjkxLDExIEBAIG5hdmlnYXRpb25fYnV0 dG9uX2xvbmdwcmVzc19wcm9jZXNzKHZvaWQgKnVzZXJfZGF0YSwgRWluYV9Cb29sIGZvcndhcmRf bmF2aWdhdGlvCiAgICAgaW50IHdpZHRoOwogICAgIGludCBoZWlnaHQ7CiAgICAgc2l6ZV90IGlu ZGV4OwotICAgIAorCiAgICAgZXZhc19vYmplY3RfZGF0YV9zZXQod2luZG93LT5oaXN0b3J5Lmhp c3RvcnlfbGlzdCwgIkJyb3dzZXJfV2luZG93Iiwgd2luZG93KTsKIAogICAgIGlmIChmb3J3YXJk X25hdmlnYXRpb25fZW5hYmxlZCkKLSAgICAgICAgd2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlz dF9pdGVtcyA9IGV3a19iYWNrX2ZvcndhcmRfbGlzdF9mb3J3YXJkX2l0ZW1zX2NvcHkobGlzdCk7 IAorICAgICAgICB3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0X2l0ZW1zID0gZXdrX2JhY2tf Zm9yd2FyZF9saXN0X2ZvcndhcmRfaXRlbXNfY29weShsaXN0KTsKICAgICBlbHNlCiAgICAgICAg IHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3RfaXRlbXMgPSBld2tfYmFja19mb3J3YXJkX2xp c3RfYmFja19pdGVtc19jb3B5KGxpc3QpOwogCkBAIC0xMzA3LDcgKzEzMTYsNyBAQCBuYXZpZ2F0 aW9uX2J1dHRvbl9sb25ncHJlc3NfcHJvY2Vzcyh2b2lkICp1c2VyX2RhdGEsIEVpbmFfQm9vbCBm b3J3YXJkX25hdmlnYXRpbwogICAgICAgICBJTkZPKCIgdGl0bGUgPSAlcyIsIHRpdGxlKTsKICAg ICAgICAgZWxtX2dlbmxpc3RfaXRlbV9hcHBlbmQod2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlz dCwgbGlzdF9pdGVtLCAodm9pZCAqKSh0aXRsZSksIE5VTEwsIEVMTV9HRU5MSVNUX0lURU1fTk9O RSwgb25fbGlzdF9pdGVtX3NlbGVjdCwgZGF0YSk7CiAgICAgfQotICAgIAorCiAgICAgaWYgKGl0 ZW1fY291bnQgPiAwKSB7CiAgICAgICAgIGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldCh3aW5kb3ct PmVsbV93aW5kb3csICZ4LCAmeSwgJndpZHRoLCAmaGVpZ2h0KTsKICAgICAgICAgZWxtX2xpc3Rf Z28od2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdCk7CkBAIC0xMzE1LDEyICsxMzI0LDEyIEBA IG5hdmlnYXRpb25fYnV0dG9uX2xvbmdwcmVzc19wcm9jZXNzKHZvaWQgKnVzZXJfZGF0YSwgRWlu YV9Cb29sIGZvcndhcmRfbmF2aWdhdGlvCiAKICAgICAgICAgaWYgKGZvcndhcmRfbmF2aWdhdGlv bl9lbmFibGVkKSB7CiAgICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+aGlzdG9y eS5oaXN0b3J5X2JveCAsIHggKyBUT09MX0JBUl9CVVRUT05fU0laRSArIDEsIHkgKyBUT09MX0JB Ul9CVVRUT05fU0laRSk7Ci0gICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+aGlz dG9yeS5oaXN0b3J5X2xpc3QgLCB4ICsgVE9PTF9CQVJfQlVUVE9OX1NJWkUgKyAxLCB5ICsgVE9P TF9CQVJfQlVUVE9OX1NJWkUpOyAgCisgICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRv dy0+aGlzdG9yeS5oaXN0b3J5X2xpc3QgLCB4ICsgVE9PTF9CQVJfQlVUVE9OX1NJWkUgKyAxLCB5 ICsgVE9PTF9CQVJfQlVUVE9OX1NJWkUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg ZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9ib3ggLCB4LCB5ICsgVE9P TF9CQVJfQlVUVE9OX1NJWkUpOwotICAgICAgICAgICAgZXZhc19vYmplY3RfbW92ZSh3aW5kb3ct Pmhpc3RvcnkuaGlzdG9yeV9saXN0ICwgeCwgeSArIFRPT0xfQkFSX0JVVFRPTl9TSVpFKTsgIAor ICAgICAgICAgICAgZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0 ICwgeCwgeSArIFRPT0xfQkFSX0JVVFRPTl9TSVpFKTsKICAgICAgICAgfQotICAgIAorCiAgICAg ICAgIGVsbV9nZW5saXN0X21vZGVfc2V0KHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3QsIEVM TV9MSVNUX0NPTVBSRVNTKTsKICAgICAgICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmhpc3Rv cnkuaGlzdG9yeV9ib3gpOwogICAgICAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+aGlzdG9y eS5oaXN0b3J5X2xpc3QpOwpAQCAtMjAyNyw3ICsyMDM2LDcgQEAgb25fbmF2aWdhdGlvbl9wb2xp Y3lfZGVjaXNpb24odm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVu dF9pbmYKICAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93 KTsKICAgICAgICAgSU5GTygiTW91c2UgbWlkZGxlIGJ1dHRvbiBwcmVzc2VkLCBvcGVuIGxpbmsg aW4gbmV3IHdpbmRvdyIpOwogCi0gICAgICAgIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lv bl9yZWplY3QoZGVjaXNpb24pOyAKKyAgICAgICAgZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lz aW9uX3JlamVjdChkZWNpc2lvbik7CiAgICAgfQogfQogCkBAIC0yMjU2LDcgKzIyNjUsNyBAQCBz dGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXdrX1ZpZXdfQ29uZmlndXJhdGlv biogY29uZmlndXJhdGlvbiwgaW50CiAgICAgZXZhc19vYmplY3Rfc2l6ZV9oaW50X2FsaWduX3Nl dCh3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0LCBFVkFTX0hJTlRfRklMTCwgRVZBU19ISU5U X0ZJTEwpOwogICAgIGVsbV93aW5fcmVzaXplX29iamVjdF9hZGQod2luZG93LT5lbG1fd2luZG93 LCB3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9ib3gpOwogICAgIGVsbV9ib3hfcGFja19lbmQod2lu ZG93LT5oaXN0b3J5Lmhpc3RvcnlfYm94LCB3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0KTsK LSAgICAKKwogICAgIC8qIENyZWF0ZSBld2tfdmlldyAqLwogICAgIEV3a19WaWV3X1NtYXJ0X0Ns YXNzICpld2tWaWV3Q2xhc3MgPSBtaW5pQnJvd3NlclZpZXdTbWFydENsYXNzKCk7CiAgICAgZXdr Vmlld0NsYXNzLT5ydW5famF2YXNjcmlwdF9hbGVydCA9IG9uX2phdmFzY3JpcHRfYWxlcnQ7CkBA IC0yMzQwLDcgKzIzNDksNyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUo RXdrX1ZpZXdfQ29uZmlndXJhdGlvbiogY29uZmlndXJhdGlvbiwgaW50CiAgICAgZXZhc19vYmpl Y3RfZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9V U0VfTU9WRSwgb25fbW91c2VfbW92ZSwgd2luZG93KTsKICAgICBldmFzX29iamVjdF9ldmVudF9j YWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxMQkFDS19NT1VTRV9XSEVFTCwg b25fbW91c2Vfd2hlZWwsIHdpbmRvdyk7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tf YWRkKHdpbmRvdy0+ZWxtX3dpbmRvdywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9uX3dpbmRvd19y ZXNpemUsIHdpbmRvdyk7Ci0gICAgCisKICAgICBlbG1fYnV0dG9uX2F1dG9yZXBlYXRfc2V0KHdp bmRvdy0+YmFja19idXR0b24sIEVJTkFfVFJVRSk7CiAgICAgZWxtX2J1dHRvbl9hdXRvcmVwZWF0 X3NldCh3aW5kb3ctPmZvcndhcmRfYnV0dG9uLCBFSU5BX1RSVUUpOwogICAgIGVsbV9idXR0b25f YXV0b3JlcGVhdF9pbml0aWFsX3RpbWVvdXRfc2V0KHdpbmRvdy0+YmFja19idXR0b24sIExPTkdQ UkVTU19JTlRFUlZBTF9TRUNPTkRTKTsKQEAgLTIzNzYsNyArMjM4NSw3IEBAIHN0YXRpYyBFd2tf Vmlld19Db25maWd1cmF0aW9uKiBjb25maWd1cmF0aW9uKCkKIHN0YXRpYyBFd2tfQ29va2llX0Fj Y2VwdF9Qb2xpY3kKIHBhcnNlX2Nvb2tpZXNfcG9saWN5KGNvbnN0IGNoYXIgKmlucHV0X3N0cmlu ZykKIHsKLSAgICBpZiAoIXN0cmNtcChpbnB1dF9zdHJpbmcsICJhbHdheXMiKSkgCisgICAgaWYg KCFzdHJjbXAoaW5wdXRfc3RyaW5nLCAiYWx3YXlzIikpCiAgICAgICAgIHJldHVybiBFV0tfQ09P S0lFX0FDQ0VQVF9QT0xJQ1lfQUxXQVlTOwogICAgIGlmICghc3RyY21wKGlucHV0X3N0cmluZywg Im5ldmVyIikpCiAgICAgICAgIHJldHVybiBFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTkVWRVI7 Cg== 287580 2016-08-31 17:52:32 -0700 2016-08-31 21:42:39 -0700 Patch bug-161428-20160901095018.patch text/plain 16243 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1MTc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJhMTRhYWFmNDE4N2U4MDRiMGE4MzgwMTI4OWQ4YzBl NGMzNTU0NS4uNmJkMTIzYjA0ZTUzOGM5ZjI2MGMxMmZiZGNmM2ZmZWFmMDE1YmFlMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE2LTA4LTMwICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBbRUZMXSBTbWFsbCBjbGVhbiB1cCBpbiBNaW5pQnJvd3NlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxNDI4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXNpemVz IE1pbmlCcm93c2VyLCBhZGQgKmNoYXIqIGNvbnN0YW50cyBmb3Igc2NoZW1lLAorICAgICAgICBk b2VzIGxpbmUgYnJlYWtpbmcsIGFuZCByZW1vdmUgdW5uZWNlc3Nhcnkgc3BhY2VzLgorCisgICAg ICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX21vdXNlX3doZWVsKToK KyAgICAgICAgKGhpc3RvcnlfbGlzdF9oaWRlKToKKyAgICAgICAgKHNjcmlwdF9leGVjdXRlX2Nh bGxiYWNrKToKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX3VybF9jaGFuZ2Vk KToKKyAgICAgICAgKG9uX2Vycm9yKToKKyAgICAgICAgKG9uX2NvbG9yX3BpY2tlcl9yZXF1ZXN0 KToKKyAgICAgICAgKHVybF9mcm9tX3VzZXJfaW5wdXQpOgorICAgICAgICAodXJsX2xvYWRfZnJv bV91c2VyX2lucHV0KToKKyAgICAgICAgKG9uX2JhY2tfYnV0dG9uX2NsaWNrZWQpOgorICAgICAg ICAob25fc2VhcmNoX2Nhc2Vfb3B0aW9uX2NoYW5nZWQpOgorICAgICAgICAob25fc2VhcmNoX3dv cmRfc3RhcnRfb3B0aW9uX2NoYW5nZWQpOgorICAgICAgICAob25fbGlzdF9pdGVtX3NlbGVjdCk6 CisgICAgICAgIChuYXZpZ2F0aW9uX2J1dHRvbl9sb25ncHJlc3NfcHJvY2Vzcyk6CisgICAgICAg IChvbl9uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbik6CisgICAgICAgICh3aW5kb3dfY3JlYXRl KToKKyAgICAgICAgKHBhcnNlX2Nvb2tpZXNfcG9saWN5KToKKwogMjAxNi0wOC0yOSAgQWFrYXNo IEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgRVdTIHBhdGNoIHN0YXR1 cyBwYWdlIHNob3VsZCBpbmRpY2F0ZSBib3QgY29ycmVzcG9uZGluZyB0byBlYWNoIHN0YXR1cyBt ZXNzYWdlCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMv TWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBhNjk3ZmE0MzAyY2UxNjEwNTZjZDZmMzY0NmE4 NTAwMDQ1ZTIzNWUyLi4zMjE1Yzg3MTcyMWI2N2IyMzJmZWUwMjMxMjJmYWU5Y2FmYTIyZGUyIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMKQEAgLTMwLDYgKzMwLDkgQEAgZXh0ZXJuIGludCBlZnJlZXRfY2Fj aGVfdXBkYXRlOwogCiBzdGF0aWMgY29uc3QgY2hhciBERUZBVUxUX1VSTFtdID0gImh0dHA6Ly93 d3cuZXdlYmtpdC5vcmcvIjsKIHN0YXRpYyBjb25zdCBjaGFyIEFQUF9OQU1FW10gPSAiRUZMIE1p bmlCcm93c2VyIjsKK3N0YXRpYyBjb25zdCBjaGFyIEpBVkFTQ1JJUFRfU0NIRU1FW10gPSAiamF2 YXNjcmlwdDoiOworc3RhdGljIGNvbnN0IGNoYXIgRklMRV9TQ0hFTUVbXSA9ICJmaWxlOi8vIjsK K3N0YXRpYyBjb25zdCBjaGFyIEhUVFBfU0NIRU1FW10gPSAiaHR0cDovLyI7CiBzdGF0aWMgY29u c3QgaW50IFRPT0xfQkFSX0lDT05fU0laRSA9IDI0Owogc3RhdGljIGNvbnN0IGludCBUT09MX0JB Ul9CVVRUT05fU0laRSA9IDMyOwogc3RhdGljIGNvbnN0IGludCBTRUFSQ0hfRklFTERfU0laRSA9 IDIwMDsKQEAgLTU1LDggKzU4LDggQEAgc3RhdGljIEVpbmFfQm9vbCB0b3VjaF9ldmVudHNfZW5h YmxlZCA9IEVJTkFfRkFMU0U7CiBzdGF0aWMgRWluYV9Cb29sIGZpeGVkX2xheW91dF9lbmFibGVk ID0gRUlOQV9UUlVFOwogc3RhdGljIEVpbmFfQm9vbCBzZXBhcmF0ZWRfcHJvY2Vzc19lbmFibGVk ID0gRUlOQV9GQUxTRTsKIHN0YXRpYyBFaW5hX0Jvb2wgbG9uZ3ByZXNzX2VuYWJsZWQgPSBFSU5B X0ZBTFNFOwotc3RhdGljIGludCB3aW5kb3dfd2lkdGggPSA4MDA7Ci1zdGF0aWMgaW50IHdpbmRv d19oZWlnaHQgPSA2MDA7CitzdGF0aWMgaW50IHdpbmRvd193aWR0aCA9IDEwMDA7CitzdGF0aWMg aW50IHdpbmRvd19oZWlnaHQgPSA4MDA7CiBzdGF0aWMgaW50IHNlYXJjaF9mbGFncyA9IEVXS19G SU5EX09QVElPTlNfU0hPV19ISUdITElHSFQgfCBFV0tfRklORF9PUFRJT05TX1dSQVBfQVJPVU5E IHwgRVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFOwogLyogRGVmYXVsdCB2YWx1ZSBv ZiBkZXZpY2VfcGl4ZWxfcmF0aW8gaXMgJzAnIHNvIHRoYXQgd2UgZG9uJ3Qgc2V0IGN1c3RvbSBk ZXZpY2UKICAqIHNjYWxlIGZhY3RvciB1bmxlc3MgaXQncyByZXF1aXJlZCBieSB0aGUgVXNlci4g Ki8KQEAgLTEyNiw3ICsxMjksNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cgewog ICAgICAgICBFdmFzX09iamVjdCAqaGlzdG9yeV9saXN0OwogICAgICAgICBFaW5hX0xpc3QgKmhp c3RvcnlfbGlzdF9pdGVtczsKICAgICB9IGhpc3Rvcnk7Ci0gICAgaW50IGN1cnJlbnRfem9vbV9s ZXZlbDsgCisgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsKICAgICBUb29sdGlwX0luZm9ybWF0 aW9uIHRvb2x0aXA7CiAgICAgQ29sb3JfU2VsZWN0b3IgY29sb3Jfc2VsZWN0b3I7CiAgICAgc3Ry dWN0IHsKQEAgLTMxNiw3ICszMTksNyBAQCBvbl9tb3VzZV93aGVlbCh2b2lkICp1c2VyX2RhdGEs IEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbwogICAgICAg ICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQod2luZG93LT5mb3J3YXJkX2J1dHRvbiwgIWV3 a192aWV3X2ZvcndhcmRfcG9zc2libGUoZXdrX3ZpZXcpKTsKICAgICAgICAgfSBlbHNlIGlmIChl di0+eiA9PSAxICYmIGV3a192aWV3X2JhY2tfcG9zc2libGUoZXdrX3ZpZXcpKSB7CiAgICAgICAg ICAgICBld2tfdmlld19iYWNrKGV3a192aWV3KTsKLSAgICAgICAgICAgIGVsbV9vYmplY3RfZGlz YWJsZWRfc2V0KHdpbmRvdy0+YmFja19idXR0b24sICFld2tfdmlld19iYWNrX3Bvc3NpYmxlKGV3 a192aWV3KSk7ICAgICAgIAorICAgICAgICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQod2lu ZG93LT5iYWNrX2J1dHRvbiwgIWV3a192aWV3X2JhY2tfcG9zc2libGUoZXdrX3ZpZXcpKTsKICAg ICAgICAgfQogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQpIHsKICAgICAgICAgaWYgKGV2LT56 ID09IC0xICYmIHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9s ZXZlbCArIDEpKSB7CkBAIC00NjYsMjEgKzQ2OSwyMSBAQCBzZWFyY2hfYm94X2hpZGUoQnJvd3Nl cl9XaW5kb3cgKndpbmRvdykKICAgICBldmFzX29iamVjdF9mb2N1c19zZXQod2luZG93LT5ld2tf dmlldywgRUlOQV9UUlVFKTsKIH0KIAotc3RhdGljIHZvaWQgCitzdGF0aWMgdm9pZAogaGlzdG9y eV9saXN0X2hpZGUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdykKIHsKICAgICAvKiBIaWRlIGhpc3Rv cnkgbGlzdCAqLwogICAgIGV2YXNfb2JqZWN0X2hpZGUod2luZG93LT5oaXN0b3J5Lmhpc3Rvcnlf Ym94KTsKICAgICBldmFzX29iamVjdF9oaWRlKHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3Qp OwotICAgIAorCiAgICAgLyogRGVyZWZlcmVuY2UgdGhlIGxpc3QgaXRlbXMgYW5kIGNsZWFyIHRo ZSBoaXN0b3J5IGxpc3QgKi8KLSAgICB2b2lkICpkYXRhOyAgICAKKyAgICB2b2lkICpkYXRhOwog ICAgIEVJTkFfTElTVF9GUkVFKHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3RfaXRlbXMsIGRh dGEpIHsKICAgICAgICAgZXdrX29iamVjdF91bnJlZihkYXRhKTsKICAgICB9CiAKICAgICBlbG1f Z2VubGlzdF9jbGVhcih3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0KTsKLSAgICAKKwogICAg IC8qIEdpdmUgZm9jdXMgYmFjayB0byB0aGUgdmlldyAqLwogICAgIGVsbV9vYmplY3RfZm9jdXNf c2V0KHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2JveCwgRUlOQV9GQUxTRSk7CiAgICAgZWxtX29i amVjdF9mb2N1c19zZXQod2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdCwgRUlOQV9GQUxTRSk7 CkBAIC00ODgsNyArNDkxLDcgQEAgaGlzdG9yeV9saXN0X2hpZGUoQnJvd3Nlcl9XaW5kb3cgKndp bmRvdykKIAogICAgIC8qIFJlc2V0IGZsYWdzICovCiAgICAgbG9uZ3ByZXNzX2VuYWJsZWQgPSBF SU5BX0ZBTFNFOwotfSAKK30KIAogc3RhdGljIHZvaWQgc2F2ZV9wYWdlX2NvbnRlbnRzX2NhbGxi YWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSwgdm9pZCAq dXNlcl9kYXRhKQogewpAQCAtNTE4LDcgKzUyMSw3IEBAIHN0YXRpYyB2b2lkIHNhdmVfcGFnZV9j b250ZW50c19jYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIK ICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChmaWxlTmFtZSk7CiB9CiAKLXN0YXRpYyB2b2lkIAor c3RhdGljIHZvaWQKIHNjcmlwdF9leGVjdXRlX2NhbGxiYWNrKEV2YXNfT2JqZWN0ICpld2tfdmll dywgY29uc3QgY2hhciAqcmV0dXJuX3ZhbHVlLCB2b2lkICp1c2VyX2RhdGEpCiB7CiAgICAgQnJv d3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKQEAgLTUy OCw3ICs1MzEsNyBAQCBzY3JpcHRfZXhlY3V0ZV9jYWxsYmFjayhFdmFzX09iamVjdCAqZXdrX3Zp ZXcsIGNvbnN0IGNoYXIgKnJldHVybl92YWx1ZSwgdm9pZCAqdQogICAgIGlmIChyZXR1cm5fdmFs dWUpIHsKICAgICAgICAgZWluYV9zdHJidWZfYXBwZW5kKHRleHRfYnVmZmVyLCByZXR1cm5fdmFs dWUpOwogICAgICAgICBJTkZPKCJzZWxlY3RlZCB0ZXh0IGlzOiAlcyIsIGVpbmFfc3RyYnVmX3N0 cmluZ19nZXQodGV4dF9idWZmZXIpKTsKLSAgICAgICAgZWxtX2VudHJ5X2VudHJ5X3NldCh3aW5k b3ctPnNlYXJjaC5zZWFyY2hfZmllbGQsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQodGV4dF9idWZm ZXIpKTsgICAKKyAgICAgICAgZWxtX2VudHJ5X2VudHJ5X3NldCh3aW5kb3ctPnNlYXJjaC5zZWFy Y2hfZmllbGQsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQodGV4dF9idWZmZXIpKTsKICAgICB9CiAg ICAgZWluYV9zdHJidWZfZnJlZSh0ZXh0X2J1ZmZlcik7CiAgICAgc2VhcmNoX2JveF9zaG93KHdp bmRvdyk7CkBAIC02NTAsNyArNjUzLDggQEAgb25fa2V5X2Rvd24odm9pZCAqdXNlcl9kYXRhLCBF dmFzICplLCBFdmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAg IGlmICghb3Blbl9maWxlX25hbWUpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIEVpbmFf U3RyYnVmICp1cmlfcGF0aCA9IGVpbmFfc3RyYnVmX25ldygpOwotICAgICAgICBlaW5hX3N0cmJ1 Zl9hcHBlbmRfcHJpbnRmKHVyaV9wYXRoLCAiZmlsZTovLyVzIiwgb3Blbl9maWxlX25hbWUpOwor ICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKHVyaV9wYXRoLCAiJXMiLCBGSUxFX1ND SEVNRSk7CisgICAgICAgIGVpbmFfc3RyYnVmX2FwcGVuZF9wcmludGYodXJpX3BhdGgsICIlcyIs IG9wZW5fZmlsZV9uYW1lKTsKICAgICAgICAgSU5GTygicHJlc3NlZCAoQ1RSTCArIEwpIDogTG9h ZGluZyBQYWdlICVzIiwgZWluYV9zdHJidWZfc3RyaW5nX2dldCh1cmlfcGF0aCkpOwogICAgICAg ICBld2tfdmlld191cmxfc2V0KGV3a192aWV3LCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KHVyaV9w YXRoKSk7CiAgICAgICAgIGVpbmFfc3RyYnVmX2ZyZWUodXJpX3BhdGgpOwpAQCAtNzE5LDcgKzcy Myw3IEBAIG9uX3VybF9jaGFuZ2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKmV3a192 aWV3LCB2b2lkICpldmVudF9pbmZvKQogewogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAo QnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CiAgICAgY29uc3QgY2hhciAqdXJsID0gZXdrX3Zp ZXdfdXJsX2dldCh3aW5kb3ctPmV3a192aWV3KTsKLSAgICBjaGFyICpjb252ZXJ0ZWRfdXJsID0g ZWxtX2VudHJ5X3V0ZjhfdG9fbWFya3VwKHVybCk7IAorICAgIGNoYXIgKmNvbnZlcnRlZF91cmwg PSBlbG1fZW50cnlfdXRmOF90b19tYXJrdXAodXJsKTsKICAgICBlbG1fZW50cnlfZW50cnlfc2V0 KHdpbmRvdy0+dXJsX2JhciwgY29udmVydGVkX3VybCk7CiAKICAgICBvbl9pY29uX2NoYW5nZWRf Y2IoZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9nZXQoZXdrX3ZpZXdfY29udGV4dF9nZXQo ZXdrX3ZpZXcpKSwgdXJsLCB1c2VyX2RhdGEpOwpAQCAtNzU5LDcgKzc2Myw4IEBAIG9uX2Vycm9y KHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZv KQogICAgICAgICByZXR1cm47CiAKICAgICBidWZmZXIgPSBlaW5hX3N0cmJ1Zl9uZXcoKTsKLSAg ICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwgIjxodG1sPjxib2R5PjxkaXYgc3R5 bGU9XCJjb2xvcjojZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+RGVz Y3JpcHRpb246ICVzPGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKKyAgICBlaW5hX3N0 cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwKKyAgICAgICAgIjxodG1sPjxib2R5PjxkaXYgc3R5 bGU9XCJjb2xvcjojZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+RGVz Y3JpcHRpb246ICVzPGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKICAgICAgICAgZXdr X2Vycm9yX2NvZGVfZ2V0KGVycm9yKSwgZXdrX2Vycm9yX2Rlc2NyaXB0aW9uX2dldChlcnJvciks IGV3a19lcnJvcl91cmxfZ2V0KGVycm9yKSk7CiAKICAgICBld2tfdmlld19odG1sX3N0cmluZ19s b2FkKGV3a192aWV3LCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KGJ1ZmZlciksIDAsIGV3a19lcnJv cl91cmxfZ2V0KGVycm9yKSk7CkBAIC0xMDA0LDEwICsxMDA5LDEzIEBAIG9uX2NvbG9yX3BpY2tl cl9yZXF1ZXN0KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFd2tfQ29sb3JfUGlja2VyICpjb2xv cl9waWNrZXIpCiAgICAgZXZhc19vYmplY3Rfc2hvdyhjYW5jZWxfYnV0dG9uKTsKIAogICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChva19idXR0b24sICJjbGlja2VkIiwgb25fY29s b3JfcGlja2VyX29rX2NsaWNrZWQsICYod2luZG93LT5jb2xvcl9zZWxlY3RvcikpOwotICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChjYW5jZWxfYnV0dG9uLCAiY2xpY2tlZCIsIG9u X2NvbG9yX3BpY2tlcl9jYW5jZWxfY2xpY2tlZCwgd2luZG93LT5jb2xvcl9zZWxlY3Rvci5ld2tf cGlja2VyKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2luZG93LT5jb2xv cl9zZWxlY3Rvci5lbG1fc2VsZWN0b3Jfd2luZG93LCAiZGVsZXRlLHJlcXVlc3QiLCBvbl9jb2xv cl9waWNrZXJfY2FuY2VsX2NsaWNrZWQsIHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZXdrX3BpY2tl cik7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGNhbmNlbF9idXR0b24sICJj bGlja2VkIiwgb25fY29sb3JfcGlja2VyX2NhbmNlbF9jbGlja2VkLAorICAgICAgICB3aW5kb3ct PmNvbG9yX3NlbGVjdG9yLmV3a19waWNrZXIpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxi YWNrX2FkZCh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rvcl93aW5kb3csICJkZWxl dGUscmVxdWVzdCIsCisgICAgICAgIG9uX2NvbG9yX3BpY2tlcl9jYW5jZWxfY2xpY2tlZCwgd2lu ZG93LT5jb2xvcl9zZWxlY3Rvci5ld2tfcGlja2VyKTsKICAgICBldmFzX29iamVjdF9zbWFydF9j YWxsYmFja19hZGQod2luZG93LT5jb2xvcl9zZWxlY3Rvci5lbG1fc2VsZWN0b3IsICJjaGFuZ2Vk Iiwgb25fY29sb3JfY2hhbmdlZCwgcmVjdCk7Ci0gICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfYWRkKHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZWxtX3NlbGVjdG9yLCAiY29sb3IsaXRlbSxz ZWxlY3RlZCIsIG9uX2NvbG9yX2l0ZW1fc2VsZWN0ZWQsIHJlY3QpOworICAgIGV2YXNfb2JqZWN0 X3NtYXJ0X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rvciwg ImNvbG9yLGl0ZW0sc2VsZWN0ZWQiLCBvbl9jb2xvcl9pdGVtX3NlbGVjdGVkLAorICAgICAgICBy ZWN0KTsKIAogICAgIGVsbV93aW5fY2VudGVyKHdpbmRvdy0+Y29sb3Jfc2VsZWN0b3IuZWxtX3Nl bGVjdG9yX3dpbmRvdywgRUlOQV9UUlVFLCBFSU5BX1RSVUUpOwogICAgIGV2YXNfb2JqZWN0X3Jl c2l6ZSh3aW5kb3ctPmNvbG9yX3NlbGVjdG9yLmVsbV9zZWxlY3Rvcl93aW5kb3csIDM1MCwgNTAw KTsKQEAgLTEwNDMsNyArMTA1MSw3IEBAIHN0YXRpYyBjaGFyICoKIHVybF9mcm9tX3VzZXJfaW5w dXQoY29uc3QgY2hhciAqYXJnKQogewogICAgIC8qIElmIGl0IGlzIGFscmVhZHkgYSBVUkwsIHJl dHVybiB0aGUgYXJndW1lbnQgYXMgaXMuICovCi0gICAgaWYgKGhhc19zY2hlbWUoYXJnKSB8fCBl aW5hX3N0cl9oYXNfcHJlZml4KGFyZywgImphdmFzY3JpcHQ6IikgfHwgIXN0cmNhc2VjbXAoYXJn LCAiYWJvdXQ6YmxhbmsiKSkKKyAgICBpZiAoaGFzX3NjaGVtZShhcmcpIHx8IGVpbmFfc3RyX2hh c19wcmVmaXgoYXJnLCBKQVZBU0NSSVBUX1NDSEVNRSkgfHwgIXN0cmNhc2VjbXAoYXJnLCAiYWJv dXQ6YmxhbmsiKSkKICAgICAgICAgcmV0dXJuIHN0cmR1cChhcmcpOwogCiAgICAgRWluYV9TdHJi dWYgKmJ1ZiA9IGVpbmFfc3RyYnVmX21hbmFnZV9uZXcoZWluYV9maWxlX3BhdGhfc2FuaXRpemUo YXJnKSk7CkBAIC0xMDUxLDEzICsxMDU5LDE0IEBAIHVybF9mcm9tX3VzZXJfaW5wdXQoY29uc3Qg Y2hhciAqYXJnKQogICAgIC8qIENoZWNrIGlmIHRoZSBwYXRoIGV4aXN0cy4gKi8KICAgICBpZiAo ZWNvcmVfZmlsZV9leGlzdHMoZWluYV9zdHJidWZfc3RyaW5nX2dldChidWYpKSkgewogICAgICAg ICAvKiBGaWxlIGV4aXN0cywgY29udmVydCBsb2NhbCBwYXRoIHRvIGEgVVJMLiAqLwotICAgICAg ICBlaW5hX3N0cmJ1Zl9wcmVwZW5kKGJ1ZiwgImZpbGU6Ly8iKTsKKyAgICAgICAgZWluYV9zdHJi dWZfcHJlcGVuZChidWYsIEZJTEVfU0NIRU1FKTsKICAgICB9IGVsc2UgewogICAgICAgICAvKiBU aGUgcGF0aCBkb2VzIG5vdCBleGlzdCwgY29udmVydCBpdCB0byBhIFVSTCBieQogICAgICAgICAg ICBwcmVwZW5kaW5nIGh0dHA6Ly8gc2NoZW1lOgogICAgICAgICAgICB3d3cuZ29vZ2xlLmNvbSAt PiBodHRwOi8vd3d3Lmdvb2dsZS5jb20gKi8KICAgICAgICAgZWluYV9zdHJidWZfc3RyaW5nX2Zy ZWUoYnVmKTsKLSAgICAgICAgZWluYV9zdHJidWZfYXBwZW5kX3ByaW50ZihidWYsICJodHRwOi8v JXMiLCBhcmcpOworICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZiwgIiVzIiwg SFRUUF9TQ0hFTUUpOworICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZiwgIiVz IiwgYXJnKTsKICAgICB9CiAgICAgY2hhciAqdXJsID0gZWluYV9zdHJidWZfc3RyaW5nX3N0ZWFs KGJ1Zik7CiAgICAgZWluYV9zdHJidWZfZnJlZShidWYpOwpAQCAtMTA3MSw4ICsxMDgwLDggQEAg dXJsX2xvYWRfZnJvbV91c2VyX2lucHV0KEV2YXNfT2JqZWN0ICpld2tfdmlldywgY29uc3QgY2hh ciAqdXJsKQogICAgIGlmICghZXdrX3ZpZXcgfHwgIXVybCkKICAgICAgICAgcmV0dXJuIEVJTkFf RkFMU0U7CiAKLSAgICBpZiAoZWluYV9zdHJfaGFzX3ByZWZpeCh1cmwsICJqYXZhc2NyaXB0OiIp KQotICAgICAgICByZXR1cm4gZXdrX3ZpZXdfc2NyaXB0X2V4ZWN1dGUoZXdrX3ZpZXcsIHN0cnN0 cih1cmwsICJqYXZhc2NyaXB0OiIpLCAwLCAwKTsKKyAgICBpZiAoZWluYV9zdHJfaGFzX3ByZWZp eCh1cmwsIEpBVkFTQ1JJUFRfU0NIRU1FKSkKKyAgICAgICAgcmV0dXJuIGV3a192aWV3X3Njcmlw dF9leGVjdXRlKGV3a192aWV3LCBzdHJzdHIodXJsLCBKQVZBU0NSSVBUX1NDSEVNRSksIDAsIDAp OwogCiAgICAgcmV0dXJuIGV3a192aWV3X3VybF9zZXQoZXdrX3ZpZXcsIHVybCk7CiB9CkBAIC0x MTQ0LDcgKzExNTMsNyBAQCBvbl9iYWNrX2J1dHRvbl9jbGlja2VkKHZvaWQgKnVzZXJfZGF0YSwg RXZhc19PYmplY3QgKmJhY2tfYnV0dG9uLCB2b2lkICpldmVudF9pbgogewogICAgIGlmIChsb25n cHJlc3NfZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwotICAgIAorCiAgICAgQnJvd3Nlcl9XaW5k b3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKIAogICAgIGV3a192aWV3 X2JhY2sod2luZG93LT5ld2tfdmlldyk7CkBAIC0xMTkwLDEwICsxMTk5LDEwIEBAIG9uX3NlYXJj aF9jYXNlX29wdGlvbl9jaGFuZ2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKnNlYXJj aF9jYXNlX2NoZWNrX2JvCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93c2Vy X1dpbmRvdyAqKXVzZXJfZGF0YTsKICAgICBjaGFyICp0ZXh0ID0gZWxtX2VudHJ5X21hcmt1cF90 b191dGY4KGVsbV9lbnRyeV9lbnRyeV9nZXQod2luZG93LT5zZWFyY2guc2VhcmNoX2ZpZWxkKSk7 Ci0gICAgCisKICAgICAvKiBCaXQgdG9nZ2xlIHRoZSBjYXNlIHNlbnNpdGl2ZSBmbGFnICovCiAg ICAgc2VhcmNoX2ZsYWdzID0gc2VhcmNoX2ZsYWdzIF4gRVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lO U0VOU0lUSVZFOwotICAgIAorCiAgICAgZXdrX3ZpZXdfdGV4dF9maW5kKHdpbmRvdy0+ZXdrX3Zp ZXcsIHRleHQsIHNlYXJjaF9mbGFncywgTUFYX1NFQVJDSF9DT1VOVCk7CiAgICAgZnJlZSh0ZXh0 KTsKIH0KQEAgLTEyMDMsMTAgKzEyMTIsMTAgQEAgb25fc2VhcmNoX3dvcmRfc3RhcnRfb3B0aW9u X2NoYW5nZWQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqc2VhcmNoX3dvcmRfc3QKIHsK ICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRh OwogICAgIGNoYXIgKnRleHQgPSBlbG1fZW50cnlfbWFya3VwX3RvX3V0ZjgoZWxtX2VudHJ5X2Vu dHJ5X2dldCh3aW5kb3ctPnNlYXJjaC5zZWFyY2hfZmllbGQpKTsKLSAgICAKKwogICAgIC8qIEJp dCB0b2dnbGUgdGhlIHdvcmQgc3RhcnQgZmxhZyAqLwogICAgIHNlYXJjaF9mbGFncyA9IHNlYXJj aF9mbGFncyBeIEVXS19GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFM7Ci0gICAgCisKICAgICBl d2tfdmlld190ZXh0X2ZpbmQod2luZG93LT5ld2tfdmlldywgdGV4dCwgc2VhcmNoX2ZsYWdzLCBN QVhfU0VBUkNIX0NPVU5UKTsKICAgICBmcmVlKHRleHQpOwogfQpAQCAtMTI1Nyw3ICsxMjY2LDcg QEAgc3RhdGljIHZvaWQKIG9uX2xpc3RfaXRlbV9zZWxlY3Qodm9pZCAqdXNlcl9kYXRhLCBFdmFz X09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogewogICAgIEJyb3dzZXJfV2luZG93ICp3 aW5kb3cgPSBldmFzX29iamVjdF9kYXRhX2dldChvYmosICJCcm93c2VyX1dpbmRvdyIpOwotICAg IGV3a192aWV3X25hdmlnYXRlX3RvKHdpbmRvdy0+ZXdrX3ZpZXcsIHVzZXJfZGF0YSk7IAorICAg IGV3a192aWV3X25hdmlnYXRlX3RvKHdpbmRvdy0+ZXdrX3ZpZXcsIHVzZXJfZGF0YSk7CiAgICAg aGlzdG9yeV9saXN0X2hpZGUod2luZG93KTsKICAgICBldmFzX29iamVjdF9kYXRhX2RlbChvYmos ICJCcm93c2VyX1dpbmRvdyIpOwogfQpAQCAtMTI3MCw3ICsxMjc5LDcgQEAgbmF2aWdhdGlvbl9i dXR0b25fbG9uZ3ByZXNzX3Byb2Nlc3Modm9pZCAqdXNlcl9kYXRhLCBFaW5hX0Jvb2wgZm9yd2Fy ZF9uYXZpZ2F0aW8KIAogICAgIGxvbmdwcmVzc19lbmFibGVkID0gRUlOQV9UUlVFOwogICAgIEJy b3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7Ci0gICAg CisKICAgICBFd2tfQmFja19Gb3J3YXJkX0xpc3QgKmxpc3QgPSBld2tfdmlld19iYWNrX2Zvcndh cmRfbGlzdF9nZXQod2luZG93LT5ld2tfdmlldyk7CiAgICAgY29uc3QgRWluYV9MaXN0ICpsOwog ICAgIHZvaWQgKmRhdGE7CkBAIC0xMjgyLDExICsxMjkxLDExIEBAIG5hdmlnYXRpb25fYnV0dG9u X2xvbmdwcmVzc19wcm9jZXNzKHZvaWQgKnVzZXJfZGF0YSwgRWluYV9Cb29sIGZvcndhcmRfbmF2 aWdhdGlvCiAgICAgaW50IHdpZHRoOwogICAgIGludCBoZWlnaHQ7CiAgICAgc2l6ZV90IGluZGV4 OwotICAgIAorCiAgICAgZXZhc19vYmplY3RfZGF0YV9zZXQod2luZG93LT5oaXN0b3J5Lmhpc3Rv cnlfbGlzdCwgIkJyb3dzZXJfV2luZG93Iiwgd2luZG93KTsKIAogICAgIGlmIChmb3J3YXJkX25h dmlnYXRpb25fZW5hYmxlZCkKLSAgICAgICAgd2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdF9p dGVtcyA9IGV3a19iYWNrX2ZvcndhcmRfbGlzdF9mb3J3YXJkX2l0ZW1zX2NvcHkobGlzdCk7IAor ICAgICAgICB3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0X2l0ZW1zID0gZXdrX2JhY2tfZm9y d2FyZF9saXN0X2ZvcndhcmRfaXRlbXNfY29weShsaXN0KTsKICAgICBlbHNlCiAgICAgICAgIHdp bmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3RfaXRlbXMgPSBld2tfYmFja19mb3J3YXJkX2xpc3Rf YmFja19pdGVtc19jb3B5KGxpc3QpOwogCkBAIC0xMzA3LDcgKzEzMTYsNyBAQCBuYXZpZ2F0aW9u X2J1dHRvbl9sb25ncHJlc3NfcHJvY2Vzcyh2b2lkICp1c2VyX2RhdGEsIEVpbmFfQm9vbCBmb3J3 YXJkX25hdmlnYXRpbwogICAgICAgICBJTkZPKCIgdGl0bGUgPSAlcyIsIHRpdGxlKTsKICAgICAg ICAgZWxtX2dlbmxpc3RfaXRlbV9hcHBlbmQod2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdCwg bGlzdF9pdGVtLCAodm9pZCAqKSh0aXRsZSksIE5VTEwsIEVMTV9HRU5MSVNUX0lURU1fTk9ORSwg b25fbGlzdF9pdGVtX3NlbGVjdCwgZGF0YSk7CiAgICAgfQotICAgIAorCiAgICAgaWYgKGl0ZW1f Y291bnQgPiAwKSB7CiAgICAgICAgIGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldCh3aW5kb3ctPmVs bV93aW5kb3csICZ4LCAmeSwgJndpZHRoLCAmaGVpZ2h0KTsKICAgICAgICAgZWxtX2xpc3RfZ28o d2luZG93LT5oaXN0b3J5Lmhpc3RvcnlfbGlzdCk7CkBAIC0xMzE1LDEyICsxMzI0LDEyIEBAIG5h dmlnYXRpb25fYnV0dG9uX2xvbmdwcmVzc19wcm9jZXNzKHZvaWQgKnVzZXJfZGF0YSwgRWluYV9C b29sIGZvcndhcmRfbmF2aWdhdGlvCiAKICAgICAgICAgaWYgKGZvcndhcmRfbmF2aWdhdGlvbl9l bmFibGVkKSB7CiAgICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+aGlzdG9yeS5o aXN0b3J5X2JveCAsIHggKyBUT09MX0JBUl9CVVRUT05fU0laRSArIDEsIHkgKyBUT09MX0JBUl9C VVRUT05fU0laRSk7Ci0gICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+aGlzdG9y eS5oaXN0b3J5X2xpc3QgLCB4ICsgVE9PTF9CQVJfQlVUVE9OX1NJWkUgKyAxLCB5ICsgVE9PTF9C QVJfQlVUVE9OX1NJWkUpOyAgCisgICAgICAgICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+ aGlzdG9yeS5oaXN0b3J5X2xpc3QgLCB4ICsgVE9PTF9CQVJfQlVUVE9OX1NJWkUgKyAxLCB5ICsg VE9PTF9CQVJfQlVUVE9OX1NJWkUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZXZh c19vYmplY3RfbW92ZSh3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9ib3ggLCB4LCB5ICsgVE9PTF9C QVJfQlVUVE9OX1NJWkUpOwotICAgICAgICAgICAgZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmhp c3RvcnkuaGlzdG9yeV9saXN0ICwgeCwgeSArIFRPT0xfQkFSX0JVVFRPTl9TSVpFKTsgIAorICAg ICAgICAgICAgZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0ICwg eCwgeSArIFRPT0xfQkFSX0JVVFRPTl9TSVpFKTsKICAgICAgICAgfQotICAgIAorCiAgICAgICAg IGVsbV9nZW5saXN0X21vZGVfc2V0KHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5X2xpc3QsIEVMTV9M SVNUX0NPTVBSRVNTKTsKICAgICAgICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmhpc3Rvcnku aGlzdG9yeV9ib3gpOwogICAgICAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+aGlzdG9yeS5o aXN0b3J5X2xpc3QpOwpAQCAtMjAyNyw3ICsyMDM2LDcgQEAgb25fbmF2aWdhdGlvbl9wb2xpY3lf ZGVjaXNpb24odm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9p bmYKICAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsK ICAgICAgICAgSU5GTygiTW91c2UgbWlkZGxlIGJ1dHRvbiBwcmVzc2VkLCBvcGVuIGxpbmsgaW4g bmV3IHdpbmRvdyIpOwogCi0gICAgICAgIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9y ZWplY3QoZGVjaXNpb24pOyAKKyAgICAgICAgZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9u X3JlamVjdChkZWNpc2lvbik7CiAgICAgfQogfQogCkBAIC0yMjU2LDcgKzIyNjUsNyBAQCBzdGF0 aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXdrX1ZpZXdfQ29uZmlndXJhdGlvbiog Y29uZmlndXJhdGlvbiwgaW50CiAgICAgZXZhc19vYmplY3Rfc2l6ZV9oaW50X2FsaWduX3NldCh3 aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0LCBFVkFTX0hJTlRfRklMTCwgRVZBU19ISU5UX0ZJ TEwpOwogICAgIGVsbV93aW5fcmVzaXplX29iamVjdF9hZGQod2luZG93LT5lbG1fd2luZG93LCB3 aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9ib3gpOwogICAgIGVsbV9ib3hfcGFja19lbmQod2luZG93 LT5oaXN0b3J5Lmhpc3RvcnlfYm94LCB3aW5kb3ctPmhpc3RvcnkuaGlzdG9yeV9saXN0KTsKLSAg ICAKKwogICAgIC8qIENyZWF0ZSBld2tfdmlldyAqLwogICAgIEV3a19WaWV3X1NtYXJ0X0NsYXNz ICpld2tWaWV3Q2xhc3MgPSBtaW5pQnJvd3NlclZpZXdTbWFydENsYXNzKCk7CiAgICAgZXdrVmll d0NsYXNzLT5ydW5famF2YXNjcmlwdF9hbGVydCA9IG9uX2phdmFzY3JpcHRfYWxlcnQ7CkBAIC0y MzQwLDcgKzIzNDksNyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXdr X1ZpZXdfQ29uZmlndXJhdGlvbiogY29uZmlndXJhdGlvbiwgaW50CiAgICAgZXZhc19vYmplY3Rf ZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0Vf TU9WRSwgb25fbW91c2VfbW92ZSwgd2luZG93KTsKICAgICBldmFzX29iamVjdF9ldmVudF9jYWxs YmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxMQkFDS19NT1VTRV9XSEVFTCwgb25f bW91c2Vfd2hlZWwsIHdpbmRvdyk7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRk KHdpbmRvdy0+ZWxtX3dpbmRvdywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9uX3dpbmRvd19yZXNp emUsIHdpbmRvdyk7Ci0gICAgCisKICAgICBlbG1fYnV0dG9uX2F1dG9yZXBlYXRfc2V0KHdpbmRv dy0+YmFja19idXR0b24sIEVJTkFfVFJVRSk7CiAgICAgZWxtX2J1dHRvbl9hdXRvcmVwZWF0X3Nl dCh3aW5kb3ctPmZvcndhcmRfYnV0dG9uLCBFSU5BX1RSVUUpOwogICAgIGVsbV9idXR0b25fYXV0 b3JlcGVhdF9pbml0aWFsX3RpbWVvdXRfc2V0KHdpbmRvdy0+YmFja19idXR0b24sIExPTkdQUkVT U19JTlRFUlZBTF9TRUNPTkRTKTsKQEAgLTIzNzYsNyArMjM4NSw3IEBAIHN0YXRpYyBFd2tfVmll d19Db25maWd1cmF0aW9uKiBjb25maWd1cmF0aW9uKCkKIHN0YXRpYyBFd2tfQ29va2llX0FjY2Vw dF9Qb2xpY3kKIHBhcnNlX2Nvb2tpZXNfcG9saWN5KGNvbnN0IGNoYXIgKmlucHV0X3N0cmluZykK IHsKLSAgICBpZiAoIXN0cmNtcChpbnB1dF9zdHJpbmcsICJhbHdheXMiKSkgCisgICAgaWYgKCFz dHJjbXAoaW5wdXRfc3RyaW5nLCAiYWx3YXlzIikpCiAgICAgICAgIHJldHVybiBFV0tfQ09PS0lF X0FDQ0VQVF9QT0xJQ1lfQUxXQVlTOwogICAgIGlmICghc3RyY21wKGlucHV0X3N0cmluZywgIm5l dmVyIikpCiAgICAgICAgIHJldHVybiBFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTkVWRVI7Cg==