188549 2018-08-14 05:28:09 -0700 [GTK] Minibrowser: Add labels for buttons 2018-08-14 05:40:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tpopela tpopela bugs-noreply cgarcia oldest_to_newest 1449906 0 tpopela 2018-08-14 05:28:09 -0700 So they are accessible easier (through i.e. while testing WebKitGTK+ through Minibrowser in Dogtail). 1449907 1 347067 tpopela 2018-08-14 05:30:37 -0700 Created attachment 347067 Patch 1449911 2 347067 tpopela 2018-08-14 05:40:29 -0700 Comment on attachment 347067 Patch Clearing flags on attachment: 347067 Committed r234844: <https://trac.webkit.org/changeset/234844> 1449912 3 tpopela 2018-08-14 05:40:33 -0700 All reviewed patches have been landed. Closing bug. 347067 2018-08-14 05:30:37 -0700 2018-08-14 05:40:29 -0700 Patch bug-188549-20180814143036.patch text/plain 12978 tpopela U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWEwMGI0MzM2ODdlNzAxM2QwY2ZkNTRhMTc2MjhjNzI2 Y2M5MzI0NS4uZjRhNzU1YTExNzM0YzljZDI5OGMwOTY4MTFiN2I0OGYwN2E4YjY2NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA4LTE0ICBUb21hcyBQb3BlbGEgIDx0cG9wZWxhQHJlZGhhdC5jb20+CisKKyAg ICAgICAgW0dUS10gTWluaWJyb3dzZXI6IEFkZCBsYWJlbHMgZm9yIGJ1dHRvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODU0OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvIHRoZXkgYXJlIGFjY2Vz c2libGUgZWFzaWVyIChpLmUuIHdoaWxlIHRlc3RpbmcgV2ViS2l0R1RLKyB0aHJvdWdoIE1pbmli cm93c2VyIGluIERvZ3RhaWwpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJX aW5kb3cuYzoKKyAgICAgICAgKHdlYlZpZXdJc0xvYWRpbmdDaGFuZ2VkKToKKyAgICAgICAgKGJy b3dzZXJXaW5kb3dTZXR1cEVkaXRvclRvb2xiYXIpOgorICAgICAgICAoYnJvd3Nlcl93aW5kb3df aW5pdCk6CisKIDIwMTgtMDgtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBXZWJEcml2ZXIgdGVzdHMgYWZ0ZXIg cjIzNDgzOS4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IGVjZTM5YzFi M2M0M2NiMjI1ZGZmZWE0ODVmNDFhYmEwZDkxYzk0YWEuLjM2YjMwNjU3YzlhMTczMTgzMzRhNTcz N2YxOGExMzJlNThiYmY4ZTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93 c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpA QCAtNDkxLDYgKzQ5MSw3IEBAIHN0YXRpYyB2b2lkIGZhdmljb25DaGFuZ2VkKFdlYktpdFdlYlZp ZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMgKnBhcmFtU3BlYywgQnJvd3NlCiBzdGF0aWMgdm9pZCB3 ZWJWaWV3SXNMb2FkaW5nQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVj ICpwYXJhbVNwZWMsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBnYm9vbGVhbiBpc0xv YWRpbmcgPSB3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KTsKKyAgICBndGtfdG9v bF9idXR0b25fc2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTih3aW5kb3ctPnJlbG9hZE9yU3RvcEJ1 dHRvbiksIGlzTG9hZGluZyA/ICJTdG9wIiA6ICJSZWxvYWQiKTsKICAgICBndGtfdG9vbF9idXR0 b25fc2V0X3N0b2NrX2lkKEdUS19UT09MX0JVVFRPTih3aW5kb3ctPnJlbG9hZE9yU3RvcEJ1dHRv biksIGlzTG9hZGluZyA/IEdUS19TVE9DS19TVE9QIDogR1RLX1NUT0NLX1JFRlJFU0gpOwogfQog CkBAIC03MTAsNiArNzExLDcgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1NldHVwRWRpdG9y VG9vbGJhcihCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgR3RrVG9vbEl0ZW0gKml0ZW0gPSBn dGtfdG9nZ2xlX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19CT0xEKTsKICAg ICB3aW5kb3ctPmJvbGRJdGVtID0gR1RLX1dJREdFVChpdGVtKTsKICAgICBndGtfd2lkZ2V0X3Nl dF9uYW1lKEdUS19XSURHRVQoaXRlbSksICJCb2xkIik7CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3Nl dF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJCb2xkIik7CiAgICAgZ19zaWduYWxfY29u bmVjdChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5k Q2FsbGJhY2spLCB3aW5kb3cpOwogICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0 b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0p KTsKQEAgLTcxNyw2ICs3MTksNyBAQCBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93U2V0dXBFZGl0 b3JUb29sYmFyKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICBpdGVtID0gZ3RrX3RvZ2dsZV90 b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfSVRBTElDKTsKICAgICB3aW5kb3ct Pml0YWxpY0l0ZW0gPSBHVEtfV0lER0VUKGl0ZW0pOwogICAgIGd0a193aWRnZXRfc2V0X25hbWUo R1RLX1dJREdFVChpdGVtKSwgIkl0YWxpYyIpOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFi ZWwoR1RLX1RPT0xfQlVUVE9OKGl0ZW0pLCAiSXRhbGljIik7CiAgICAgZ19zaWduYWxfY29ubmVj dChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2Fs bGJhY2spLCB3aW5kb3cpOwogICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29s YmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsK QEAgLTcyNCwxMiArNzI3LDE0IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXR1cEVkaXRv clRvb2xiYXIoQnJvd3NlcldpbmRvdyAqd2luZG93KQogICAgIGl0ZW0gPSBndGtfdG9nZ2xlX3Rv b2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19VTkRFUkxJTkUpOwogICAgIHdpbmRv dy0+dW5kZXJsaW5lSXRlbSA9IEdUS19XSURHRVQoaXRlbSk7CiAgICAgZ3RrX3dpZGdldF9zZXRf bmFtZShHVEtfV0lER0VUKGl0ZW0pLCAiVW5kZXJsaW5lIik7CisgICAgZ3RrX3Rvb2xfYnV0dG9u X3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJVbmRlcmxpbmUiKTsKICAgICBnX3Np Z25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9nZ2xlZCIsIEdfQ0FMTEJBQ0soZWRpdGlu Z0NvbW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19U T09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURH RVQoaXRlbSkpOwogCiAgICAgaXRlbSA9IGd0a190b2dnbGVfdG9vbF9idXR0b25fbmV3X2Zyb21f c3RvY2soR1RLX1NUT0NLX1NUUklLRVRIUk9VR0gpOwogICAgIGd0a193aWRnZXRfc2V0X25hbWUo R1RLX1dJREdFVChpdGVtKSwgIlN0cmlrZXRocm91Z2giKTsKKyAgICBndGtfdG9vbF9idXR0b25f c2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTihpdGVtKSwgIlN0cmlrZXRocm91Z2giKTsKICAgICB3 aW5kb3ctPnN0cmlrZXRocm91Z2hJdGVtID0gR1RLX1dJREdFVChpdGVtKTsKICAgICBnX3NpZ25h bF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9nZ2xlZCIsIEdfQ0FMTEJBQ0soZWRpdGluZ0Nv bW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09M QkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CkBAIC03NDEsMTggKzc0NiwyMSBAQCBzdGF0aWMgdm9p ZCBicm93c2VyV2luZG93U2V0dXBFZGl0b3JUb29sYmFyKEJyb3dzZXJXaW5kb3cgKndpbmRvdykK IAogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NLX0NV VCk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCBXRUJLSVRfRURJ VElOR19DT01NQU5EX0NVVCk7CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9P TF9CVVRUT04oaXRlbSksIFdFQktJVF9FRElUSU5HX0NPTU1BTkRfQ1VUKTsKICAgICBnX3NpZ25h bF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0soZWRpdGluZ0Nv bW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09M QkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQo aXRlbSkpOwogCiAgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtf U1RPQ0tfQ09QWSk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCBX RUJLSVRfRURJVElOR19DT01NQU5EX0NPUFkpOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFi ZWwoR1RLX1RPT0xfQlVUVE9OKGl0ZW0pLCBXRUJLSVRfRURJVElOR19DT01NQU5EX0NPUFkpOwog ICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFD SyhlZGl0aW5nQ29tbWFuZENhbGxiYWNrKSwgd2luZG93KTsKICAgICBndGtfdG9vbGJhcl9pbnNl cnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBndGtfd2lkZ2V0X3Nob3co R1RLX1dJREdFVChpdGVtKSk7CiAKICAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9t X3N0b2NrKEdUS19TVE9DS19QQVNURSk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lE R0VUKGl0ZW0pLCBXRUJLSVRfRURJVElOR19DT01NQU5EX1BBU1RFKTsKKyAgICBndGtfdG9vbF9i dXR0b25fc2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTihpdGVtKSwgV0VCS0lUX0VESVRJTkdfQ09N TUFORF9QQVNURSk7CiAgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNsaWNr ZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwogICAgIGd0 a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0 a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKQEAgLTc2MywxMiArNzcxLDE0IEBAIHN0 YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXR1cEVkaXRvclRvb2xiYXIoQnJvd3NlcldpbmRvdyAq d2luZG93KQogCiAgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtf U1RPQ0tfVU5ETyk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCBX RUJLSVRfRURJVElOR19DT01NQU5EX1VORE8pOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFi ZWwoR1RLX1RPT0xfQlVUVE9OKGl0ZW0pLCBXRUJLSVRfRURJVElOR19DT01NQU5EX1VORE8pOwog ICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFD SyhlZGl0aW5nQ29tbWFuZENhbGxiYWNrKSwgd2luZG93KTsKICAgICBndGtfdG9vbGJhcl9pbnNl cnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBndGtfd2lkZ2V0X3Nob3co R1RLX1dJREdFVChpdGVtKSk7CiAKICAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9t X3N0b2NrKEdUS19TVE9DS19SRURPKTsKICAgICBndGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURH RVQoaXRlbSksIFdFQktJVF9FRElUSU5HX0NPTU1BTkRfUkVETyk7CisgICAgZ3RrX3Rvb2xfYnV0 dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksIFdFQktJVF9FRElUSU5HX0NPTU1B TkRfUkVETyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNsaWNrZWQi LCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwogICAgIGd0a190 b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193 aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKQEAgLTc4MCw2ICs3OTAsNyBAQCBzdGF0aWMg dm9pZCBicm93c2VyV2luZG93U2V0dXBFZGl0b3JUb29sYmFyKEJyb3dzZXJXaW5kb3cgKndpbmRv dykKICAgICBpdGVtID0gZ3RrX3JhZGlvX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKE5VTEws IEdUS19TVE9DS19KVVNUSUZZX0xFRlQpOwogICAgIEdTTGlzdCAqanVzdGlmeVJhZGlvR3JvdXAg PSBndGtfcmFkaW9fdG9vbF9idXR0b25fZ2V0X2dyb3VwKEdUS19SQURJT19UT09MX0JVVFRPTihp dGVtKSk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZShHVEtfV0lER0VUKGl0ZW0pLCAiSnVzdGlm eUxlZnQiKTsKKyAgICBndGtfdG9vbF9idXR0b25fc2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTihp dGVtKSwgIkp1c3RpZnkgTGVmdCIpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRl bSksICJ0b2dnbGVkIiwgR19DQUxMQkFDSyhlZGl0aW5nQ29tbWFuZENhbGxiYWNrKSwgd2luZG93 KTsKICAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0x KTsKICAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChpdGVtKSk7CkBAIC03ODcsMTIgKzc5 OCwxNCBAQCBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93U2V0dXBFZGl0b3JUb29sYmFyKEJyb3dz ZXJXaW5kb3cgKndpbmRvdykKICAgICBpdGVtID0gZ3RrX3JhZGlvX3Rvb2xfYnV0dG9uX25ld19m cm9tX3N0b2NrKGp1c3RpZnlSYWRpb0dyb3VwLCBHVEtfU1RPQ0tfSlVTVElGWV9DRU5URVIpOwog ICAgIGp1c3RpZnlSYWRpb0dyb3VwID0gZ3RrX3JhZGlvX3Rvb2xfYnV0dG9uX2dldF9ncm91cChH VEtfUkFESU9fVE9PTF9CVVRUT04oaXRlbSkpOwogICAgIGd0a193aWRnZXRfc2V0X25hbWUoR1RL X1dJREdFVChpdGVtKSwgIkp1c3RpZnlDZW50ZXIiKTsKKyAgICBndGtfdG9vbF9idXR0b25fc2V0 X2xhYmVsKEdUS19UT09MX0JVVFRPTihpdGVtKSwgIkp1c3RpZnkgQ2VudGVyIik7CiAgICAgZ19z aWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgInRvZ2dsZWQiLCBHX0NBTExCQUNLKGVkaXRp bmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwogICAgIGd0a190b29sYmFyX2luc2VydChHVEtf VE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lE R0VUKGl0ZW0pKTsKIAogICAgIGl0ZW0gPSBndGtfcmFkaW9fdG9vbF9idXR0b25fbmV3X2Zyb21f c3RvY2soanVzdGlmeVJhZGlvR3JvdXAsIEdUS19TVE9DS19KVVNUSUZZX1JJR0hUKTsKICAgICBn dGtfd2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksICJKdXN0aWZ5UmlnaHQiKTsKKyAg ICBndGtfdG9vbF9idXR0b25fc2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTihpdGVtKSwgIkp1c3Rp ZnkgUmlnaHQiKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAidG9nZ2xl ZCIsIEdfQ0FMTEJBQ0soZWRpdGluZ0NvbW1hbmRDYWxsYmFjayksIHdpbmRvdyk7CiAgICAgZ3Rr X3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAgZ3Rr X3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOwpAQCAtODAzLDEyICs4MTYsMTQgQEAgc3Rh dGljIHZvaWQgYnJvd3NlcldpbmRvd1NldHVwRWRpdG9yVG9vbGJhcihCcm93c2VyV2luZG93ICp3 aW5kb3cpCiAKICAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19T VE9DS19JTkRFTlQpOwogICAgIGd0a193aWRnZXRfc2V0X25hbWUoR1RLX1dJREdFVChpdGVtKSwg IkluZGVudCIpOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFiZWwoR1RLX1RPT0xfQlVUVE9O KGl0ZW0pLCAiSW5kZW50Iik7CiAgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwg ImNsaWNrZWQiLCBHX0NBTExCQUNLKGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwog ICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwog ICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKIAogICAgIGl0ZW0gPSBndGtf dG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NLX1VOSU5ERU5UKTsKICAgICBndGtf d2lkZ2V0X3NldF9uYW1lKEdUS19XSURHRVQoaXRlbSksICJPdXRkZW50Iik7CisgICAgZ3RrX3Rv b2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJPdXRkZW50Iik7CiAg ICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNL KGVkaXRpbmdDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwogICAgIGd0a190b29sYmFyX2luc2Vy dChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hvdyhH VEtfV0lER0VUKGl0ZW0pKTsKQEAgLTgxOSwxMiArODM0LDE0IEBAIHN0YXRpYyB2b2lkIGJyb3dz ZXJXaW5kb3dTZXR1cEVkaXRvclRvb2xiYXIoQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiAgICAg aXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXcoTlVMTCwgTlVMTCk7CiAgICAgZ3RrX3Rvb2xfYnV0 dG9uX3NldF9pY29uX25hbWUoR1RLX1RPT0xfQlVUVE9OKGl0ZW0pLCAiaW5zZXJ0LWltYWdlIik7 CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJJ bnNlcnQgSW1hZ2UiKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAiY2xp Y2tlZCIsIEdfQ0FMTEJBQ0soaW5zZXJ0SW1hZ2VDb21tYW5kQ2FsbGJhY2spLCB3aW5kb3cpOwog ICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwog ICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0pKTsKIAogICAgIGl0ZW0gPSBndGtf dG9vbF9idXR0b25fbmV3KE5VTEwsIE5VTEwpOwogICAgIGd0a190b29sX2J1dHRvbl9zZXRfaWNv bl9uYW1lKEdUS19UT09MX0JVVFRPTihpdGVtKSwgImluc2VydC1saW5rIik7CisgICAgZ3RrX3Rv b2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJJbnNlcnQgTGluayIp OwogICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QoaXRlbSksICJjbGlja2VkIiwgR19DQUxM QkFDSyhpbnNlcnRMaW5rQ29tbWFuZENhbGxiYWNrKSwgd2luZG93KTsKICAgICBndGtfdG9vbGJh cl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBndGtfd2lkZ2V0 X3Nob3coR1RLX1dJREdFVChpdGVtKSk7CkBAIC05NzYsNiArOTkzLDcgQEAgc3RhdGljIHZvaWQg YnJvd3Nlcl93aW5kb3dfaW5pdChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgd2luZG93LT5i YWNrSXRlbSA9IEdUS19XSURHRVQoaXRlbSk7CiAgICAgZ3RrX21lbnVfdG9vbF9idXR0b25fc2V0 X21lbnUoR1RLX01FTlVfVE9PTF9CVVRUT04oaXRlbSksIDApOwogICAgIGdfc2lnbmFsX2Nvbm5l Y3Rfc3dhcHBlZChpdGVtLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0soZ29CYWNrQ2FsbGJhY2spLCAo Z3BvaW50ZXIpd2luZG93KTsKKyAgICBndGtfdG9vbF9idXR0b25fc2V0X2xhYmVsKEdUS19UT09M X0JVVFRPTihpdGVtKSwgIkJhY2siKTsKICAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xC QVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChp dGVtKSk7CiAKQEAgLTk4Myw0MCArMTAwMSw0NyBAQCBzdGF0aWMgdm9pZCBicm93c2VyX3dpbmRv d19pbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICB3aW5kb3ctPmZvcndhcmRJdGVtID0g R1RLX1dJREdFVChpdGVtKTsKICAgICBndGtfbWVudV90b29sX2J1dHRvbl9zZXRfbWVudShHVEtf TUVOVV9UT09MX0JVVFRPTihpdGVtKSwgMCk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVk KEdfT0JKRUNUKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0soZ29Gb3J3YXJkQ2FsbGJhY2sp LCAoZ3BvaW50ZXIpd2luZG93KTsKKyAgICBndGtfdG9vbF9idXR0b25fc2V0X2xhYmVsKEdUS19U T09MX0JVVFRPTihpdGVtKSwgIkZvcndhcmQiKTsKICAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RL X1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJ REdFVChpdGVtKSk7CiAKICAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2Nr KEdUS19TVE9DS19QUkVGRVJFTkNFUyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKEdf T0JKRUNUKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDYWxsYmFjayksIHdp bmRvdyk7CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRl bSksICJQcmVmZXJlbmNlcyIpOwogICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9PTEJBUih0 b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKGl0ZW0p KTsKIAogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2soR1RLX1NUT0NL X1pPT01fT1VUKTsKICAgICB3aW5kb3ctPnpvb21PdXRJdGVtID0gR1RLX1dJREdFVChpdGVtKTsK ICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoaXRlbSwgImNsaWNrZWQiLCBHX0NBTExCQUNL KHpvb21PdXRDYWxsYmFjayksIHdpbmRvdyk7CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9sYWJl bChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJab29tIE91dCIpOwogICAgIGd0a190b29sYmFyX2lu c2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfc2hv dyhHVEtfV0lER0VUKGl0ZW0pKTsKIAogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zy b21fc3RvY2soR1RLX1NUT0NLX1pPT01fSU4pOwogICAgIHdpbmRvdy0+em9vbUluSXRlbSA9IEdU S19XSURHRVQoaXRlbSk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKGl0ZW0sICJjbGlj a2VkIiwgR19DQUxMQkFDSyh6b29tSW5DYWxsYmFjayksIHdpbmRvdyk7CisgICAgZ3RrX3Rvb2xf YnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04oaXRlbSksICJab29tIEluIik7CiAgICAg Z3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAg Z3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOwogCiAgICAgaXRlbSA9IGd0a190b29s X2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfRklORCk7CiAgICAgZ19zaWduYWxfY29u bmVjdF9zd2FwcGVkKGl0ZW0sICJjbGlja2VkIiwgR19DQUxMQkFDSyhzZWFyY2hDYWxsYmFjayks IHdpbmRvdyk7CisgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9sYWJlbChHVEtfVE9PTF9CVVRUT04o aXRlbSksICJGaW5kIik7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xi YXIpLCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9hZGRfYWNjZWxlcmF0b3IoR1RLX1dJREdF VChpdGVtKSwgImNsaWNrZWQiLCB3aW5kb3ctPmFjY2VsR3JvdXAsIEdES19LRVlfRiwgR0RLX0NP TlRST0xfTUFTSywgR1RLX0FDQ0VMX1ZJU0lCTEUpOwogICAgIGd0a193aWRnZXRfc2hvdyhHVEtf V0lER0VUKGl0ZW0pKTsKIAogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3Rv Y2soR1RLX1NUT0NLX0hPTUUpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChpdGVtLCAi Y2xpY2tlZCIsIEdfQ0FMTEJBQ0sobG9hZEhvbWVQYWdlKSwgd2luZG93KTsKKyAgICBndGtfdG9v bF9idXR0b25fc2V0X2xhYmVsKEdUS19UT09MX0JVVFRPTihpdGVtKSwgIkhvbWUiKTsKICAgICBn dGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKICAgICBn dGtfd2lkZ2V0X2FkZF9hY2NlbGVyYXRvcihHVEtfV0lER0VUKGl0ZW0pLCAiY2xpY2tlZCIsIHdp bmRvdy0+YWNjZWxHcm91cCwgR0RLX0tFWV9Ib21lLCBHREtfTU9EMV9NQVNLLCBHVEtfQUNDRUxf VklTSUJMRSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOwogCiAgICAg aXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXcoZ3RrX2ltYWdlX25ld19mcm9tX2ljb25fbmFtZSgi dGFiLW5ldyIsIEdUS19JQ09OX1NJWkVfU01BTExfVE9PTEJBUiksIE5VTEwpOwogICAgIGdfc2ln bmFsX2Nvbm5lY3Rfc3dhcHBlZChpdGVtLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0sobmV3VGFiQ2Fs bGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFiZWwoR1RLX1RPT0xf QlVUVE9OKGl0ZW0pLCAiTmV3IFRhYiIpOwogICAgIGd0a190b29sYmFyX2luc2VydChHVEtfVE9P TEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOwogICAgIGd0a193aWRnZXRfYWRkX2FjY2VsZXJhdG9y KEdUS19XSURHRVQoaXRlbSksICJjbGlja2VkIiwgd2luZG93LT5hY2NlbEdyb3VwLCBHREtfS0VZ X1QsIEdES19DT05UUk9MX01BU0ssIEdUS19BQ0NFTF9WSVNJQkxFKTsKICAgICBndGtfd2lkZ2V0 X3Nob3dfYWxsKEdUS19XSURHRVQoaXRlbSkpOwpAQCAtMTAzMSw2ICsxMDU2LDcgQEAgc3RhdGlj IHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5pdChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgaXRl bSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfUkVGUkVTSCk7CiAg ICAgd2luZG93LT5yZWxvYWRPclN0b3BCdXR0b24gPSBHVEtfV0lER0VUKGl0ZW0pOwogICAgIGdf c2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChpdGVtLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0socmVsb2Fk T3JTdG9wQ2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sX2J1dHRvbl9zZXRfbGFiZWwo R1RLX1RPT0xfQlVUVE9OKGl0ZW0pLCAiUmVsb2FkIik7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0 KEdUS19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9hZGRfYWNj ZWxlcmF0b3Iod2luZG93LT5yZWxvYWRPclN0b3BCdXR0b24sICJjbGlja2VkIiwgd2luZG93LT5h Y2NlbEdyb3VwLCBHREtfS0VZX0Y1LCAwLCBHVEtfQUNDRUxfVklTSUJMRSk7CiAgICAgZ3RrX3dp ZGdldF9zaG93KHdpbmRvdy0+cmVsb2FkT3JTdG9wQnV0dG9uKTsK