204618 2019-11-26 06:54:50 -0800 [GTK][WebInspector] Support for saving remote data 2019-12-18 04:49:11 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 202894 1 pnormand pnormand aperez bugs-noreply cgarcia oldest_to_newest 1593658 0 pnormand 2019-11-26 06:54:50 -0800 +++ This bug was initially created as a clone of Bug #202894 +++ Implementation of RemoteWebInspectorProxy::platformSave() is missing. 1593662 1 384351 pnormand 2019-11-26 06:59:35 -0800 Created attachment 384351 Patch 1593669 2 384351 cgarcia 2019-11-26 07:24:02 -0800 Comment on attachment 384351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384351&action=review > Source/WebKit/UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:127 > + data = out.data(); You can't do this, out is going to be freed after the if, so data will point to freed data. > Source/WebKit/UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:130 > + data = content.utf8().data(); More ore less the same here, because the CString returned by utf8() is a temporary. > Source/WebKit/UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:131 > + dataLength = content.utf8().length(); And we don't want to convert to utf8 twice either. > Source/WebKit/UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:137 > + if (g_file_set_contents(path.get(), data, dataLength, nullptr)) > + m_inspectorPage->process().send(Messages::RemoteWebInspectorUI::DidSave(path.get()), m_inspectorPage->webPageID()); You can use g_file_replace_contents_async(), instead of doing this synchronously. 1593670 3 pnormand 2019-11-26 07:27:11 -0800 I literally copied this from the non-remote implementation. 1593679 4 cgarcia 2019-11-26 08:25:12 -0800 (In reply to Philippe Normand from comment #3) > I literally copied this from the non-remote implementation. I missed it there, let's fix that first then. 1599754 5 385957 pnormand 2019-12-18 04:32:43 -0800 Created attachment 385957 Patch 1599758 6 pnormand 2019-12-18 04:49:11 -0800 Committed r253678: <https://trac.webkit.org/changeset/253678> 384351 2019-11-26 06:59:35 -0800 2019-12-18 04:32:39 -0800 Patch bug-204618-20191126145934.patch text/plain 3271 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhlNGQwODAyZDZjYTNlOGIw OGM3MDBhZWU4ZjFiZWNhODIxMzBlOWUuLjA2M2U1Nzk3MzJiMTRmZWEzNzg3ZDViZWRmYmUxZWNl YjkxYmI3ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMTEtMjYgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dlYkluc3Bl Y3Rvcl0gU3VwcG9ydCBmb3Igc2F2aW5nIHJlbW90ZSBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2MTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1pbGFybHkgdG8gd2hhdCBsYW5kZWQgYWxy ZWFkeSBpbiByMjUxMDY5LCB0aGUgUmVtb3RlCisgICAgICAgIFdlYkluc3BlY3RvciBHVEsgY2xp ZW50IGNhbiBub3cgc2F2ZSBkYXRhIGNvbWluZyBmcm9tIHRoZQorICAgICAgICBpbnNwZWN0b3Ig c2VydmVyLgorCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94 eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVdlYkluc3BlY3RvclByb3h5OjpwbGF0 Zm9ybVNhdmUpOgorCiAyMDE5LTExLTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKDIuMjcuMik6IFtHVEtdIEluY29nbml0 byBtb2RlIGlzIGJyb2tlbiB1bmRlciBmbGF0cGFrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCA0 Y2U4YTllMTBiOTY4ZDdmYzhhOWE4Yjk3YTJiMzEzNWM3MDczMjI3Li45NmZjM2FjNWE3ZWYzYWQ2 MGZjYWNlOTg3NDAyZDc2YzlkZTFiODMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKQEAgLTI4LDEx ICsyOCwxMyBAQAogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAKKyNpbmNsdWRlICJS ZW1vdGVXZWJJbnNwZWN0b3JVSU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViSW5zcGVjdG9yUHJv eHkuaCIKICNpbmNsdWRlICJXZWJLaXRJbnNwZWN0b3JXaW5kb3cuaCIKICNpbmNsdWRlICJXZWJL aXRXZWJWaWV3QmFzZVByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJQYWdlR3JvdXAuaCIKICNpbmNs dWRlIDxXZWJDb3JlL0NlcnRpZmljYXRlSW5mby5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0Jhc2U2 NC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAt OTksOCArMTAxLDQwIEBAIHZvaWQgUmVtb3RlV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQnJp bmdUb0Zyb250KCkKICAgICAgICAgZ3RrX3dpbmRvd19wcmVzZW50KEdUS19XSU5ET1cobV93aW5k b3cpKTsKIH0KIAotdm9pZCBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1TYXZlKGNv bnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGJvb2wsIGJvb2wpCit2b2lkIFJlbW90ZVdlYklu c3BlY3RvclByb3h5OjpwbGF0Zm9ybVNhdmUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgY29uc3Qg U3RyaW5nJiBjb250ZW50LCBib29sIGJhc2U2NEVuY29kZWQsIGJvb2wgZm9yY2VTYXZlRGlhbG9n KQogeworICAgIFVOVVNFRF9QQVJBTShmb3JjZVNhdmVEaWFsb2cpOworCisgICAgR1JlZlB0cjxH dGtGaWxlQ2hvb3Nlck5hdGl2ZT4gZGlhbG9nID0gYWRvcHRHUmVmKGd0a19maWxlX2Nob29zZXJf bmF0aXZlX25ldygiU2F2ZSBGaWxlIiwKKyAgICAgICAgR1RLX1dJTkRPVyhtX3dpbmRvdyksIEdU S19GSUxFX0NIT09TRVJfQUNUSU9OX1NBVkUsICJTYXZlIiwgIkNhbmNlbCIpKTsKKworICAgIEd0 a0ZpbGVDaG9vc2VyKiBjaG9vc2VyID0gR1RLX0ZJTEVfQ0hPT1NFUihkaWFsb2cuZ2V0KCkpOwor ICAgIGd0a19maWxlX2Nob29zZXJfc2V0X2RvX292ZXJ3cml0ZV9jb25maXJtYXRpb24oY2hvb3Nl ciwgVFJVRSk7CisgICAgZ3RrX2ZpbGVfY2hvb3Nlcl9zZXRfY3VycmVudF9uYW1lKGNob29zZXIs IGZpbGVuYW1lLnV0ZjgoKS5kYXRhKCkpOworCisgICAgaWYgKGd0a19uYXRpdmVfZGlhbG9nX3J1 bihHVEtfTkFUSVZFX0RJQUxPRyhkaWFsb2cuZ2V0KCkpKSAhPSBHVEtfUkVTUE9OU0VfQUNDRVBU KQorICAgICAgICByZXR1cm47CisKKyAgICBnc3NpemUgZGF0YUxlbmd0aCA9IDA7CisgICAgY29u c3QgY2hhciogZGF0YTsKKworICAgIGlmIChiYXNlNjRFbmNvZGVkKSB7CisgICAgICAgIFZlY3Rv cjxjaGFyPiBvdXQ7CisgICAgICAgIGlmICghYmFzZTY0RGVjb2RlKGNvbnRlbnQsIG91dCwgQmFz ZTY0VmFsaWRhdGVQYWRkaW5nKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBvdXQu c2hyaW5rVG9GaXQoKTsKKyAgICAgICAgZGF0YSA9IG91dC5kYXRhKCk7CisgICAgICAgIGRhdGFM ZW5ndGggPSBvdXQuc2l6ZSgpOworICAgIH0gZWxzZSB7CisgICAgICAgIGRhdGEgPSBjb250ZW50 LnV0ZjgoKS5kYXRhKCk7CisgICAgICAgIGRhdGFMZW5ndGggPSBjb250ZW50LnV0ZjgoKS5sZW5n dGgoKTsKKyAgICB9CisKKyAgICBHUmVmUHRyPEdGaWxlPiBmaWxlID0gYWRvcHRHUmVmKGd0a19m aWxlX2Nob29zZXJfZ2V0X2ZpbGUoY2hvb3NlcikpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gcGF0 aChnX2ZpbGVfZ2V0X3BhdGgoZmlsZS5nZXQoKSkpOworICAgIGlmIChnX2ZpbGVfc2V0X2NvbnRl bnRzKHBhdGguZ2V0KCksIGRhdGEsIGRhdGFMZW5ndGgsIG51bGxwdHIpKQorICAgICAgICBtX2lu c3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVXZWJJbnNwZWN0b3JV STo6RGlkU2F2ZShwYXRoLmdldCgpKSwgbV9pbnNwZWN0b3JQYWdlLT53ZWJQYWdlSUQoKSk7CiB9 CiAKIHZvaWQgUmVtb3RlV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQXBwZW5kKGNvbnN0IFN0 cmluZyYsIGNvbnN0IFN0cmluZyYpCg== 385957 2019-12-18 04:32:43 -0800 2019-12-18 04:36:37 -0800 Patch bug-204618-20191218123241.patch text/plain 6697 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZhMjgzZGVjM2QxZjJjMDZh MThmYmE5OTFhMWJhZjBkNWIzZTI2MTguLjQzNDVkM2M3Y2YwOWE4NmI3NDg3ODA1NmU0YjkzODk3 NGI1MzlkYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMTEtMjYgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dlYkluc3Bl Y3Rvcl0gU3VwcG9ydCBmb3Igc2F2aW5nIHJlbW90ZSBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2MTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1pbGFybHkgdG8gd2hhdCBsYW5kZWQgYWxy ZWFkeSBpbiByMjUxMDY5LCB0aGUgUmVtb3RlCisgICAgICAgIFdlYkluc3BlY3RvciBHVEsgY2xp ZW50IGNhbiBub3cgc2F2ZSBkYXRhIGNvbWluZyBmcm9tIHRoZQorICAgICAgICBpbnNwZWN0b3Ig c2VydmVyLgorCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94 eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVdlYkluc3BlY3RvclByb3h5OjpwbGF0 Zm9ybVNhdmUpOgorCiAyMDE5LTEyLTE3ICBKb29uZ2h1biBQYXJrICA8amg3MTgucGFya0BzYW1z dW5nLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBSZW1vdmUgdGhlIGJ1aWxkIHdhcm5pbmcg YmVsb3cgc2luY2UgcjI1MzQ1Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCmluZGV4IDRjZThhOWUxMGI5 NjhkN2ZjOGE5YThiOTdhMmIzMTM1YzcwNzMyMjcuLjExMDg4ZGQwOGIwNjAyZDJlOTRlODU3OTQ2 MDRhMjI2MjhjYjQyMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9S ZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvZ3RrL1JlbW90ZVdlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtMjgsMTEgKzI4LDEzIEBA CiAKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKIAorI2luY2x1ZGUgIlJlbW90ZVdlYklu c3BlY3RvclVJTWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJJbnNwZWN0b3JQcm94eS5oIgogI2lu Y2x1ZGUgIldlYktpdEluc3BlY3RvcldpbmRvdy5oIgogI2luY2x1ZGUgIldlYktpdFdlYlZpZXdC YXNlUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgPFdlYkNv cmUvQ2VydGlmaWNhdGVJbmZvLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0Lmg+CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC05OSw4ICsxMDEs NTIgQEAgdm9pZCBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1CcmluZ1RvRnJvbnQo KQogICAgICAgICBndGtfd2luZG93X3ByZXNlbnQoR1RLX1dJTkRPVyhtX3dpbmRvdykpOwogfQog Ci12b2lkIFJlbW90ZVdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybVNhdmUoY29uc3QgU3RyaW5n JiwgY29uc3QgU3RyaW5nJiwgYm9vbCwgYm9vbCkKK3N0YXRpYyB2b2lkIHJlbW90ZUZpbGVSZXBs YWNlQ29udGVudHNDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2VPYmplY3QsIEdBc3luY1Jlc3VsdCog cmVzdWx0LCBncG9pbnRlciB1c2VyRGF0YSkKIHsKKyAgICBHRmlsZSogZmlsZSA9IEdfRklMRShz b3VyY2VPYmplY3QpOworICAgIGlmICghZ19maWxlX3JlcGxhY2VfY29udGVudHNfZmluaXNoKGZp bGUsIHJlc3VsdCwgbnVsbHB0ciwgbnVsbHB0cikpCisgICAgICAgIHJldHVybjsKKworICAgIGF1 dG8qIHBhZ2UgPSBzdGF0aWNfY2FzdDxXZWJQYWdlUHJveHkqPih1c2VyRGF0YSk7CisgICAgR1Vu aXF1ZVB0cjxjaGFyPiBwYXRoKGdfZmlsZV9nZXRfcGF0aChmaWxlKSk7CisgICAgcGFnZS0+cHJv Y2VzcygpLnNlbmQoTWVzc2FnZXM6OlJlbW90ZVdlYkluc3BlY3RvclVJOjpEaWRTYXZlKHBhdGgu Z2V0KCkpLCBwYWdlLT53ZWJQYWdlSUQoKSk7Cit9CisKK3ZvaWQgUmVtb3RlV2ViSW5zcGVjdG9y UHJveHk6OnBsYXRmb3JtU2F2ZShjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZFVSTCwgY29uc3QgU3Ry aW5nJiBjb250ZW50LCBib29sIGJhc2U2NEVuY29kZWQsIGJvb2wgZm9yY2VTYXZlRGlhbG9nKQor eworICAgIFVOVVNFRF9QQVJBTShmb3JjZVNhdmVEaWFsb2cpOworCisgICAgR1JlZlB0cjxHdGtG aWxlQ2hvb3Nlck5hdGl2ZT4gZGlhbG9nID0gYWRvcHRHUmVmKGd0a19maWxlX2Nob29zZXJfbmF0 aXZlX25ldygiU2F2ZSBGaWxlIiwKKyAgICAgICAgR1RLX1dJTkRPVyhtX3dpbmRvdyksIEdUS19G SUxFX0NIT09TRVJfQUNUSU9OX1NBVkUsICJTYXZlIiwgIkNhbmNlbCIpKTsKKworICAgIEd0a0Zp bGVDaG9vc2VyKiBjaG9vc2VyID0gR1RLX0ZJTEVfQ0hPT1NFUihkaWFsb2cuZ2V0KCkpOworICAg IGd0a19maWxlX2Nob29zZXJfc2V0X2RvX292ZXJ3cml0ZV9jb25maXJtYXRpb24oY2hvb3Nlciwg VFJVRSk7CisKKyAgICAvLyBTb21lIGluc3BlY3RvciB2aWV3cyAoQXVkaXRzIGZvciBpbnN0YW5j ZSkgdXNlIGEgY3VzdG9tIFVSSSBzY2hlbWUsIHN1Y2gKKyAgICAvLyBhcyB3ZWItaW5zcGVjdG9y LiBTbyB3ZSBjYW4ndCByZWx5IG9uIHRoZSBVUkwgYmVpbmcgYSB2YWxpZCBmaWxlOi8vLyBVUkwK KyAgICAvLyB1bmZvcnR1bmF0ZWx5LgorICAgIFVSTCB1cmwoVVJMKCksIHN1Z2dlc3RlZFVSTCk7 CisgICAgLy8gU3RyaXAgbGVhZGluZyAvIGNoYXJhY3Rlci4KKyAgICBndGtfZmlsZV9jaG9vc2Vy X3NldF9jdXJyZW50X25hbWUoY2hvb3NlciwgdXJsLnBhdGgoKS5zdWJzdHJpbmcoMSkudXRmOCgp LmRhdGEoKSk7CisKKyAgICBpZiAoZ3RrX25hdGl2ZV9kaWFsb2dfcnVuKEdUS19OQVRJVkVfRElB TE9HKGRpYWxvZy5nZXQoKSkpICE9IEdUS19SRVNQT05TRV9BQ0NFUFQpCisgICAgICAgIHJldHVy bjsKKworICAgIFZlY3RvcjxjaGFyPiBkYXRhVmVjdG9yOworICAgIENTdHJpbmcgZGF0YVN0cmlu ZzsKKyAgICBpZiAoYmFzZTY0RW5jb2RlZCkgeworICAgICAgICBpZiAoIWJhc2U2NERlY29kZShj b250ZW50LCBkYXRhVmVjdG9yLCBCYXNlNjRWYWxpZGF0ZVBhZGRpbmcpKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICBkYXRhVmVjdG9yLnNocmlua1RvRml0KCk7CisgICAgfSBlbHNlCisg ICAgICAgIGRhdGFTdHJpbmcgPSBjb250ZW50LnV0ZjgoKTsKKworICAgIGNvbnN0IGNoYXIqIGRh dGEgPSAhZGF0YVN0cmluZy5pc051bGwoKSA/IGRhdGFTdHJpbmcuZGF0YSgpIDogZGF0YVZlY3Rv ci5kYXRhKCk7CisgICAgc2l6ZV90IGRhdGFMZW5ndGggPSAhZGF0YVN0cmluZy5pc051bGwoKSA/ IGRhdGFTdHJpbmcubGVuZ3RoKCkgOiBkYXRhVmVjdG9yLnNpemUoKTsKKyAgICBHUmVmUHRyPEdG aWxlPiBmaWxlID0gYWRvcHRHUmVmKGd0a19maWxlX2Nob29zZXJfZ2V0X2ZpbGUoY2hvb3Nlcikp OworICAgIEdVbmlxdWVQdHI8Y2hhcj4gcGF0aChnX2ZpbGVfZ2V0X3BhdGgoZmlsZS5nZXQoKSkp OworICAgIGdfZmlsZV9yZXBsYWNlX2NvbnRlbnRzX2FzeW5jKGZpbGUuZ2V0KCksIGRhdGEsIGRh dGFMZW5ndGgsIG51bGxwdHIsIGZhbHNlLAorICAgICAgICBHX0ZJTEVfQ1JFQVRFX1JFUExBQ0Vf REVTVElOQVRJT04sIG51bGxwdHIsIHJlbW90ZUZpbGVSZXBsYWNlQ29udGVudHNDYWxsYmFjaywg bV9pbnNwZWN0b3JQYWdlKTsKIH0KIAogdm9pZCBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eTo6cGxh dGZvcm1BcHBlbmQoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCmluZGV4IDZk NjhmMzA3N2E2MTRlZTcxNjAxNmY1OGY0OGJjMTFkODEyN2IwOGEuLjRmOGRlNDNiNDA1Mzk4MTBi MzRkZWZiZTg3ZDBlMWM4YzM4Yjg5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtNDYwLDcgKzQ2MCwxOCBAQCB2 b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybVN0YXJ0V2luZG93RHJhZygpCiAgICAgbm90 SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1TYXZl KGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgY29udGVudCwgYm9vbCBiYXNl NjRFbmNvZGVkLCBib29sIGZvcmNlU2F2ZURpYWxvZykKK3N0YXRpYyB2b2lkIGZpbGVSZXBsYWNl Q29udGVudHNDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2VPYmplY3QsIEdBc3luY1Jlc3VsdCogcmVz dWx0LCBncG9pbnRlciB1c2VyRGF0YSkKK3sKKyAgICBHRmlsZSogZmlsZSA9IEdfRklMRShzb3Vy Y2VPYmplY3QpOworICAgIGlmICghZ19maWxlX3JlcGxhY2VfY29udGVudHNfZmluaXNoKGZpbGUs IHJlc3VsdCwgbnVsbHB0ciwgbnVsbHB0cikpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8q IHBhZ2UgPSBzdGF0aWNfY2FzdDxXZWJQYWdlUHJveHkqPih1c2VyRGF0YSk7CisgICAgR1VuaXF1 ZVB0cjxjaGFyPiBwYXRoKGdfZmlsZV9nZXRfcGF0aChmaWxlKSk7CisgICAgcGFnZS0+cHJvY2Vz cygpLnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3RvclVJOjpEaWRTYXZlKHBhdGguZ2V0KCkpLCBw YWdlLT53ZWJQYWdlSUQoKSk7Cit9CisKK3ZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3Jt U2F2ZShjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZFVSTCwgY29uc3QgU3RyaW5nJiBjb250ZW50LCBi b29sIGJhc2U2NEVuY29kZWQsIGJvb2wgZm9yY2VTYXZlRGlhbG9nKQogewogICAgIFVOVVNFRF9Q QVJBTShmb3JjZVNhdmVEaWFsb2cpOwogCkBAIC00NzMsNyArNDg0LDEzIEBAIHZvaWQgV2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtU2F2ZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBjb25zdCBT dHJpbmcmIGNvbnRlCiAKICAgICBHdGtGaWxlQ2hvb3NlciogY2hvb3NlciA9IEdUS19GSUxFX0NI T09TRVIoZGlhbG9nLmdldCgpKTsKICAgICBndGtfZmlsZV9jaG9vc2VyX3NldF9kb19vdmVyd3Jp dGVfY29uZmlybWF0aW9uKGNob29zZXIsIFRSVUUpOwotICAgIGd0a19maWxlX2Nob29zZXJfc2V0 X2N1cnJlbnRfbmFtZShjaG9vc2VyLCBmaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKKworICAgIC8v IFNvbWUgaW5zcGVjdG9yIHZpZXdzIChBdWRpdHMgZm9yIGluc3RhbmNlKSB1c2UgYSBjdXN0b20g VVJJIHNjaGVtZSwgc3VjaAorICAgIC8vIGFzIHdlYi1pbnNwZWN0b3IuIFNvIHdlIGNhbid0IHJl bHkgb24gdGhlIFVSTCBiZWluZyBhIHZhbGlkIGZpbGU6Ly8vIFVSTAorICAgIC8vIHVuZm9ydHVu YXRlbHkuCisgICAgVVJMIHVybChVUkwoKSwgc3VnZ2VzdGVkVVJMKTsKKyAgICAvLyBTdHJpcCBs ZWFkaW5nIC8gY2hhcmFjdGVyLgorICAgIGd0a19maWxlX2Nob29zZXJfc2V0X2N1cnJlbnRfbmFt ZShjaG9vc2VyLCB1cmwucGF0aCgpLnN1YnN0cmluZygxKS51dGY4KCkuZGF0YSgpKTsKIAogICAg IGlmIChndGtfbmF0aXZlX2RpYWxvZ19ydW4oR1RLX05BVElWRV9ESUFMT0coZGlhbG9nLmdldCgp KSkgIT0gR1RLX1JFU1BPTlNFX0FDQ0VQVCkKICAgICAgICAgcmV0dXJuOwpAQCAtNDkxLDggKzUw OCw4IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtU2F2ZShjb25zdCBTdHJpbmcm IGZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIGNvbnRlCiAgICAgc2l6ZV90IGRhdGFMZW5ndGggPSAh ZGF0YVN0cmluZy5pc051bGwoKSA/IGRhdGFTdHJpbmcubGVuZ3RoKCkgOiBkYXRhVmVjdG9yLnNp emUoKTsKICAgICBHUmVmUHRyPEdGaWxlPiBmaWxlID0gYWRvcHRHUmVmKGd0a19maWxlX2Nob29z ZXJfZ2V0X2ZpbGUoY2hvb3NlcikpOwogICAgIEdVbmlxdWVQdHI8Y2hhcj4gcGF0aChnX2ZpbGVf Z2V0X3BhdGgoZmlsZS5nZXQoKSkpOwotICAgIGlmIChnX2ZpbGVfc2V0X2NvbnRlbnRzKHBhdGgu Z2V0KCksIGRhdGEsIGRhdGFMZW5ndGgsIG51bGxwdHIpKQotICAgICAgICBtX2luc3BlY3RvclBh Z2UtPnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3RvclVJOjpEaWRTYXZlKHBhdGguZ2V0KCkpKTsK KyAgICBnX2ZpbGVfcmVwbGFjZV9jb250ZW50c19hc3luYyhmaWxlLmdldCgpLCBkYXRhLCBkYXRh TGVuZ3RoLCBudWxscHRyLCBmYWxzZSwKKyAgICAgICAgR19GSUxFX0NSRUFURV9SRVBMQUNFX0RF U1RJTkFUSU9OLCBudWxscHRyLCBmaWxlUmVwbGFjZUNvbnRlbnRzQ2FsbGJhY2ssIG1faW5zcGVj dG9yUGFnZSk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQXBwZW5kKGNv bnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpCg==