211186 2020-04-29 09:03:40 -0700 [GTK4] Bring back the URI entry to MiniBrowser 2020-04-30 05:10:25 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 csaavedra csaavedra bugs-noreply cgarcia oldest_to_newest 1647008 0 csaavedra 2020-04-29 09:03:40 -0700 [GTK4] Bring back the URI entry to MiniBrowser 1647011 1 397965 csaavedra 2020-04-29 09:05:06 -0700 Created attachment 397965 Patch 1647313 2 397965 cgarcia 2020-04-30 02:59:32 -0700 Comment on attachment 397965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397965&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:523 > + GBytes *bytes = g_bytes_new_static(cairo_image_surface_get_data(surface), stride*height); stride*height -> stride * height I'm afraid we need to copy the data here, the favicon is owned by the web view and will be deleted on navigation. 1647324 3 398047 csaavedra 2020-04-30 04:16:08 -0700 Created attachment 398047 Patch 1647327 4 398047 cgarcia 2020-04-30 04:31:18 -0700 Comment on attachment 398047 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398047&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:117 > +#if GTK_CHECK_VERSION(3, 98, 0) > + gtk_editable_get_text(GTK_EDITABLE(window->uriEntry)) > +#else > + gtk_entry_get_text(GTK_ENTRY(window->uriEntry)) > +#endif Indentation is wrong here. 1647330 5 398048 csaavedra 2020-04-30 04:44:44 -0700 Created attachment 398048 Patch for landing 1647331 6 ews-feeder 2020-04-30 05:10:24 -0700 Committed r260942: <https://trac.webkit.org/changeset/260942> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398048. 397965 2020-04-29 09:05:06 -0700 2020-04-30 04:16:05 -0700 Patch bug-211186-20200429190505.patch text/plain 7078 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwODk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTU0OWY2OTc1ZTNhNTI1MjM3ZDVjYzVkYzJkNDIyOTE0 ZjMyYWM1Ni4uMzA3NmY4OTM1YmQxYWRlZWUwYmEzZWE2ZjI2NTVjYTBkNjA1MjJiOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIwLTA0LTI5ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUSzRdIEJyaW5nIGJhY2sgdGhlIFVSSSBlbnRyeSB0byBNaW5pQnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTg2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR1RLNCBz dXBwb3J0IGZvciB0aGUgVVJJIGVudHJ5IGFkZGVkLCB1c2luZyBhIEd0a0NlbnRlckJveAorICAg ICAgICB0byBzdGFydCBsYXlvdXRpbmcgYSBtb2Rlcm4gdmVyc2lvbiBvZiB0aGUgdG9vbGJhci4K KworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChh Y3RpdmF0ZVVyaUVudHJ5Q2FsbGJhY2spOgorICAgICAgICAod2ViVmlld1VSSUNoYW5nZWQpOgor ICAgICAgICAodXBkYXRlVXJpRW50cnlJY29uKToKKyAgICAgICAgKGZhdmljb25DaGFuZ2VkKToK KyAgICAgICAgKGluc2VydExpbmtDb21tYW5kQ2FsbGJhY2spOgorICAgICAgICAoYnJvd3Nlcl93 aW5kb3dfaW5pdCk6CisKIDIwMjAtMDQtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBHVEs0IGJ1aWxkIGFmdGVy IHIyNjA4OTEKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IDI0Y2FiYWFm NDQ4YzU4YmVkMjFkMDhiYTVhMDViOGFlN2RkZDg3OTcuLmVjZTlkNTEwMjIzYWYzMzUxNjRjYzM2 ZmQxZjNkM2UyYzIyNDczZjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93 c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpA QCAtNjMsNyArNjMsMTEgQEAgc3RydWN0IF9Ccm93c2VyV2luZG93IHsKICAgICBHdGtXaWRnZXQg KmRvd25sb2Fkc0JhcjsKICAgICBnYm9vbGVhbiBzZWFyY2hCYXJWaXNpYmxlOwogICAgIGdib29s ZWFuIGZ1bGxTY3JlZW5Jc0VuYWJsZWQ7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDAp CisgICAgR2RrVGV4dHVyZSAqZmF2aWNvbjsKKyNlbHNlCiAgICAgR2RrUGl4YnVmICpmYXZpY29u OworI2VuZGlmCiAgICAgR3RrV2lkZ2V0ICpyZWxvYWRPclN0b3BCdXR0b247CiAgICAgR3RrV2lu ZG93ICpwYXJlbnRXaW5kb3c7CiAgICAgZ3VpbnQgcmVzZXRFbnRyeVByb2dyZXNzVGltZW91dElk OwpAQCAtMTAzLDEyICsxMDcsMTggQEAgc3RhdGljIHZvaWQgcmVzZXRTdGF0dXNUZXh0KEd0a1dp ZGdldCAqd2lkZ2V0LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgYnJvd3NlcldpbmRvd1Nl dFN0YXR1c1RleHQod2luZG93LCBOVUxMKTsKIH0KIAotI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigz LCA5OCwgMCkKIHN0YXRpYyB2b2lkIGFjdGl2YXRlVXJpRW50cnlDYWxsYmFjayhCcm93c2VyV2lu ZG93ICp3aW5kb3cpCiB7Ci0gICAgYnJvd3Nlcl93aW5kb3dfbG9hZF91cmkod2luZG93LCBndGtf ZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpKSk7CisgICAgYnJvd3Nl cl93aW5kb3dfbG9hZF91cmkod2luZG93LAorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAw KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd0a19lZGl0YWJsZV9nZXRfdGV4dChHVEtf RURJVEFCTEUod2luZG93LT51cmlFbnRyeSkpCisjZWxzZQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGd0a19lbnRyeV9nZXRfdGV4dChHVEtfRU5UUlkod2luZG93LT51cmlFbnRyeSkpCisj ZW5kaWYKKyAgICAgICAgKTsKIH0KIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkK IHN0YXRpYyB2b2lkIHJlbG9hZE9yU3RvcENhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykK IHsKICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gYnJvd3Nlcl90YWJfZ2V0X3dlYl92aWV3 KHdpbmRvdy0+YWN0aXZlVGFiKTsKQEAgLTE0NywxNCArMTU3LDEzIEBAIHN0YXRpYyB2b2lkIHNl dHRpbmdzQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJW aWV3VVJJQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywg QnJvd3NlcldpbmRvdyAqd2luZG93KQogewotI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwg MCkKICAgICBjaGFyICpleHRlcm5hbFVSSSA9IGdldEV4dGVybmFsVVJJKHdlYmtpdF93ZWJfdmll d19nZXRfdXJpKHdlYlZpZXcpKTsKLSAgICBpZiAoZXh0ZXJuYWxVUkkpIHsKLSAgICAgICAgZ3Rr X2VudHJ5X3NldF90ZXh0KEdUS19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KSwgZXh0ZXJuYWxVUkkp OwotICAgICAgICBnX2ZyZWUoZXh0ZXJuYWxVUkkpOwotICAgIH0gZWxzZQotICAgICAgICBndGtf ZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCAiIik7CisjaWYgR1RL X0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgZ3RrX2VkaXRhYmxlX3NldF90ZXh0KEdUS19F RElUQUJMRSh3aW5kb3ctPnVyaUVudHJ5KSwgZXh0ZXJuYWxVUkkgPyBleHRlcm5hbFVSSSA6ICIi KTsKKyNlbHNlCisgICAgZ3RrX2VudHJ5X3NldF90ZXh0KEdUS19FTlRSWSh3aW5kb3ctPnVyaUVu dHJ5KSwgZXh0ZXJuYWxVUkkgPyBleHRlcm5hbFVSSSA6ICIiKTsKICNlbmRpZgorICAgIGdfZnJl ZShleHRlcm5hbFVSSSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYlZpZXdUaXRsZUNoYW5nZWQoV2Vi S2l0V2ViVmlldyAqd2ViVmlldywgR1BhcmFtU3BlYyAqcHNwZWMsIEJyb3dzZXJXaW5kb3cgKndp bmRvdykKQEAgLTQ4NiwyNCArNDk1LDM3IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdab29tTGV2ZWxD aGFuZ2VkKEdPYmplY3QgKm9iamVjdCwgR1BhcmFtU3BlYyAqcGFyYW1TcGVjLCBCcm93CiAKIHN0 YXRpYyB2b2lkIHVwZGF0ZVVyaUVudHJ5SWNvbihCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7Ci0j aWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogICAgIEd0a0VudHJ5ICplbnRyeSA9IEdU S19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KTsKICAgICBpZiAod2luZG93LT5mYXZpY29uKQorI2lm IEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQorICAgICAgICBndGtfZW50cnlfc2V0X2ljb25f ZnJvbV9wYWludGFibGUoZW50cnksIEdUS19FTlRSWV9JQ09OX1BSSU1BUlksIEdES19QQUlOVEFC TEUod2luZG93LT5mYXZpY29uKSk7CisjZWxzZQogICAgICAgICBndGtfZW50cnlfc2V0X2ljb25f ZnJvbV9waXhidWYoZW50cnksIEdUS19FTlRSWV9JQ09OX1BSSU1BUlksIHdpbmRvdy0+ZmF2aWNv bik7CisjZW5kaWYKICAgICBlbHNlCiAgICAgICAgIGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX2lj b25fbmFtZShlbnRyeSwgR1RLX0VOVFJZX0lDT05fUFJJTUFSWSwgImRvY3VtZW50LW5ldyIpOwot I2VuZGlmCiB9CiAKIHN0YXRpYyB2b2lkIGZhdmljb25DaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndl YlZpZXcsIEdQYXJhbVNwZWMgKnBhcmFtU3BlYywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogewor I2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQorICAgIEdka1RleHR1cmUgKmZhdmljb24g PSBOVUxMOworI2Vsc2UKICAgICBHZGtQaXhidWYgKmZhdmljb24gPSBOVUxMOworI2VuZGlmCiAg ICAgY2Fpcm9fc3VyZmFjZV90ICpzdXJmYWNlID0gd2Via2l0X3dlYl92aWV3X2dldF9mYXZpY29u KHdlYlZpZXcpOwogCiAgICAgaWYgKHN1cmZhY2UpIHsKICAgICAgICAgaW50IHdpZHRoID0gY2Fp cm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGgoc3VyZmFjZSk7CiAgICAgICAgIGludCBoZWlnaHQg PSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQoc3VyZmFjZSk7CisjaWYgR1RLX0NIRUNL X1ZFUlNJT04oMywgOTgsIDApCisgICAgICAgIGludCBzdHJpZGUgPSBjYWlyb19pbWFnZV9zdXJm YWNlX2dldF9zdHJpZGUoc3VyZmFjZSk7CisgICAgICAgIEdCeXRlcyAqYnl0ZXMgPSBnX2J5dGVz X25ld19zdGF0aWMoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfZGF0YShzdXJmYWNlKSwgc3RyaWRl KmhlaWdodCk7CisgICAgICAgIGZhdmljb24gPSBnZGtfbWVtb3J5X3RleHR1cmVfbmV3KHdpZHRo LCBoZWlnaHQsIEdES19NRU1PUllfREVGQVVMVCwgYnl0ZXMsIHN0cmlkZSk7CisgICAgICAgIGdf Ynl0ZXNfdW5yZWYoYnl0ZXMpOworI2Vsc2UKICAgICAgICAgZmF2aWNvbiA9IGdka19waXhidWZf Z2V0X2Zyb21fc3VyZmFjZShzdXJmYWNlLCAwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKyNlbmRpZgog ICAgIH0KIAogICAgIGlmICh3aW5kb3ctPmZhdmljb24pCkBAIC02ODQsNyArNzA2LDExIEBAIHN0 YXRpYyB2b2lkIGluc2VydExpbmtDb21tYW5kQ2FsbGJhY2soR3RrV2lkZ2V0ICp3aWRnZXQsIEJy b3dzZXJXaW5kb3cgKndpbmRvdykKICAgICBndGtfd2lkZ2V0X3Nob3coZW50cnkpOwogCiAgICAg aWYgKGd0a19kaWFsb2dfcnVuKEdUS19ESUFMT0coZGlhbG9nKSkgPT0gR1RLX1JFU1BPTlNFX0FD Q0VQVCkgeworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQorICAgICAgICBjb25zdCBj aGFyICp1cmwgPSBndGtfZWRpdGFibGVfZ2V0X3RleHQoR1RLX0VESVRBQkxFKGVudHJ5KSk7Cisj ZWxzZQogICAgICAgICBjb25zdCBjaGFyICp1cmwgPSBndGtfZW50cnlfZ2V0X3RleHQoR1RLX0VO VFJZKGVudHJ5KSk7CisjZW5kaWYKICAgICAgICAgaWYgKHVybCAmJiAqdXJsKSB7CiAgICAgICAg ICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gYnJvd3Nlcl90YWJfZ2V0X3dlYl92aWV3KHdp bmRvdy0+YWN0aXZlVGFiKTsKICAgICAgICAgICAgIHdlYmtpdF93ZWJfdmlld19leGVjdXRlX2Vk aXRpbmdfY29tbWFuZF93aXRoX2FyZ3VtZW50KHdlYlZpZXcsIFdFQktJVF9FRElUSU5HX0NPTU1B TkRfQ1JFQVRFX0xJTkssIHVybCk7CkBAIC05NDUsMTIgKzk3MSwxMiBAQCBzdGF0aWMgdm9pZCBi cm93c2VyX3dpbmRvd19pbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICBndGtfd2luZG93 X3NldF90aXRsZShHVEtfV0lORE9XKHdpbmRvdyksIGRlZmF1bHRXaW5kb3dUaXRsZSk7CiAgICAg Z3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKEdUS19XSU5ET1cod2luZG93KSwgODAwLCA2MDAp OwogCi0jaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogICAgIHdpbmRvdy0+dXJpRW50 cnkgPSBndGtfZW50cnlfbmV3KCk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKHdpbmRv dy0+dXJpRW50cnksICJhY3RpdmF0ZSIsIEdfQ0FMTEJBQ0soYWN0aXZhdGVVcmlFbnRyeUNhbGxi YWNrKSwgKGdwb2ludGVyKXdpbmRvdyk7CiAgICAgZ3RrX2VudHJ5X3NldF9pY29uX2FjdGl2YXRh YmxlKEdUS19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KSwgR1RLX0VOVFJZX0lDT05fUFJJTUFSWSwg RkFMU0UpOwogICAgIHVwZGF0ZVVyaUVudHJ5SWNvbih3aW5kb3cpOwogCisjaWYgIUdUS19DSEVD S19WRVJTSU9OKDMsIDk4LCAwKQogICAgIC8qIEtleWJvYXJkIGFjY2VsZXJhdG9ycyAqLwogICAg IHdpbmRvdy0+YWNjZWxHcm91cCA9IGd0a19hY2NlbF9ncm91cF9uZXcoKTsKICAgICBndGtfd2lu ZG93X2FkZF9hY2NlbF9ncm91cChHVEtfV0lORE9XKHdpbmRvdyksIHdpbmRvdy0+YWNjZWxHcm91 cCk7CkBAIC0xMDE3LDYgKzEwNDMsMTQgQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5p dChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX2FjY2VsX2dyb3VwX2Nvbm5lY3Qod2lu ZG93LT5hY2NlbEdyb3VwLCBHREtfS0VZX1AsIEdES19DT05UUk9MX01BU0ssIEdUS19BQ0NFTF9W SVNJQkxFLAogICAgICAgICBnX2NjbG9zdXJlX25ld19zd2FwKEdfQ0FMTEJBQ0socHJpbnRQYWdl KSwgd2luZG93LCBOVUxMKSk7CiAKKyNlbmRpZgorCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywg OTgsIDApCisgICAgR3RrV2lkZ2V0ICp0b29sYmFyID0gZ3RrX2NlbnRlcl9ib3hfbmV3KCk7Cisg ICAgd2luZG93LT50b29sYmFyID0gdG9vbGJhcjsKKyAgICBndGtfd2lkZ2V0X3NldF9oZXhwYW5k KHdpbmRvdy0+dXJpRW50cnksIFRSVUUpOworICAgIGd0a19jZW50ZXJfYm94X3NldF9jZW50ZXJf d2lkZ2V0KEdUS19DRU5URVJfQk9YKHRvb2xiYXIpLCB3aW5kb3ctPnVyaUVudHJ5KTsKKyNlbHNl CiAgICAgR3RrV2lkZ2V0ICp0b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3KCk7CiAgICAgd2luZG93 LT50b29sYmFyID0gdG9vbGJhcjsKICAgICBndGtfb3JpZW50YWJsZV9zZXRfb3JpZW50YXRpb24o R1RLX09SSUVOVEFCTEUodG9vbGJhciksIEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMKTsKQEAg LTEwNTQsNyArMTA4OCw5IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2luZG93X2luaXQoQnJvd3Nl cldpbmRvdyAqd2luZG93KQogI2VuZGlmCiAgICAgR3RrV2lkZ2V0ICp2Ym94ID0gZ3RrX2JveF9u ZXcoR1RLX09SSUVOVEFUSU9OX1ZFUlRJQ0FMLCAwKTsKICAgICB3aW5kb3ctPm1haW5Cb3ggPSB2 Ym94OwotI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigzLCA5OCwgMCkKKyAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKHZib3gp LCB0b29sYmFyKTsKKyNlbHNlCiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1godmJveCks IHRvb2xiYXIsIEZBTFNFLCBGQUxTRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KHRvb2xiYXIp OwogI2VuZGlmCg== 398047 2020-04-30 04:16:08 -0700 2020-04-30 04:44:41 -0700 Patch bug-211186-20200430141607.patch text/plain 7093 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQ1ZWZjNThjOGMwN2IyNzQ5NzE3ZDU1YzI1YjJhM2Zh YjJkZGE1ZC4uNDcxYjc3YmNiYWM3Njg5MDRhNWZkNTk4MDFlYWY2YmI1MDc0NjVkNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIwLTA0LTI5ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUSzRdIEJyaW5nIGJhY2sgdGhlIFVSSSBlbnRyeSB0byBNaW5pQnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTg2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR1RLNCBz dXBwb3J0IGZvciB0aGUgVVJJIGVudHJ5IGFkZGVkLCB1c2luZyBhIEd0a0NlbnRlckJveAorICAg ICAgICB0byBzdGFydCBsYXlvdXRpbmcgYSBtb2Rlcm4gdmVyc2lvbiBvZiB0aGUgdG9vbGJhci4K KworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChh Y3RpdmF0ZVVyaUVudHJ5Q2FsbGJhY2spOgorICAgICAgICAod2ViVmlld1VSSUNoYW5nZWQpOgor ICAgICAgICAodXBkYXRlVXJpRW50cnlJY29uKToKKyAgICAgICAgKGZhdmljb25DaGFuZ2VkKToK KyAgICAgICAgKGluc2VydExpbmtDb21tYW5kQ2FsbGJhY2spOgorICAgICAgICAoYnJvd3Nlcl93 aW5kb3dfaW5pdCk6CisKIDIwMjAtMDQtMjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgbGF5b3V0IHRlc3RzIGFmdGVyIHVwZGF0 ZXMgdG8gSW4tQXBwIEJyb3dzZXIgUHJpdmFjeQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dz ZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmMKaW5kZXggMjRjYWJhYWY0NDhjNThiZWQyMWQwOGJhNWEwNWI4YWU3ZGRkODc5Ny4uZWRj MzE5ZGE1NGFmZGZhZDJiYzhkODM2ZDdkMTIyNDU3YzkwMTVhZCAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCkBAIC02Myw3ICs2MywxMSBAQCBzdHJ1Y3QgX0Jyb3dzZXJXaW5k b3cgewogICAgIEd0a1dpZGdldCAqZG93bmxvYWRzQmFyOwogICAgIGdib29sZWFuIHNlYXJjaEJh clZpc2libGU7CiAgICAgZ2Jvb2xlYW4gZnVsbFNjcmVlbklzRW5hYmxlZDsKKyNpZiBHVEtfQ0hF Q0tfVkVSU0lPTigzLCA5OCwgMCkKKyAgICBHZGtUZXh0dXJlICpmYXZpY29uOworI2Vsc2UKICAg ICBHZGtQaXhidWYgKmZhdmljb247CisjZW5kaWYKICAgICBHdGtXaWRnZXQgKnJlbG9hZE9yU3Rv cEJ1dHRvbjsKICAgICBHdGtXaW5kb3cgKnBhcmVudFdpbmRvdzsKICAgICBndWludCByZXNldEVu dHJ5UHJvZ3Jlc3NUaW1lb3V0SWQ7CkBAIC0xMDMsMTIgKzEwNywxOCBAQCBzdGF0aWMgdm9pZCBy ZXNldFN0YXR1c1RleHQoR3RrV2lkZ2V0ICp3aWRnZXQsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykK ICAgICBicm93c2VyV2luZG93U2V0U3RhdHVzVGV4dCh3aW5kb3csIE5VTEwpOwogfQogCi0jaWYg IUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogc3RhdGljIHZvaWQgYWN0aXZhdGVVcmlFbnRy eUNhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKLSAgICBicm93c2VyX3dpbmRvd19s b2FkX3VyaSh3aW5kb3csIGd0a19lbnRyeV9nZXRfdGV4dChHVEtfRU5UUlkod2luZG93LT51cmlF bnRyeSkpKTsKKyAgICBicm93c2VyX3dpbmRvd19sb2FkX3VyaSh3aW5kb3csCisjaWYgR1RLX0NI RUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3RrX2Vk aXRhYmxlX2dldF90ZXh0KEdUS19FRElUQUJMRSh3aW5kb3ctPnVyaUVudHJ5KSkKKyNlbHNlCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWSh3 aW5kb3ctPnVyaUVudHJ5KSkKKyNlbmRpZgorICAgICAgICApOwogfQogCisjaWYgIUdUS19DSEVD S19WRVJTSU9OKDMsIDk4LCAwKQogc3RhdGljIHZvaWQgcmVsb2FkT3JTdG9wQ2FsbGJhY2soQnJv d3NlcldpbmRvdyAqd2luZG93KQogewogICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXcgPSBicm93 c2VyX3RhYl9nZXRfd2ViX3ZpZXcod2luZG93LT5hY3RpdmVUYWIpOwpAQCAtMTQ3LDE0ICsxNTcs MTMgQEAgc3RhdGljIHZvaWQgc2V0dGluZ3NDYWxsYmFjayhCcm93c2VyV2luZG93ICp3aW5kb3cp CiAKIHN0YXRpYyB2b2lkIHdlYlZpZXdVUklDaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcs IEdQYXJhbVNwZWMgKnBzcGVjLCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7Ci0jaWYgIUdUS19D SEVDS19WRVJTSU9OKDMsIDk4LCAwKQogICAgIGNoYXIgKmV4dGVybmFsVVJJID0gZ2V0RXh0ZXJu YWxVUkkod2Via2l0X3dlYl92aWV3X2dldF91cmkod2ViVmlldykpOwotICAgIGlmIChleHRlcm5h bFVSSSkgewotICAgICAgICBndGtfZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJp RW50cnkpLCBleHRlcm5hbFVSSSk7Ci0gICAgICAgIGdfZnJlZShleHRlcm5hbFVSSSk7Ci0gICAg fSBlbHNlCi0gICAgICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5UUlkod2luZG93LT51cmlF bnRyeSksICIiKTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyAgICBndGtfZWRp dGFibGVfc2V0X3RleHQoR1RLX0VESVRBQkxFKHdpbmRvdy0+dXJpRW50cnkpLCBleHRlcm5hbFVS SSA/IGV4dGVybmFsVVJJIDogIiIpOworI2Vsc2UKKyAgICBndGtfZW50cnlfc2V0X3RleHQoR1RL X0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCBleHRlcm5hbFVSSSA/IGV4dGVybmFsVVJJIDogIiIp OwogI2VuZGlmCisgICAgZ19mcmVlKGV4dGVybmFsVVJJKTsKIH0KIAogc3RhdGljIHZvaWQgd2Vi Vmlld1RpdGxlQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3Bl YywgQnJvd3NlcldpbmRvdyAqd2luZG93KQpAQCAtNDg2LDI0ICs0OTUsMzcgQEAgc3RhdGljIHZv aWQgd2ViVmlld1pvb21MZXZlbENoYW5nZWQoR09iamVjdCAqb2JqZWN0LCBHUGFyYW1TcGVjICpw YXJhbVNwZWMsIEJyb3cKIAogc3RhdGljIHZvaWQgdXBkYXRlVXJpRW50cnlJY29uKEJyb3dzZXJX aW5kb3cgKndpbmRvdykKIHsKLSNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCiAgICAg R3RrRW50cnkgKmVudHJ5ID0gR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpOwogICAgIGlmICh3 aW5kb3ctPmZhdmljb24pCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgICAg IGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX3BhaW50YWJsZShlbnRyeSwgR1RLX0VOVFJZX0lDT05f UFJJTUFSWSwgR0RLX1BBSU5UQUJMRSh3aW5kb3ctPmZhdmljb24pKTsKKyNlbHNlCiAgICAgICAg IGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX3BpeGJ1ZihlbnRyeSwgR1RLX0VOVFJZX0lDT05fUFJJ TUFSWSwgd2luZG93LT5mYXZpY29uKTsKKyNlbmRpZgogICAgIGVsc2UKICAgICAgICAgZ3RrX2Vu dHJ5X3NldF9pY29uX2Zyb21faWNvbl9uYW1lKGVudHJ5LCBHVEtfRU5UUllfSUNPTl9QUklNQVJZ LCAiZG9jdW1lbnQtbmV3Iik7Ci0jZW5kaWYKIH0KIAogc3RhdGljIHZvaWQgZmF2aWNvbkNoYW5n ZWQoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgR1BhcmFtU3BlYyAqcGFyYW1TcGVjLCBCcm93c2Vy V2luZG93ICp3aW5kb3cpCiB7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAg R2RrVGV4dHVyZSAqZmF2aWNvbiA9IE5VTEw7CisjZWxzZQogICAgIEdka1BpeGJ1ZiAqZmF2aWNv biA9IE5VTEw7CisjZW5kaWYKICAgICBjYWlyb19zdXJmYWNlX3QgKnN1cmZhY2UgPSB3ZWJraXRf d2ViX3ZpZXdfZ2V0X2Zhdmljb24od2ViVmlldyk7CiAKICAgICBpZiAoc3VyZmFjZSkgewogICAg ICAgICBpbnQgd2lkdGggPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF93aWR0aChzdXJmYWNlKTsK ICAgICAgICAgaW50IGhlaWdodCA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChzdXJm YWNlKTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyAgICAgICAgaW50IHN0cmlk ZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3N0cmlkZShzdXJmYWNlKTsKKyAgICAgICAgR0J5 dGVzICpieXRlcyA9IGdfYnl0ZXNfbmV3KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEoc3Vy ZmFjZSksIHN0cmlkZSAqIGhlaWdodCk7CisgICAgICAgIGZhdmljb24gPSBnZGtfbWVtb3J5X3Rl eHR1cmVfbmV3KHdpZHRoLCBoZWlnaHQsIEdES19NRU1PUllfREVGQVVMVCwgYnl0ZXMsIHN0cmlk ZSk7CisgICAgICAgIGdfYnl0ZXNfdW5yZWYoYnl0ZXMpOworI2Vsc2UKICAgICAgICAgZmF2aWNv biA9IGdka19waXhidWZfZ2V0X2Zyb21fc3VyZmFjZShzdXJmYWNlLCAwLCAwLCB3aWR0aCwgaGVp Z2h0KTsKKyNlbmRpZgogICAgIH0KIAogICAgIGlmICh3aW5kb3ctPmZhdmljb24pCkBAIC02ODQs NyArNzA2LDExIEBAIHN0YXRpYyB2b2lkIGluc2VydExpbmtDb21tYW5kQ2FsbGJhY2soR3RrV2lk Z2V0ICp3aWRnZXQsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICBndGtfd2lkZ2V0X3Nob3co ZW50cnkpOwogCiAgICAgaWYgKGd0a19kaWFsb2dfcnVuKEdUS19ESUFMT0coZGlhbG9nKSkgPT0g R1RLX1JFU1BPTlNFX0FDQ0VQVCkgeworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQor ICAgICAgICBjb25zdCBjaGFyICp1cmwgPSBndGtfZWRpdGFibGVfZ2V0X3RleHQoR1RLX0VESVRB QkxFKGVudHJ5KSk7CisjZWxzZQogICAgICAgICBjb25zdCBjaGFyICp1cmwgPSBndGtfZW50cnlf Z2V0X3RleHQoR1RLX0VOVFJZKGVudHJ5KSk7CisjZW5kaWYKICAgICAgICAgaWYgKHVybCAmJiAq dXJsKSB7CiAgICAgICAgICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gYnJvd3Nlcl90YWJf Z2V0X3dlYl92aWV3KHdpbmRvdy0+YWN0aXZlVGFiKTsKICAgICAgICAgICAgIHdlYmtpdF93ZWJf dmlld19leGVjdXRlX2VkaXRpbmdfY29tbWFuZF93aXRoX2FyZ3VtZW50KHdlYlZpZXcsIFdFQktJ VF9FRElUSU5HX0NPTU1BTkRfQ1JFQVRFX0xJTkssIHVybCk7CkBAIC05NDUsMTIgKzk3MSwxMiBA QCBzdGF0aWMgdm9pZCBicm93c2VyX3dpbmRvd19pbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykK ICAgICBndGtfd2luZG93X3NldF90aXRsZShHVEtfV0lORE9XKHdpbmRvdyksIGRlZmF1bHRXaW5k b3dUaXRsZSk7CiAgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplKEdUS19XSU5ET1cod2lu ZG93KSwgODAwLCA2MDApOwogCi0jaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogICAg IHdpbmRvdy0+dXJpRW50cnkgPSBndGtfZW50cnlfbmV3KCk7CiAgICAgZ19zaWduYWxfY29ubmVj dF9zd2FwcGVkKHdpbmRvdy0+dXJpRW50cnksICJhY3RpdmF0ZSIsIEdfQ0FMTEJBQ0soYWN0aXZh dGVVcmlFbnRyeUNhbGxiYWNrKSwgKGdwb2ludGVyKXdpbmRvdyk7CiAgICAgZ3RrX2VudHJ5X3Nl dF9pY29uX2FjdGl2YXRhYmxlKEdUS19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KSwgR1RLX0VOVFJZ X0lDT05fUFJJTUFSWSwgRkFMU0UpOwogICAgIHVwZGF0ZVVyaUVudHJ5SWNvbih3aW5kb3cpOwog CisjaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogICAgIC8qIEtleWJvYXJkIGFjY2Vs ZXJhdG9ycyAqLwogICAgIHdpbmRvdy0+YWNjZWxHcm91cCA9IGd0a19hY2NlbF9ncm91cF9uZXco KTsKICAgICBndGtfd2luZG93X2FkZF9hY2NlbF9ncm91cChHVEtfV0lORE9XKHdpbmRvdyksIHdp bmRvdy0+YWNjZWxHcm91cCk7CkBAIC0xMDE3LDYgKzEwNDMsMTQgQEAgc3RhdGljIHZvaWQgYnJv d3Nlcl93aW5kb3dfaW5pdChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX2FjY2VsX2dy b3VwX2Nvbm5lY3Qod2luZG93LT5hY2NlbEdyb3VwLCBHREtfS0VZX1AsIEdES19DT05UUk9MX01B U0ssIEdUS19BQ0NFTF9WSVNJQkxFLAogICAgICAgICBnX2NjbG9zdXJlX25ld19zd2FwKEdfQ0FM TEJBQ0socHJpbnRQYWdlKSwgd2luZG93LCBOVUxMKSk7CiAKKyNlbmRpZgorCisjaWYgR1RLX0NI RUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgR3RrV2lkZ2V0ICp0b29sYmFyID0gZ3RrX2NlbnRl cl9ib3hfbmV3KCk7CisgICAgd2luZG93LT50b29sYmFyID0gdG9vbGJhcjsKKyAgICBndGtfd2lk Z2V0X3NldF9oZXhwYW5kKHdpbmRvdy0+dXJpRW50cnksIFRSVUUpOworICAgIGd0a19jZW50ZXJf Ym94X3NldF9jZW50ZXJfd2lkZ2V0KEdUS19DRU5URVJfQk9YKHRvb2xiYXIpLCB3aW5kb3ctPnVy aUVudHJ5KTsKKyNlbHNlCiAgICAgR3RrV2lkZ2V0ICp0b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3 KCk7CiAgICAgd2luZG93LT50b29sYmFyID0gdG9vbGJhcjsKICAgICBndGtfb3JpZW50YWJsZV9z ZXRfb3JpZW50YXRpb24oR1RLX09SSUVOVEFCTEUodG9vbGJhciksIEdUS19PUklFTlRBVElPTl9I T1JJWk9OVEFMKTsKQEAgLTEwNTQsNyArMTA4OCw5IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2lu ZG93X2luaXQoQnJvd3NlcldpbmRvdyAqd2luZG93KQogI2VuZGlmCiAgICAgR3RrV2lkZ2V0ICp2 Ym94ID0gZ3RrX2JveF9uZXcoR1RLX09SSUVOVEFUSU9OX1ZFUlRJQ0FMLCAwKTsKICAgICB3aW5k b3ctPm1haW5Cb3ggPSB2Ym94OwotI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyNp ZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyAgICBndGtfY29udGFpbmVyX2FkZChHVEtf Q09OVEFJTkVSKHZib3gpLCB0b29sYmFyKTsKKyNlbHNlCiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0 KEdUS19CT1godmJveCksIHRvb2xiYXIsIEZBTFNFLCBGQUxTRSwgMCk7CiAgICAgZ3RrX3dpZGdl dF9zaG93KHRvb2xiYXIpOwogI2VuZGlmCg== 398048 2020-04-30 04:44:44 -0700 2020-04-30 05:10:24 -0700 Patch for landing bug-211186-20200430144443.patch text/plain 7055 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQ1ZWZjNThjOGMwN2IyNzQ5NzE3ZDU1YzI1YjJhM2Zh YjJkZGE1ZC4uYWQ3Y2Y3NTZmMjM1MDlmZTVmYWI3MzZmNWRmYWNlMThjZGU0NmRhMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIwLTA0LTI5ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUSzRdIEJyaW5nIGJhY2sgdGhlIFVSSSBlbnRyeSB0byBNaW5pQnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTg2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3MuCisKKyAgICAgICAg R1RLNCBzdXBwb3J0IGZvciB0aGUgVVJJIGVudHJ5IGFkZGVkLCB1c2luZyBhIEd0a0NlbnRlckJv eAorICAgICAgICB0byBzdGFydCBsYXlvdXRpbmcgYSBtb2Rlcm4gdmVyc2lvbiBvZiB0aGUgdG9v bGJhci4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAg ICAgIChhY3RpdmF0ZVVyaUVudHJ5Q2FsbGJhY2spOgorICAgICAgICAod2ViVmlld1VSSUNoYW5n ZWQpOgorICAgICAgICAodXBkYXRlVXJpRW50cnlJY29uKToKKyAgICAgICAgKGZhdmljb25DaGFu Z2VkKToKKyAgICAgICAgKGluc2VydExpbmtDb21tYW5kQ2FsbGJhY2spOgorICAgICAgICAoYnJv d3Nlcl93aW5kb3dfaW5pdCk6CisKIDIwMjAtMDQtMjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5l X2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgbGF5b3V0IHRlc3RzIGFmdGVy IHVwZGF0ZXMgdG8gSW4tQXBwIEJyb3dzZXIgUHJpdmFjeQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93 c2VyV2luZG93LmMKaW5kZXggMjRjYWJhYWY0NDhjNThiZWQyMWQwOGJhNWEwNWI4YWU3ZGRkODc5 Ny4uMGViMTM2ZDA3OWM5YjQyZGVkNWQ3MWUyOGM4NmQxMTA3NDZhODU1NSAxMDA2NDQKLS0tIGEv VG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJv d3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC02Myw3ICs2MywxMSBAQCBzdHJ1Y3QgX0Jyb3dz ZXJXaW5kb3cgewogICAgIEd0a1dpZGdldCAqZG93bmxvYWRzQmFyOwogICAgIGdib29sZWFuIHNl YXJjaEJhclZpc2libGU7CiAgICAgZ2Jvb2xlYW4gZnVsbFNjcmVlbklzRW5hYmxlZDsKKyNpZiBH VEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKKyAgICBHZGtUZXh0dXJlICpmYXZpY29uOworI2Vs c2UKICAgICBHZGtQaXhidWYgKmZhdmljb247CisjZW5kaWYKICAgICBHdGtXaWRnZXQgKnJlbG9h ZE9yU3RvcEJ1dHRvbjsKICAgICBHdGtXaW5kb3cgKnBhcmVudFdpbmRvdzsKICAgICBndWludCBy ZXNldEVudHJ5UHJvZ3Jlc3NUaW1lb3V0SWQ7CkBAIC0xMDMsMTIgKzEwNywxOCBAQCBzdGF0aWMg dm9pZCByZXNldFN0YXR1c1RleHQoR3RrV2lkZ2V0ICp3aWRnZXQsIEJyb3dzZXJXaW5kb3cgKndp bmRvdykKICAgICBicm93c2VyV2luZG93U2V0U3RhdHVzVGV4dCh3aW5kb3csIE5VTEwpOwogfQog Ci0jaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQogc3RhdGljIHZvaWQgYWN0aXZhdGVV cmlFbnRyeUNhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKLSAgICBicm93c2VyX3dp bmRvd19sb2FkX3VyaSh3aW5kb3csIGd0a19lbnRyeV9nZXRfdGV4dChHVEtfRU5UUlkod2luZG93 LT51cmlFbnRyeSkpKTsKKyAgICBicm93c2VyX3dpbmRvd19sb2FkX3VyaSh3aW5kb3csCisjaWYg R1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgICAgIGd0a19lZGl0YWJsZV9nZXRfdGV4 dChHVEtfRURJVEFCTEUod2luZG93LT51cmlFbnRyeSkpCisjZWxzZQorICAgICAgICBndGtfZW50 cnlfZ2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpKQorI2VuZGlmCisgICAgKTsK IH0KIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKIHN0YXRpYyB2b2lkIHJlbG9h ZE9yU3RvcENhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBXZWJLaXRXZWJW aWV3ICp3ZWJWaWV3ID0gYnJvd3Nlcl90YWJfZ2V0X3dlYl92aWV3KHdpbmRvdy0+YWN0aXZlVGFi KTsKQEAgLTE0NywxNCArMTU3LDEzIEBAIHN0YXRpYyB2b2lkIHNldHRpbmdzQ2FsbGJhY2soQnJv d3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJWaWV3VVJJQ2hhbmdlZChXZWJL aXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywgQnJvd3NlcldpbmRvdyAqd2lu ZG93KQogewotI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKICAgICBjaGFyICpleHRl cm5hbFVSSSA9IGdldEV4dGVybmFsVVJJKHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcp KTsKLSAgICBpZiAoZXh0ZXJuYWxVUkkpIHsKLSAgICAgICAgZ3RrX2VudHJ5X3NldF90ZXh0KEdU S19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KSwgZXh0ZXJuYWxVUkkpOwotICAgICAgICBnX2ZyZWUo ZXh0ZXJuYWxVUkkpOwotICAgIH0gZWxzZQotICAgICAgICBndGtfZW50cnlfc2V0X3RleHQoR1RL X0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCAiIik7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywg OTgsIDApCisgICAgZ3RrX2VkaXRhYmxlX3NldF90ZXh0KEdUS19FRElUQUJMRSh3aW5kb3ctPnVy aUVudHJ5KSwgZXh0ZXJuYWxVUkkgPyBleHRlcm5hbFVSSSA6ICIiKTsKKyNlbHNlCisgICAgZ3Rr X2VudHJ5X3NldF90ZXh0KEdUS19FTlRSWSh3aW5kb3ctPnVyaUVudHJ5KSwgZXh0ZXJuYWxVUkkg PyBleHRlcm5hbFVSSSA6ICIiKTsKICNlbmRpZgorICAgIGdfZnJlZShleHRlcm5hbFVSSSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHdlYlZpZXdUaXRsZUNoYW5nZWQoV2ViS2l0V2ViVmlldyAqd2ViVmll dywgR1BhcmFtU3BlYyAqcHNwZWMsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKQEAgLTQ4NiwyNCAr NDk1LDM3IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdab29tTGV2ZWxDaGFuZ2VkKEdPYmplY3QgKm9i amVjdCwgR1BhcmFtU3BlYyAqcGFyYW1TcGVjLCBCcm93CiAKIHN0YXRpYyB2b2lkIHVwZGF0ZVVy aUVudHJ5SWNvbihCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7Ci0jaWYgIUdUS19DSEVDS19WRVJT SU9OKDMsIDk4LCAwKQogICAgIEd0a0VudHJ5ICplbnRyeSA9IEdUS19FTlRSWSh3aW5kb3ctPnVy aUVudHJ5KTsKICAgICBpZiAod2luZG93LT5mYXZpY29uKQorI2lmIEdUS19DSEVDS19WRVJTSU9O KDMsIDk4LCAwKQorICAgICAgICBndGtfZW50cnlfc2V0X2ljb25fZnJvbV9wYWludGFibGUoZW50 cnksIEdUS19FTlRSWV9JQ09OX1BSSU1BUlksIEdES19QQUlOVEFCTEUod2luZG93LT5mYXZpY29u KSk7CisjZWxzZQogICAgICAgICBndGtfZW50cnlfc2V0X2ljb25fZnJvbV9waXhidWYoZW50cnks IEdUS19FTlRSWV9JQ09OX1BSSU1BUlksIHdpbmRvdy0+ZmF2aWNvbik7CisjZW5kaWYKICAgICBl bHNlCiAgICAgICAgIGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX2ljb25fbmFtZShlbnRyeSwgR1RL X0VOVFJZX0lDT05fUFJJTUFSWSwgImRvY3VtZW50LW5ldyIpOwotI2VuZGlmCiB9CiAKIHN0YXRp YyB2b2lkIGZhdmljb25DaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMg KnBhcmFtU3BlYywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogeworI2lmIEdUS19DSEVDS19WRVJT SU9OKDMsIDk4LCAwKQorICAgIEdka1RleHR1cmUgKmZhdmljb24gPSBOVUxMOworI2Vsc2UKICAg ICBHZGtQaXhidWYgKmZhdmljb24gPSBOVUxMOworI2VuZGlmCiAgICAgY2Fpcm9fc3VyZmFjZV90 ICpzdXJmYWNlID0gd2Via2l0X3dlYl92aWV3X2dldF9mYXZpY29uKHdlYlZpZXcpOwogCiAgICAg aWYgKHN1cmZhY2UpIHsKICAgICAgICAgaW50IHdpZHRoID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9n ZXRfd2lkdGgoc3VyZmFjZSk7CiAgICAgICAgIGludCBoZWlnaHQgPSBjYWlyb19pbWFnZV9zdXJm YWNlX2dldF9oZWlnaHQoc3VyZmFjZSk7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDAp CisgICAgICAgIGludCBzdHJpZGUgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9zdHJpZGUoc3Vy ZmFjZSk7CisgICAgICAgIEdCeXRlcyAqYnl0ZXMgPSBnX2J5dGVzX25ldyhjYWlyb19pbWFnZV9z dXJmYWNlX2dldF9kYXRhKHN1cmZhY2UpLCBzdHJpZGUgKiBoZWlnaHQpOworICAgICAgICBmYXZp Y29uID0gZ2RrX21lbW9yeV90ZXh0dXJlX25ldyh3aWR0aCwgaGVpZ2h0LCBHREtfTUVNT1JZX0RF RkFVTFQsIGJ5dGVzLCBzdHJpZGUpOworICAgICAgICBnX2J5dGVzX3VucmVmKGJ5dGVzKTsKKyNl bHNlCiAgICAgICAgIGZhdmljb24gPSBnZGtfcGl4YnVmX2dldF9mcm9tX3N1cmZhY2Uoc3VyZmFj ZSwgMCwgMCwgd2lkdGgsIGhlaWdodCk7CisjZW5kaWYKICAgICB9CiAKICAgICBpZiAod2luZG93 LT5mYXZpY29uKQpAQCAtNjg0LDcgKzcwNiwxMSBAQCBzdGF0aWMgdm9pZCBpbnNlcnRMaW5rQ29t bWFuZENhbGxiYWNrKEd0a1dpZGdldCAqd2lkZ2V0LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiAg ICAgZ3RrX3dpZGdldF9zaG93KGVudHJ5KTsKIAogICAgIGlmIChndGtfZGlhbG9nX3J1bihHVEtf RElBTE9HKGRpYWxvZykpID09IEdUS19SRVNQT05TRV9BQ0NFUFQpIHsKKyNpZiBHVEtfQ0hFQ0tf VkVSU0lPTigzLCA5OCwgMCkKKyAgICAgICAgY29uc3QgY2hhciAqdXJsID0gZ3RrX2VkaXRhYmxl X2dldF90ZXh0KEdUS19FRElUQUJMRShlbnRyeSkpOworI2Vsc2UKICAgICAgICAgY29uc3QgY2hh ciAqdXJsID0gZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWShlbnRyeSkpOworI2VuZGlmCiAg ICAgICAgIGlmICh1cmwgJiYgKnVybCkgewogICAgICAgICAgICAgV2ViS2l0V2ViVmlldyAqd2Vi VmlldyA9IGJyb3dzZXJfdGFiX2dldF93ZWJfdmlldyh3aW5kb3ctPmFjdGl2ZVRhYik7CiAgICAg ICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfZXhlY3V0ZV9lZGl0aW5nX2NvbW1hbmRfd2l0aF9hcmd1 bWVudCh3ZWJWaWV3LCBXRUJLSVRfRURJVElOR19DT01NQU5EX0NSRUFURV9MSU5LLCB1cmwpOwpA QCAtOTQ1LDEyICs5NzEsMTIgQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5pdChCcm93 c2VyV2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX3dpbmRvd19zZXRfdGl0bGUoR1RLX1dJTkRPVyh3 aW5kb3cpLCBkZWZhdWx0V2luZG93VGl0bGUpOwogICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRf c2l6ZShHVEtfV0lORE9XKHdpbmRvdyksIDgwMCwgNjAwKTsKIAotI2lmICFHVEtfQ0hFQ0tfVkVS U0lPTigzLCA5OCwgMCkKICAgICB3aW5kb3ctPnVyaUVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOwog ICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZCh3aW5kb3ctPnVyaUVudHJ5LCAiYWN0aXZhdGUi LCBHX0NBTExCQUNLKGFjdGl2YXRlVXJpRW50cnlDYWxsYmFjayksIChncG9pbnRlcil3aW5kb3cp OwogICAgIGd0a19lbnRyeV9zZXRfaWNvbl9hY3RpdmF0YWJsZShHVEtfRU5UUlkod2luZG93LT51 cmlFbnRyeSksIEdUS19FTlRSWV9JQ09OX1BSSU1BUlksIEZBTFNFKTsKICAgICB1cGRhdGVVcmlF bnRyeUljb24od2luZG93KTsKIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKICAg ICAvKiBLZXlib2FyZCBhY2NlbGVyYXRvcnMgKi8KICAgICB3aW5kb3ctPmFjY2VsR3JvdXAgPSBn dGtfYWNjZWxfZ3JvdXBfbmV3KCk7CiAgICAgZ3RrX3dpbmRvd19hZGRfYWNjZWxfZ3JvdXAoR1RL X1dJTkRPVyh3aW5kb3cpLCB3aW5kb3ctPmFjY2VsR3JvdXApOwpAQCAtMTAxNyw2ICsxMDQzLDE0 IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2luZG93X2luaXQoQnJvd3NlcldpbmRvdyAqd2luZG93 KQogICAgIGd0a19hY2NlbF9ncm91cF9jb25uZWN0KHdpbmRvdy0+YWNjZWxHcm91cCwgR0RLX0tF WV9QLCBHREtfQ09OVFJPTF9NQVNLLCBHVEtfQUNDRUxfVklTSUJMRSwKICAgICAgICAgZ19jY2xv c3VyZV9uZXdfc3dhcChHX0NBTExCQUNLKHByaW50UGFnZSksIHdpbmRvdywgTlVMTCkpOwogCisj ZW5kaWYKKworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDk4LCAwKQorICAgIEd0a1dpZGdldCAq dG9vbGJhciA9IGd0a19jZW50ZXJfYm94X25ldygpOworICAgIHdpbmRvdy0+dG9vbGJhciA9IHRv b2xiYXI7CisgICAgZ3RrX3dpZGdldF9zZXRfaGV4cGFuZCh3aW5kb3ctPnVyaUVudHJ5LCBUUlVF KTsKKyAgICBndGtfY2VudGVyX2JveF9zZXRfY2VudGVyX3dpZGdldChHVEtfQ0VOVEVSX0JPWCh0 b29sYmFyKSwgd2luZG93LT51cmlFbnRyeSk7CisjZWxzZQogICAgIEd0a1dpZGdldCAqdG9vbGJh ciA9IGd0a190b29sYmFyX25ldygpOwogICAgIHdpbmRvdy0+dG9vbGJhciA9IHRvb2xiYXI7CiAg ICAgZ3RrX29yaWVudGFibGVfc2V0X29yaWVudGF0aW9uKEdUS19PUklFTlRBQkxFKHRvb2xiYXIp LCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CkBAIC0xMDU0LDcgKzEwODgsOSBAQCBzdGF0 aWMgdm9pZCBicm93c2VyX3dpbmRvd19pbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICNlbmRp ZgogICAgIEd0a1dpZGdldCAqdmJveCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9WRVJU SUNBTCwgMCk7CiAgICAgd2luZG93LT5tYWluQm94ID0gdmJveDsKLSNpZiAhR1RLX0NIRUNLX1ZF UlNJT04oMywgOTgsIDApCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgOTgsIDApCisgICAgZ3Rr X2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUih2Ym94KSwgdG9vbGJhcik7CisjZWxzZQogICAg IGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKHZib3gpLCB0b29sYmFyLCBGQUxTRSwgRkFMU0Us IDApOwogICAgIGd0a193aWRnZXRfc2hvdyh0b29sYmFyKTsKICNlbmRpZgo=