212817 2020-06-05 06:00:07 -0700 [GTK] MiniBrowser: stop using GtkToolbar for the search bar 2020-06-12 01:26:06 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 210276 212898 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1659561 0 cgarcia 2020-06-05 06:00:07 -0700 Use a GtkSearchBar instead, because GtkToolbar is no longer available in GTK4. 1659563 1 401144 cgarcia 2020-06-05 06:03:14 -0700 Created attachment 401144 Patch 1661571 2 401144 aperez 2020-06-11 07:15:10 -0700 Comment on attachment 401144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401144&action=review LGTM, but please fix the typos before landing :) > Tools/MiniBrowser/gtk/BrowserSearchBar.c:71 > + action = g_action_map_lookup_action(G_ACTION_MAP(actionGroup), "beginnig-word"); Typo: beginnig → beginning. (The same type is around in a few places more, I won't point out every instance.) 1661878 3 cgarcia 2020-06-12 01:26:06 -0700 Committed r262937: <https://trac.webkit.org/changeset/262937> 401144 2020-06-05 06:03:14 -0700 2020-06-11 07:15:10 -0700 Patch mb-search-bar.diff text/plain 18038 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMGQy YjQzNDAwNGEuLjYxN2VjNzAzYzM5OCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA2LTA1ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBNaW5pQnJv d3Nlcjogc3RvcCB1c2luZyBHdGtUb29sYmFyIGZvciB0aGUgc2VhcmNoIGJhcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyODE3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgR3RrU2VhcmNoQmFy IGluc3RlYWQsIGJlY2F1c2UgR3RrVG9vbGJhciBpcyBubyBsb25nZXIgYXZhaWxhYmxlIGluIEdU SzQuIEFsc28gdXNlIGEgR3RrUG9wb3ZlciBmb3IgdGhlCisgICAgICAgIG9wdGlvbnMgbWVudSBp bnN0ZWFkIG9mIHRoZSBHdGtNZW51LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJTZWFyY2hCYXIuYzoKKyAgICAgICAgKHNldEZhaWxlZFN0eWxlRm9yRW50cnkpOgorICAgICAg ICAoZG9TZWFyY2gpOgorICAgICAgICAoc2VhcmNoRW50cnlNZW51SWNvblByZXNzZWRDYWxsYmFj ayk6CisgICAgICAgIChzZWFyY2hFbnRyeUNoYW5nZWRDYWxsYmFjayk6CisgICAgICAgIChzZWFy Y2hNZW51Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJhY2spOgorICAgICAgICAoYnJvd3NlclNlYXJj aEJhckZpbmFsaXplKToKKyAgICAgICAgKGJyb3dzZXJfc2VhcmNoX2Jhcl9uZXcpOgorICAgICAg ICAoYnJvd3Nlcl9zZWFyY2hfYmFyX29wZW4pOgorICAgICAgICAoYnJvd3Nlcl9zZWFyY2hfYmFy X2Nsb3NlKToKKyAgICAgICAgKGJyb3dzZXJfc2VhcmNoX2Jhcl9pc19vcGVuKToKKyAgICAgICAg KHNlYXJjaENsb3NlQnV0dG9uQ2xpY2tlZENhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKHNl YXJjaEVudHJ5Q2xlYXJJY29uUmVsZWFzZWRDYWxsYmFjayk6IERlbGV0ZWQuCisgICAgICAgICog TWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIuaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nl ci9ndGsvQnJvd3NlclRhYi5jOgorICAgICAgICAoYnJvd3Nlcl90YWJfc3RhcnRfc2VhcmNoKToK KyAgICAgICAgKGJyb3dzZXJfdGFiX3N0b3Bfc2VhcmNoKToKKwogMjAyMC0wNi0wNSAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTWlu aUJyb3dzZXI6IHVzZSBHQWN0aW9uIEFQSSBmb3IgYWN0aW9ucyBhbmQgc2hvcnRjdXRzIGluIHBy ZXBhcmF0aW9uIGZvciBHVEs0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJv d3NlclNlYXJjaEJhci5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIu YwppbmRleCA3MGJiODk2OTc0MTAuLjQ0MWE3YzcxYWJjNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlclNlYXJjaEJhci5jCkBAIC0yOCw1MCArMjgsNTcgQEAKIAogI2lmICFHVEtfQ0hF Q0tfVkVSU0lPTigzLCA5OCwgMCkKIAotc3RhdGljIGNvbnN0IGNoYXIgKnNlYXJjaEVudHJ5RmFp bGVkU3R5bGUgPSAiR3RrRW50cnkjc2VhcmNoRW50cnkge2JhY2tncm91bmQtY29sb3I6ICNmZjY2 NjY7fSI7Ci0KIHN0cnVjdCBfQnJvd3NlclNlYXJjaEJhciB7Ci0gICAgR3RrVG9vbGJhciBwYXJl bnQ7CisgICAgR3RrU2VhcmNoQmFyIHBhcmVudDsKIAogICAgIFdlYktpdFdlYlZpZXcgKndlYlZp ZXc7CiAgICAgR3RrV2lkZ2V0ICplbnRyeTsKLSAgICBHdGtDc3NQcm92aWRlciAqY3NzUHJvdmlk ZXI7CiAgICAgR3RrV2lkZ2V0ICpwcmV2QnV0dG9uOwogICAgIEd0a1dpZGdldCAqbmV4dEJ1dHRv bjsKLSAgICBHdGtXaWRnZXQgKm9wdGlvbnNNZW51OworICAgIEdNZW51ICpvcHRpb25zTWVudTsK ICAgICBHdGtXaWRnZXQgKmNhc2VDaGVja0J1dHRvbjsKICAgICBHdGtXaWRnZXQgKmJlZ2dpbmln V29yZENoZWNrQnV0dG9uOwogICAgIEd0a1dpZGdldCAqY2FwaXRhbEFzQmVnZ2luaWdXb3JkQ2hl Y2tCdXR0b247CiB9OwogCi1HX0RFRklORV9UWVBFKEJyb3dzZXJTZWFyY2hCYXIsIGJyb3dzZXJf c2VhcmNoX2JhciwgR1RLX1RZUEVfVE9PTEJBUikKK0dfREVGSU5FX1RZUEUoQnJvd3NlclNlYXJj aEJhciwgYnJvd3Nlcl9zZWFyY2hfYmFyLCBHVEtfVFlQRV9TRUFSQ0hfQkFSKQogCiBzdGF0aWMg dm9pZCBzZXRGYWlsZWRTdHlsZUZvckVudHJ5KEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhciwg Z2Jvb2xlYW4gZmFpbGVkU2VhcmNoKQogewotICAgIGd0a19jc3NfcHJvdmlkZXJfbG9hZF9mcm9t X2RhdGEoc2VhcmNoQmFyLT5jc3NQcm92aWRlciwgZmFpbGVkU2VhcmNoID8gc2VhcmNoRW50cnlG YWlsZWRTdHlsZSA6ICIiLCAtMSwgTlVMTCk7CisgICAgaWYgKGZhaWxlZFNlYXJjaCkKKyAgICAg ICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKGd0a193aWRnZXRfZ2V0X3N0eWxlX2NvbnRl eHQoc2VhcmNoQmFyLT5lbnRyeSksICJzZWFyY2gtZmFpbGVkIik7CisgICAgZWxzZQorICAgICAg ICBndGtfc3R5bGVfY29udGV4dF9yZW1vdmVfY2xhc3MoZ3RrX3dpZGdldF9nZXRfc3R5bGVfY29u dGV4dChzZWFyY2hCYXItPmVudHJ5KSwgInNlYXJjaC1mYWlsZWQiKTsKIH0KIAogc3RhdGljIHZv aWQgZG9TZWFyY2goQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogewogICAgIEd0a0VudHJ5 ICplbnRyeSA9IEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5KTsKLQogICAgIGlmICghZ3RrX2Vu dHJ5X2dldF90ZXh0X2xlbmd0aChlbnRyeSkpIHsKLSAgICAgICAgd2Via2l0X2ZpbmRfY29udHJv bGxlcl9zZWFyY2hfZmluaXNoKHdlYmtpdF93ZWJfdmlld19nZXRfZmluZF9jb250cm9sbGVyKHNl YXJjaEJhci0+d2ViVmlldykpOwotICAgICAgICBndGtfZW50cnlfc2V0X2ljb25fZnJvbV9pY29u X25hbWUoZW50cnksIEdUS19FTlRSWV9JQ09OX1NFQ09OREFSWSwgTlVMTCk7CiAgICAgICAgIHNl dEZhaWxlZFN0eWxlRm9yRW50cnkoc2VhcmNoQmFyLCBGQUxTRSk7CisgICAgICAgIHdlYmtpdF9m aW5kX2NvbnRyb2xsZXJfc2VhcmNoX2ZpbmlzaCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2ZpbmRfY29u dHJvbGxlcihzZWFyY2hCYXItPndlYlZpZXcpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIGlmICghZ3RrX2VudHJ5X2dldF9pY29uX25hbWUoZW50cnksIEdUS19FTlRSWV9JQ09OX1NF Q09OREFSWSkpCi0gICAgICAgIGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX2ljb25fbmFtZShlbnRy eSwgR1RLX0VOVFJZX0lDT05fU0VDT05EQVJZLCAiZWRpdC1jbGVhciIpOwotCiAgICAgV2ViS2l0 RmluZE9wdGlvbnMgb3B0aW9ucyA9IFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQ7Ci0g ICAgaWYgKCFndGtfY2hlY2tfbWVudV9pdGVtX2dldF9hY3RpdmUoR1RLX0NIRUNLX01FTlVfSVRF TShzZWFyY2hCYXItPmNhc2VDaGVja0J1dHRvbikpKQorICAgIEdBY3Rpb25Hcm91cCAqYWN0aW9u R3JvdXAgPSBndGtfd2lkZ2V0X2dldF9hY3Rpb25fZ3JvdXAoR1RLX1dJREdFVChzZWFyY2hCYXIp LCAiZmluZCIpOworICAgIEdBY3Rpb24gKmFjdGlvbiA9IGdfYWN0aW9uX21hcF9sb29rdXBfYWN0 aW9uKEdfQUNUSU9OX01BUChhY3Rpb25Hcm91cCksICJjYXNlLXNlbnNpdGl2ZSIpOworICAgIEdW YXJpYW50ICpzdGF0ZSA9IGdfYWN0aW9uX2dldF9zdGF0ZShhY3Rpb24pOworICAgIGlmICghZ192 YXJpYW50X2dldF9ib29sZWFuKHN0YXRlKSkKICAgICAgICAgb3B0aW9ucyB8PSBXRUJLSVRfRklO RF9PUFRJT05TX0NBU0VfSU5TRU5TSVRJVkU7Ci0gICAgaWYgKGd0a19jaGVja19tZW51X2l0ZW1f Z2V0X2FjdGl2ZShHVEtfQ0hFQ0tfTUVOVV9JVEVNKHNlYXJjaEJhci0+YmVnZ2luaWdXb3JkQ2hl Y2tCdXR0b24pKSkKKyAgICBnX3ZhcmlhbnRfdW5yZWYoc3RhdGUpOworCisgICAgYWN0aW9uID0g Z19hY3Rpb25fbWFwX2xvb2t1cF9hY3Rpb24oR19BQ1RJT05fTUFQKGFjdGlvbkdyb3VwKSwgImJl Z2lubmlnLXdvcmQiKTsKKyAgICBzdGF0ZSA9IGdfYWN0aW9uX2dldF9zdGF0ZShhY3Rpb24pOwor ICAgIGlmIChnX3ZhcmlhbnRfZ2V0X2Jvb2xlYW4oc3RhdGUpKQogICAgICAgICBvcHRpb25zIHw9 IFdFQktJVF9GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFM7Ci0gICAgaWYgKGd0a19jaGVja19t ZW51X2l0ZW1fZ2V0X2FjdGl2ZShHVEtfQ0hFQ0tfTUVOVV9JVEVNKHNlYXJjaEJhci0+Y2FwaXRh bEFzQmVnZ2luaWdXb3JkQ2hlY2tCdXR0b24pKSkKKyAgICBnX3ZhcmlhbnRfdW5yZWYoc3RhdGUp OworCisgICAgYWN0aW9uID0gZ19hY3Rpb25fbWFwX2xvb2t1cF9hY3Rpb24oR19BQ1RJT05fTUFQ KGFjdGlvbkdyb3VwKSwgImNhcGl0YWwtYXMtYmVnaW5uaWctd29yZCIpOworICAgIHN0YXRlID0g Z19hY3Rpb25fZ2V0X3N0YXRlKGFjdGlvbik7CisgICAgaWYgKGdfdmFyaWFudF9nZXRfYm9vbGVh bihzdGF0ZSkpCiAgICAgICAgIG9wdGlvbnMgfD0gV0VCS0lUX0ZJTkRfT1BUSU9OU19UUkVBVF9N RURJQUxfQ0FQSVRBTF9BU19XT1JEX1NUQVJUOworICAgIGdfdmFyaWFudF91bnJlZihzdGF0ZSk7 CiAKICAgICBjb25zdCBnY2hhciAqdGV4dCA9IGd0a19lbnRyeV9nZXRfdGV4dChlbnRyeSk7CiAg ICAgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2god2Via2l0X3dlYl92aWV3X2dldF9maW5k X2NvbnRyb2xsZXIoc2VhcmNoQmFyLT53ZWJWaWV3KSwgdGV4dCwgb3B0aW9ucywgR19NQVhVSU5U KTsKQEAgLTg3LDI0ICs5NCwyMCBAQCBzdGF0aWMgdm9pZCBzZWFyY2hQcmV2aW91cyhCcm93c2Vy U2VhcmNoQmFyICpzZWFyY2hCYXIpCiAgICAgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2hf cHJldmlvdXMod2Via2l0X3dlYl92aWV3X2dldF9maW5kX2NvbnRyb2xsZXIoc2VhcmNoQmFyLT53 ZWJWaWV3KSk7CiB9CiAKLXN0YXRpYyB2b2lkIHNlYXJjaENsb3NlQnV0dG9uQ2xpY2tlZENhbGxi YWNrKEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKLXsKLSAgICBicm93c2VyX3NlYXJjaF9i YXJfY2xvc2Uoc2VhcmNoQmFyKTsKLX0KLQogc3RhdGljIHZvaWQgc2VhcmNoRW50cnlNZW51SWNv blByZXNzZWRDYWxsYmFjayhCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIsIEd0a0VudHJ5SWNv blBvc2l0aW9uIGljb25Qb3NpdGlvbiwgR2RrRXZlbnQgKmV2ZW50KQogewotICAgIGlmIChpY29u UG9zaXRpb24gPT0gR1RLX0VOVFJZX0lDT05fUFJJTUFSWSkKLSAgICAgICAgZ3RrX21lbnVfcG9w dXBfYXRfcG9pbnRlcihHVEtfTUVOVShzZWFyY2hCYXItPm9wdGlvbnNNZW51KSwgZXZlbnQpOwot fQorICAgIGlmIChpY29uUG9zaXRpb24gIT0gR1RLX0VOVFJZX0lDT05fUFJJTUFSWSkKKyAgICAg ICAgcmV0dXJuOwogCi1zdGF0aWMgdm9pZCBzZWFyY2hFbnRyeUNsZWFySWNvblJlbGVhc2VkQ2Fs bGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyLCBHdGtFbnRyeUljb25Qb3NpdGlvbiBp Y29uUG9zaXRpb24pCi17Ci0gICAgaWYgKGljb25Qb3NpdGlvbiA9PSBHVEtfRU5UUllfSUNPTl9T RUNPTkRBUlkpCi0gICAgICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5UUlkoc2VhcmNoQmFy LT5lbnRyeSksICIiKTsKKyAgICBHdGtXaWRnZXQgKnBvcG92ZXIgPSBndGtfcG9wb3Zlcl9uZXdf ZnJvbV9tb2RlbChzZWFyY2hCYXItPmVudHJ5LCBHX01FTlVfTU9ERUwoc2VhcmNoQmFyLT5vcHRp b25zTWVudSkpOworICAgIEdka1JlY3RhbmdsZSByZWN0OworICAgIGd0a19lbnRyeV9nZXRfaWNv bl9hcmVhKEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5KSwgR1RLX0VOVFJZX0lDT05fUFJJTUFS WSwgJnJlY3QpOworICAgIGd0a19wb3BvdmVyX3NldF9wb2ludGluZ190byhHVEtfUE9QT1ZFUihw b3BvdmVyKSwgJnJlY3QpOworICAgIGd0a19wb3BvdmVyX3NldF9wb3NpdGlvbihHVEtfUE9QT1ZF Uihwb3BvdmVyKSwgR1RLX1BPU19CT1RUT00pOworICAgIGd0a19wb3BvdmVyX3BvcHVwKEdUS19Q T1BPVkVSKHBvcG92ZXIpKTsKIH0KIAotc3RhdGljIHZvaWQgc2VhcmNoRW50cnlDaGFuZ2VkQ2Fs bGJhY2soR3RrRW50cnkgKmVudHJ5LCBCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCitzdGF0 aWMgdm9pZCBzZWFyY2hFbnRyeUNoYW5nZWRDYWxsYmFjayhHdGtTZWFyY2hFbnRyeSAqZW50cnks IEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKIHsKICAgICBkb1NlYXJjaChzZWFyY2hCYXIp OwogfQpAQCAtMTI0LDkgKzEyNywxMCBAQCBzdGF0aWMgdm9pZCBzZWFyY2hOZXh0QnV0dG9uQ2Fs bGJhY2soR1NpbXBsZUFjdGlvbiAqYWN0aW9uLCBHVmFyaWFudCAqcGFyYW1ldGVyLAogICAgIHNl YXJjaE5leHQoQlJPV1NFUl9TRUFSQ0hfQkFSKHVzZXJEYXRhKSk7CiB9CiAKLXN0YXRpYyB2b2lk IHNlYXJjaE1lbnVDaGVja0J1dHRvblRvZ2dsZWRDYWxsYmFjayhCcm93c2VyU2VhcmNoQmFyICpz ZWFyY2hCYXIpCitzdGF0aWMgdm9pZCBzZWFyY2hNZW51Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJh Y2soR1NpbXBsZUFjdGlvbiAqYWN0aW9uLCBHVmFyaWFudCAqc3RhdGUsIGdwb2ludGVyIHVzZXJE YXRhKQogewotICAgIGRvU2VhcmNoKHNlYXJjaEJhcik7CisgICAgZ19zaW1wbGVfYWN0aW9uX3Nl dF9zdGF0ZShhY3Rpb24sIHN0YXRlKTsKKyAgICBkb1NlYXJjaChCUk9XU0VSX1NFQVJDSF9CQVIo dXNlckRhdGEpKTsKIH0KIAogc3RhdGljIHZvaWQgZmluZENvbnRyb2xsZXJGYWlsZWRUb0ZpbmRU ZXh0Q2FsbGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQpAQCAtMTQyLDYgKzE0Niw5 IEBAIHN0YXRpYyB2b2lkIGZpbmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2soQnJvd3NlclNl YXJjaEJhciAqc2VhcmNoQmFyKQogc3RhdGljIGNvbnN0IEdBY3Rpb25FbnRyeSBhY3Rpb25zW10g PSB7CiAgICAgeyAibmV4dCIsIHNlYXJjaE5leHRCdXR0b25DYWxsYmFjaywgTlVMTCwgTlVMTCwg TlVMTCwgeyAwIH0gfSwKICAgICB7ICJwcmV2aW91cyIsIHNlYXJjaFByZXZpb3VzQnV0dG9uQ2Fs bGJhY2ssIE5VTEwsIE5VTEwsIE5VTEwsIHsgMCB9IH0sCisgICAgeyAiY2FzZS1zZW5zaXRpdmUi LCBOVUxMLCBOVUxMLCAiZmFsc2UiLCBzZWFyY2hNZW51Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJh Y2ssIHsgMCB9IH0sCisgICAgeyAiYmVnaW5uaWctd29yZCIsIE5VTEwsIE5VTEwsICJmYWxzZSIs IHNlYXJjaE1lbnVDaGVja0J1dHRvblRvZ2dsZWRDYWxsYmFjaywgeyAwIH0gfSwKKyAgICB7ICJj YXBpdGFsLWFzLWJlZ2lubmlnLXdvcmQiLCBOVUxMLCBOVUxMLCAiZmFsc2UiLCBzZWFyY2hNZW51 Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJhY2ssIHsgMCB9IH0KIH07CiAKIHN0YXRpYyB2b2lkIGJy b3dzZXJfc2VhcmNoX2Jhcl9pbml0KEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKQEAgLTE1 MSw3MSArMTU4LDUwIEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfc2VhcmNoX2Jhcl9pbml0KEJyb3dz ZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKICAgICBndGtfd2lkZ2V0X2luc2VydF9hY3Rpb25fZ3Jv dXAoR1RLX1dJREdFVChzZWFyY2hCYXIpLCAiZmluZCIsIEdfQUNUSU9OX0dST1VQKGFjdGlvbkdy b3VwKSk7CiAgICAgZ19vYmplY3RfdW5yZWYoYWN0aW9uR3JvdXApOwogCi0gICAgZ3RrX3dpZGdl dF9zZXRfaGV4cGFuZChHVEtfV0lER0VUKHNlYXJjaEJhciksIFRSVUUpOwotCi0gICAgR3RrVG9v bEl0ZW0gKnRvb2xJdGVtID0gZ3RrX3Rvb2xfaXRlbV9uZXcoKTsKLSAgICBndGtfdG9vbF9pdGVt X3NldF9leHBhbmQodG9vbEl0ZW0sIFRSVUUpOwotICAgIGd0a190b29sYmFyX2luc2VydChHVEtf VE9PTEJBUihzZWFyY2hCYXIpLCB0b29sSXRlbSwgMCk7Ci0KLSAgICBHdGtCb3ggKmhCb3ggPSBH VEtfQk9YKGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMLCA1KSk7Ci0gICAg Z3RrX2JveF9zZXRfaG9tb2dlbmVvdXMoaEJveCwgVFJVRSk7Ci0gICAgZ3RrX2NvbnRhaW5lcl9h ZGQoR1RLX0NPTlRBSU5FUih0b29sSXRlbSksIEdUS19XSURHRVQoaEJveCkpOworICAgIEd0a1dp ZGdldCAqaEJveCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMLCAwKTsK KyAgICBHdGtTdHlsZUNvbnRleHQgKnN0eWxlQ29udGV4dCA9IGd0a193aWRnZXRfZ2V0X3N0eWxl X2NvbnRleHQoaEJveCk7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKHN0eWxlQ29u dGV4dCwgR1RLX1NUWUxFX0NMQVNTX0xJTktFRCk7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRk X2NsYXNzKHN0eWxlQ29udGV4dCwgR1RLX1NUWUxFX0NMQVNTX1JBSVNFRCk7CiAKLSAgICBndGtf Ym94X3BhY2tfc3RhcnQoaEJveCwgZ3RrX2JveF9uZXcoR1RLX09SSUVOVEFUSU9OX0hPUklaT05U QUwsIDApLCBUUlVFLCBUUlVFLCAwKTsKKyAgICBzZWFyY2hCYXItPmVudHJ5ID0gZ3RrX3NlYXJj aF9lbnRyeV9uZXcoKTsKKyAgICBndGtfZW50cnlfc2V0X2ljb25fYWN0aXZhdGFibGUoR1RLX0VO VFJZKHNlYXJjaEJhci0+ZW50cnkpLCBHVEtfRU5UUllfSUNPTl9QUklNQVJZLCBUUlVFKTsKKyAg ICBndGtfZW50cnlfc2V0X2ljb25fc2Vuc2l0aXZlKEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5 KSwgR1RLX0VOVFJZX0lDT05fUFJJTUFSWSwgVFJVRSk7CisgICAgZ3RrX2VudHJ5X3NldF9pY29u X3Rvb2x0aXBfdGV4dChHVEtfRU5UUlkoc2VhcmNoQmFyLT5lbnRyeSksIEdUS19FTlRSWV9JQ09O X1BSSU1BUlksICJTZWFyY2ggb3B0aW9ucyIpOworICAgIGd0a19ib3hfcGFja19zdGFydChHVEtf Qk9YKGhCb3gpLCBzZWFyY2hCYXItPmVudHJ5LCBUUlVFLCBUUlVFLCAwKTsKKyAgICBndGtfd2lk Z2V0X3Nob3coc2VhcmNoQmFyLT5lbnRyeSk7CiAKLSAgICBzZWFyY2hCYXItPmVudHJ5ID0gZ3Rr X2VudHJ5X25ldygpOwotICAgIGd0a193aWRnZXRfc2V0X25hbWUoc2VhcmNoQmFyLT5lbnRyeSwg InNlYXJjaEVudHJ5Iik7Ci0gICAgZ3RrX2VudHJ5X3NldF9wbGFjZWhvbGRlcl90ZXh0KEdUS19F TlRSWShzZWFyY2hCYXItPmVudHJ5KSwgIlNlYXJjaCIpOwotICAgIGd0a19lbnRyeV9zZXRfaWNv bl9mcm9tX2ljb25fbmFtZShHVEtfRU5UUlkoc2VhcmNoQmFyLT5lbnRyeSksIEdUS19FTlRSWV9J Q09OX1BSSU1BUlksICJlZGl0LWZpbmQiKTsKLSAgICBndGtfYm94X3BhY2tfc3RhcnQoaEJveCwg c2VhcmNoQmFyLT5lbnRyeSwgVFJVRSwgVFJVRSwgMCk7CisgICAgR3RrQ3NzUHJvdmlkZXIgKmNz c1Byb3ZpZGVyID0gZ3RrX2Nzc19wcm92aWRlcl9uZXcoKTsKKyAgICBndGtfY3NzX3Byb3ZpZGVy X2xvYWRfZnJvbV9kYXRhKGNzc1Byb3ZpZGVyLCAiLnNlYXJjaC1mYWlsZWQgeyBiYWNrZ3JvdW5k LWNvbG9yOiAjZmY2NjY2OyB9IiwgLTEsIE5VTEwpOworICAgIGd0a19zdHlsZV9jb250ZXh0X2Fk ZF9wcm92aWRlcihndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHNlYXJjaEJhci0+ZW50cnkp LCBHVEtfU1RZTEVfUFJPVklERVIoY3NzUHJvdmlkZXIpLCBHVEtfU1RZTEVfUFJPVklERVJfUFJJ T1JJVFlfQVBQTElDQVRJT04pOworICAgIGdfb2JqZWN0X3VucmVmKGNzc1Byb3ZpZGVyKTsKIAot ICAgIHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBndGtfY3NzX3Byb3ZpZGVyX25ldygpOwotICAg IGd0a19zdHlsZV9jb250ZXh0X2FkZF9wcm92aWRlcihndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250 ZXh0KHNlYXJjaEJhci0+ZW50cnkpLCBHVEtfU1RZTEVfUFJPVklERVIoc2VhcmNoQmFyLT5jc3NQ cm92aWRlciksIEdUS19TVFlMRV9QUk9WSURFUl9QUklPUklUWV9BUFBMSUNBVElPTik7Ci0KLSAg ICBHdGtCb3ggKmhCb3hCdXR0b25zID0gR1RLX0JPWChndGtfYm94X25ldyhHVEtfT1JJRU5UQVRJ T05fSE9SSVpPTlRBTCwgMCkpOwotICAgIGd0a19ib3hfcGFja19zdGFydChoQm94LCBHVEtfV0lE R0VUKGhCb3hCdXR0b25zKSwgVFJVRSwgVFJVRSwgMCk7Ci0KLSAgICBzZWFyY2hCYXItPnByZXZC dXR0b24gPSBndGtfYnV0dG9uX25ld19mcm9tX2ljb25fbmFtZSgiZ28tdXAiLCBHVEtfSUNPTl9T SVpFX1NNQUxMX1RPT0xCQVIpOworICAgIHNlYXJjaEJhci0+cHJldkJ1dHRvbiA9IGd0a19idXR0 b25fbmV3X2Zyb21faWNvbl9uYW1lKCJnby11cC1zeW1ib2xpYyIsIEdUS19JQ09OX1NJWkVfTUVO VSk7CiAgICAgR3RrQnV0dG9uICpidXR0b24gPSBHVEtfQlVUVE9OKHNlYXJjaEJhci0+cHJldkJ1 dHRvbik7CiAgICAgZ3RrX2FjdGlvbmFibGVfc2V0X2FjdGlvbl9uYW1lKEdUS19BQ1RJT05BQkxF KGJ1dHRvbiksICJmaW5kLnByZXZpb3VzIik7Ci0gICAgZ3RrX2J1dHRvbl9zZXRfcmVsaWVmKGJ1 dHRvbiwgR1RLX1JFTElFRl9OT05FKTsKICAgICBndGtfd2lkZ2V0X3NldF9mb2N1c19vbl9jbGlj ayhzZWFyY2hCYXItPnByZXZCdXR0b24sIEZBTFNFKTsKLSAgICBndGtfYm94X3BhY2tfc3RhcnQo aEJveEJ1dHRvbnMsIHNlYXJjaEJhci0+cHJldkJ1dHRvbiwgRkFMU0UsIEZBTFNFLCAwKTsKKyAg ICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWChoQm94KSwgc2VhcmNoQmFyLT5wcmV2QnV0dG9u LCBGQUxTRSwgRkFMU0UsIDApOworICAgIGd0a193aWRnZXRfc2hvdyhzZWFyY2hCYXItPnByZXZC dXR0b24pOwogCi0gICAgc2VhcmNoQmFyLT5uZXh0QnV0dG9uID0gZ3RrX2J1dHRvbl9uZXdfZnJv bV9pY29uX25hbWUoImdvLWRvd24iLCBHVEtfSUNPTl9TSVpFX1NNQUxMX1RPT0xCQVIpOworICAg IHNlYXJjaEJhci0+bmV4dEJ1dHRvbiA9IGd0a19idXR0b25fbmV3X2Zyb21faWNvbl9uYW1lKCJn by1kb3duLXN5bWJvbGljIiwgR1RLX0lDT05fU0laRV9NRU5VKTsKICAgICBidXR0b24gPSBHVEtf QlVUVE9OKHNlYXJjaEJhci0+bmV4dEJ1dHRvbik7CiAgICAgZ3RrX2FjdGlvbmFibGVfc2V0X2Fj dGlvbl9uYW1lKEdUS19BQ1RJT05BQkxFKGJ1dHRvbiksICJmaW5kLm5leHQiKTsKLSAgICBndGtf YnV0dG9uX3NldF9yZWxpZWYoYnV0dG9uLCBHVEtfUkVMSUVGX05PTkUpOwogICAgIGd0a193aWRn ZXRfc2V0X2ZvY3VzX29uX2NsaWNrKHNlYXJjaEJhci0+bmV4dEJ1dHRvbiwgRkFMU0UpOwotICAg IGd0a19ib3hfcGFja19zdGFydChoQm94QnV0dG9ucywgc2VhcmNoQmFyLT5uZXh0QnV0dG9uLCBG QUxTRSwgRkFMU0UsIDApOwotCi0gICAgR3RrV2lkZ2V0ICpjbG9zZUJ1dHRvbiA9IGd0a19idXR0 b25fbmV3X2Zyb21faWNvbl9uYW1lKCJ3aW5kb3ctY2xvc2UiLCBHVEtfSUNPTl9TSVpFX1NNQUxM X1RPT0xCQVIpOwotICAgIGd0a19idXR0b25fc2V0X3JlbGllZihHVEtfQlVUVE9OKGNsb3NlQnV0 dG9uKSwgR1RLX1JFTElFRl9OT05FKTsKLSAgICBndGtfd2lkZ2V0X3NldF9mb2N1c19vbl9jbGlj ayhjbG9zZUJ1dHRvbiwgRkFMU0UpOwotICAgIGd0a19ib3hfcGFja19lbmQoaEJveEJ1dHRvbnMs IGNsb3NlQnV0dG9uLCBGQUxTRSwgRkFMU0UsIDApOwotCi0gICAgc2VhcmNoQmFyLT5vcHRpb25z TWVudSA9IGdfb2JqZWN0X3JlZl9zaW5rKGd0a19tZW51X25ldygpKTsKKyAgICBndGtfYm94X3Bh Y2tfc3RhcnQoR1RLX0JPWChoQm94KSwgc2VhcmNoQmFyLT5uZXh0QnV0dG9uLCBGQUxTRSwgRkFM U0UsIDApOworICAgIGd0a193aWRnZXRfc2hvdyhzZWFyY2hCYXItPm5leHRCdXR0b24pOwogCi0g ICAgc2VhcmNoQmFyLT5jYXNlQ2hlY2tCdXR0b24gPSBndGtfY2hlY2tfbWVudV9pdGVtX25ld193 aXRoX21uZW1vbmljKCJDYV9zZSBzZW5zaXRpdmUiKTsKLSAgICBndGtfY29udGFpbmVyX2FkZChH VEtfQ09OVEFJTkVSKHNlYXJjaEJhci0+b3B0aW9uc01lbnUpLCBzZWFyY2hCYXItPmNhc2VDaGVj a0J1dHRvbik7Ci0KLSAgICBzZWFyY2hCYXItPmJlZ2dpbmlnV29yZENoZWNrQnV0dG9uID0gZ3Rr X2NoZWNrX21lbnVfaXRlbV9uZXdfd2l0aF9tbmVtb25pYygiT25seSBhdCB0aGUgX2JlZ2lubmlu ZyBvZiB3b3JkcyIpOwotICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoc2VhcmNo QmFyLT5vcHRpb25zTWVudSksIHNlYXJjaEJhci0+YmVnZ2luaWdXb3JkQ2hlY2tCdXR0b24pOwor ICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoc2VhcmNoQmFyKSwgaEJveCk7Cisg ICAgZ3RrX3dpZGdldF9zaG93KGhCb3gpOworICAgIGd0a19zZWFyY2hfYmFyX2Nvbm5lY3RfZW50 cnkoR1RLX1NFQVJDSF9CQVIoc2VhcmNoQmFyKSwgR1RLX0VOVFJZKHNlYXJjaEJhci0+ZW50cnkp KTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChzZWFyY2hCYXIpKTsKIAotICAgIHNl YXJjaEJhci0+Y2FwaXRhbEFzQmVnZ2luaWdXb3JkQ2hlY2tCdXR0b24gPSBndGtfY2hlY2tfbWVu dV9pdGVtX25ld193aXRoX21uZW1vbmljKCJDYXBpdGFsIF9hbHdheXMgYXMgYmVnaW5uaW5nIG9m IHdvcmQiKTsKLSAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKHNlYXJjaEJhci0+ b3B0aW9uc01lbnUpLCBzZWFyY2hCYXItPmNhcGl0YWxBc0JlZ2dpbmlnV29yZENoZWNrQnV0dG9u KTsKKyAgICBzZWFyY2hCYXItPm9wdGlvbnNNZW51ID0gZ19tZW51X25ldygpOworICAgIGdfbWVu dV9hcHBlbmQoc2VhcmNoQmFyLT5vcHRpb25zTWVudSwgIkNhX3NlIHNlbnNpdGl2ZSIsICJmaW5k LmNhc2Utc2Vuc2l0aXZlIik7CisgICAgZ19tZW51X2FwcGVuZChzZWFyY2hCYXItPm9wdGlvbnNN ZW51LCAiT25seSBhdCB0aGUgX2JlZ2lubmluZyBvZiB3b3JkcyIsICJmaW5kLmJlZ2lubmlnLXdv cmQiKTsKKyAgICBnX21lbnVfYXBwZW5kKHNlYXJjaEJhci0+b3B0aW9uc01lbnUsICJDYXBpdGFs IF9hbHdheXMgYXMgYmVnaW5uaW5nIG9mIHdvcmQiLCAiZmluZC5jYXBpdGFsLWFzLWJlZ2lubmln LXdvcmQiKTsKIAotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChjbG9zZUJ1dHRvbiwgImNs aWNrZWQiLCBHX0NBTExCQUNLKHNlYXJjaENsb3NlQnV0dG9uQ2xpY2tlZENhbGxiYWNrKSwgc2Vh cmNoQmFyKTsKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoc2VhcmNoQmFyLT5lbnRyeSwg Imljb24tcHJlc3MiLCBHX0NBTExCQUNLKHNlYXJjaEVudHJ5TWVudUljb25QcmVzc2VkQ2FsbGJh Y2spLCBzZWFyY2hCYXIpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChzZWFyY2hCYXIt PmVudHJ5LCAiaWNvbi1yZWxlYXNlIiwgR19DQUxMQkFDSyhzZWFyY2hFbnRyeUNsZWFySWNvblJl bGVhc2VkQ2FsbGJhY2spLCBzZWFyY2hCYXIpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3RfYWZ0ZXIo c2VhcmNoQmFyLT5lbnRyeSwgImNoYW5nZWQiLCBHX0NBTExCQUNLKHNlYXJjaEVudHJ5Q2hhbmdl ZENhbGxiYWNrKSwgc2VhcmNoQmFyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X2FmdGVyKHNlYXJj aEJhci0+ZW50cnksICJzZWFyY2gtY2hhbmdlZCIsIEdfQ0FMTEJBQ0soc2VhcmNoRW50cnlDaGFu Z2VkQ2FsbGJhY2spLCBzZWFyY2hCYXIpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChz ZWFyY2hCYXItPmVudHJ5LCAiYWN0aXZhdGUiLCBHX0NBTExCQUNLKHNlYXJjaEVudHJ5QWN0aXZh dGVkQ2FsbGJhY2spLCBzZWFyY2hCYXIpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChz ZWFyY2hCYXItPmNhc2VDaGVja0J1dHRvbiwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKHNlYXJjaE1l bnVDaGVja0J1dHRvblRvZ2dsZWRDYWxsYmFjayksIHNlYXJjaEJhcik7Ci0gICAgZ19zaWduYWxf Y29ubmVjdF9zd2FwcGVkKHNlYXJjaEJhci0+YmVnZ2luaWdXb3JkQ2hlY2tCdXR0b24sICJ0b2dn bGVkIiwgR19DQUxMQkFDSyhzZWFyY2hNZW51Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJhY2spLCBz ZWFyY2hCYXIpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChzZWFyY2hCYXItPmNhcGl0 YWxBc0JlZ2dpbmlnV29yZENoZWNrQnV0dG9uLCAidG9nZ2xlZCIsIEdfQ0FMTEJBQ0soc2VhcmNo TWVudUNoZWNrQnV0dG9uVG9nZ2xlZENhbGxiYWNrKSwgc2VhcmNoQmFyKTsKLQotICAgIGd0a193 aWRnZXRfc2hvd19hbGwoR1RLX1dJREdFVCh0b29sSXRlbSkpOwotICAgIGd0a193aWRnZXRfc2hv d19hbGwoc2VhcmNoQmFyLT5vcHRpb25zTWVudSk7CiB9CiAKIHN0YXRpYyB2b2lkIGJyb3dzZXJT ZWFyY2hCYXJGaW5hbGl6ZShHT2JqZWN0ICpnT2JqZWN0KQpAQCAtMjI3LDExICsyMTMsNiBAQCBz dGF0aWMgdm9pZCBicm93c2VyU2VhcmNoQmFyRmluYWxpemUoR09iamVjdCAqZ09iamVjdCkKICAg ICAgICAgc2VhcmNoQmFyLT53ZWJWaWV3ID0gTlVMTDsKICAgICB9CiAKLSAgICBpZiAoc2VhcmNo QmFyLT5jc3NQcm92aWRlcikgewotICAgICAgICBnX29iamVjdF91bnJlZihzZWFyY2hCYXItPmNz c1Byb3ZpZGVyKTsKLSAgICAgICAgc2VhcmNoQmFyLT5jc3NQcm92aWRlciA9IE5VTEw7Ci0gICAg fQotCiAgICAgaWYgKHNlYXJjaEJhci0+b3B0aW9uc01lbnUpIHsKICAgICAgICAgZ19vYmplY3Rf dW5yZWYoc2VhcmNoQmFyLT5vcHRpb25zTWVudSk7CiAgICAgICAgIHNlYXJjaEJhci0+b3B0aW9u c01lbnUgPSBOVUxMOwpAQCAtMjUzLDYgKzIzNCw3IEBAIEd0a1dpZGdldCAqYnJvd3Nlcl9zZWFy Y2hfYmFyX25ldyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3KQogCiAgICAgR3RrV2lkZ2V0ICpzZWFy Y2hCYXIgPSBHVEtfV0lER0VUKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfU0VBUkNIX0JBUiwg TlVMTCkpOwogICAgIEJST1dTRVJfU0VBUkNIX0JBUihzZWFyY2hCYXIpLT53ZWJWaWV3ID0gZ19v YmplY3RfcmVmKHdlYlZpZXcpOworICAgIGd0a19zZWFyY2hfYmFyX3NldF9zaG93X2Nsb3NlX2J1 dHRvbihHVEtfU0VBUkNIX0JBUihzZWFyY2hCYXIpLCBUUlVFKTsKIAogICAgIFdlYktpdEZpbmRD b250cm9sbGVyICpjb250cm9sbGVyID0gd2Via2l0X3dlYl92aWV3X2dldF9maW5kX2NvbnRyb2xs ZXIod2ViVmlldyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKGNvbnRyb2xsZXIsICJm YWlsZWQtdG8tZmluZC10ZXh0IiwgR19DQUxMQkFDSyhmaW5kQ29udHJvbGxlckZhaWxlZFRvRmlu ZFRleHRDYWxsYmFjayksIHNlYXJjaEJhcik7CkBAIC0yNjUsMjIgKzI0NywyMiBAQCB2b2lkIGJy b3dzZXJfc2VhcmNoX2Jhcl9vcGVuKEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKIHsKICAg ICBnX3JldHVybl9pZl9mYWlsKEJST1dTRVJfSVNfU0VBUkNIX0JBUihzZWFyY2hCYXIpKTsKIAot ICAgIEd0a0VudHJ5ICplbnRyeSA9IEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5KTsKLQotICAg IGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKHNlYXJjaEJhcikpOwotICAgIGd0a193aWRnZXRf Z3JhYl9mb2N1cyhHVEtfV0lER0VUKGVudHJ5KSk7Ci0gICAgZ3RrX2VkaXRhYmxlX3NlbGVjdF9y ZWdpb24oR1RLX0VESVRBQkxFKGVudHJ5KSwgMCwgLTEpOwotICAgIGlmIChndGtfZW50cnlfZ2V0 X3RleHRfbGVuZ3RoKGVudHJ5KSkKLSAgICAgICAgZG9TZWFyY2goc2VhcmNoQmFyKTsKKyAgICBn dGtfc2VhcmNoX2Jhcl9zZXRfc2VhcmNoX21vZGUoR1RLX1NFQVJDSF9CQVIoc2VhcmNoQmFyKSwg VFJVRSk7CiB9CiAKIHZvaWQgYnJvd3Nlcl9zZWFyY2hfYmFyX2Nsb3NlKEJyb3dzZXJTZWFyY2hC YXIgKnNlYXJjaEJhcikKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKEJST1dTRVJfSVNfU0VBUkNI X0JBUihzZWFyY2hCYXIpKTsKIAotICAgIGd0a193aWRnZXRfaGlkZShHVEtfV0lER0VUKHNlYXJj aEJhcikpOwotICAgIFdlYktpdEZpbmRDb250cm9sbGVyICpjb250cm9sbGVyID0gd2Via2l0X3dl Yl92aWV3X2dldF9maW5kX2NvbnRyb2xsZXIoc2VhcmNoQmFyLT53ZWJWaWV3KTsKLSAgICB3ZWJr aXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9maW5pc2goY29udHJvbGxlcik7CisgICAgZ3RrX3Nl YXJjaF9iYXJfc2V0X3NlYXJjaF9tb2RlKEdUS19TRUFSQ0hfQkFSKHNlYXJjaEJhciksIEZBTFNF KTsKK30KKworZ2Jvb2xlYW4gYnJvd3Nlcl9zZWFyY2hfYmFyX2lzX29wZW4oQnJvd3NlclNlYXJj aEJhciAqc2VhcmNoQmFyKQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEJST1dTRVJfSVNf U0VBUkNIX0JBUihzZWFyY2hCYXIpLCBGQUxTRSk7CisKKyAgICBHdGtXaWRnZXQgKnJldmVhbGVy ID0gZ3RrX2Jpbl9nZXRfY2hpbGQoR1RLX0JJTihzZWFyY2hCYXIpKTsKKyAgICByZXR1cm4gZ3Rr X3JldmVhbGVyX2dldF9yZXZlYWxfY2hpbGQoR1RLX1JFVkVBTEVSKHJldmVhbGVyKSk7CiB9CiAK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hC YXIuaCBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyU2VhcmNoQmFyLmgKaW5kZXggOTQ1 NDE5YTkzYWU1Li4wNTc5NGRlYzI0MTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0 ay9Ccm93c2VyU2VhcmNoQmFyLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJT ZWFyY2hCYXIuaApAQCAtNDQsNyArNDQsNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3NlclNlYXJj aEJhciAgICAgICBCcm93c2VyU2VhcmNoQmFyOwogdHlwZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJTZWFy Y2hCYXJDbGFzcyAgQnJvd3NlclNlYXJjaEJhckNsYXNzOwogCiBzdHJ1Y3QgX0Jyb3dzZXJTZWFy Y2hCYXJDbGFzcyB7Ci0gICAgR3RrVG9vbGJhckNsYXNzIHBhcmVudF9jbGFzczsKKyAgICBHdGtT ZWFyY2hCYXJDbGFzcyBwYXJlbnRfY2xhc3M7CiB9OwogCiBHVHlwZSBicm93c2VyX3NlYXJjaF9i YXJfZ2V0X3R5cGUodm9pZCk7CkBAIC01Miw2ICs1Miw4IEBAIEdUeXBlIGJyb3dzZXJfc2VhcmNo X2Jhcl9nZXRfdHlwZSh2b2lkKTsKIEd0a1dpZGdldCAqYnJvd3Nlcl9zZWFyY2hfYmFyX25ldyhX ZWJLaXRXZWJWaWV3ICopOwogdm9pZCBicm93c2VyX3NlYXJjaF9iYXJfb3BlbihCcm93c2VyU2Vh cmNoQmFyICopOwogdm9pZCBicm93c2VyX3NlYXJjaF9iYXJfY2xvc2UoQnJvd3NlclNlYXJjaEJh ciAqKTsKK2dib29sZWFuIGJyb3dzZXJfc2VhcmNoX2Jhcl9pc19vcGVuKEJyb3dzZXJTZWFyY2hC YXIgKik7CisKIAogR19FTkRfREVDTFMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJUYWIuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyVGFiLmMKaW5k ZXggZWJlNDdhZDc4NmU1Li43ZjNlYThjZmJlMWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL2d0ay9Ccm93c2VyVGFiLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJU YWIuYwpAQCAtNjI1LDcgKzYyNSw3IEBAIHZvaWQgYnJvd3Nlcl90YWJfc3RhcnRfc2VhcmNoKEJy b3dzZXJUYWIgKnRhYikKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKEJST1dTRVJfSVNfVEFCKHRh YikpOwogI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKLSAgICBpZiAoIWd0a193aWRn ZXRfZ2V0X3Zpc2libGUoR1RLX1dJREdFVCh0YWItPnNlYXJjaEJhcikpKQorICAgIGlmICghYnJv d3Nlcl9zZWFyY2hfYmFyX2lzX29wZW4odGFiLT5zZWFyY2hCYXIpKQogICAgICAgICBicm93c2Vy X3NlYXJjaF9iYXJfb3Blbih0YWItPnNlYXJjaEJhcik7CiAjZW5kaWYKIH0KQEAgLTYzNCw3ICs2 MzQsNyBAQCB2b2lkIGJyb3dzZXJfdGFiX3N0b3Bfc2VhcmNoKEJyb3dzZXJUYWIgKnRhYikKIHsK ICAgICBnX3JldHVybl9pZl9mYWlsKEJST1dTRVJfSVNfVEFCKHRhYikpOwogI2lmICFHVEtfQ0hF Q0tfVkVSU0lPTigzLCA5OCwgMCkKLSAgICBpZiAoZ3RrX3dpZGdldF9nZXRfdmlzaWJsZShHVEtf V0lER0VUKHRhYi0+c2VhcmNoQmFyKSkpCisgICAgaWYgKGJyb3dzZXJfc2VhcmNoX2Jhcl9pc19v cGVuKHRhYi0+c2VhcmNoQmFyKSkKICAgICAgICAgYnJvd3Nlcl9zZWFyY2hfYmFyX2Nsb3NlKHRh Yi0+c2VhcmNoQmFyKTsKICNlbmRpZgogfQo=