221224 2021-02-01 13:40:35 -0800 [WPE][GTK] BubblewrapLauncher should create flatpak-info keyfile only once 2021-02-15 09:07:56 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro aperez bugs-noreply mcatanzaro oldest_to_newest 1724395 0 mcatanzaro 2021-02-01 13:40:35 -0800 BubblewrapLauncher should create its flatpak-info keyfile only once, because its contents will never change. Makes more sense to cache this tiny string in memory than to recompute it every time a subprocess is launched. 1724401 1 418918 mcatanzaro 2021-02-01 13:54:13 -0800 Created attachment 418918 Patch 1725759 2 418918 aperez 2021-02-04 12:57:38 -0800 Comment on attachment 418918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418918&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:697 > + static GUniquePtr<char> data; Shouldn't this be better be NeverDestroyed<CString> instead? Or even MainThreadNeverDestroyed<CString> ;-) 1725777 3 mcatanzaro 2021-02-04 13:42:03 -0800 NeverDestroyed is required for static objects in cross-platform code to ensure we don't run destructors, because the order the destructors execute is undefined on Windows. Historically, I don't think I've been using it in our platform-specific code since this problem just doesn't exist on Linux. I guess that's maybe not a great idea, though, since it could cause trouble if the code is eventually ever ported to Windows. (On the other hand, we can be fairly confident BubblewrapLauncher.cpp cannot possibly ever work on Windows, so shrug.) Anyway, I'll try changing it to NeverDestroyed<CString>. MainThreadNeverDestroyed is only needed if we have to assert that the object is never accessed on another thread, so normal NeverDestroyed is fine here. 1725806 4 418918 mcatanzaro 2021-02-04 14:30:52 -0800 Comment on attachment 418918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418918&action=review >> Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:697 >> + static GUniquePtr<char> data; > > Shouldn't this be better be NeverDestroyed<CString> instead? > Or even MainThreadNeverDestroyed<CString> ;-) Hm, CString doesn't work well here. I need the GUniquePtr<char> to hold ownership of the result of g_key_file_to_data(). Creating a CString from it would require an extra copy, and a second variable, and wouldn't accomplish anything. So the good options here are either: static NeverDestroyed<char*> data; Or: static GUniquePtr<char> data; (what I have already) Or, perhaps overkill: static NeverDestroyed<GUniquePtr<char>> data; 1726831 5 mcatanzaro 2021-02-08 15:08:16 -0800 Ping Adrian. I have a merge conflict now between this and bug #219010. 1728253 6 aperez 2021-02-11 13:04:31 -0800 (In reply to Michael Catanzaro from comment #4) > Comment on attachment 418918 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=418918&action=review > > >> Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:697 > >> + static GUniquePtr<char> data; > > > > Shouldn't this be better be NeverDestroyed<CString> instead? > > Or even MainThreadNeverDestroyed<CString> ;-) > > Hm, CString doesn't work well here. I need the GUniquePtr<char> to hold > ownership of the result of g_key_file_to_data(). Creating a CString from it > would require an extra copy, and a second variable, and wouldn't accomplish > anything. > > So the good options here are either: > > static NeverDestroyed<char*> data; > > Or: > > static GUniquePtr<char> data; (what I have already) > > Or, perhaps overkill: > > static NeverDestroyed<GUniquePtr<char>> data; I would go with this option, there are similar uses around the codebase e.g. NeverDestroyed<GRefPtr<…>> and NeverDestroyed<Ref<…> :) 1728350 7 420064 mcatanzaro 2021-02-11 16:32:44 -0800 Created attachment 420064 Patch 1729161 8 mcatanzaro 2021-02-15 07:58:47 -0800 Ping Adrian :) 1729178 9 ews-feeder 2021-02-15 09:07:53 -0800 Committed r272854: <https://commits.webkit.org/r272854> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420064. 418918 2021-02-01 13:54:13 -0800 2021-02-11 16:32:41 -0800 Patch bug-221224-20210201155412.patch text/plain 3395 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJjYWQ3OGYxZTZlZjQ4OTlk NmZlMzA0N2U5MzkzMmRjZWI5M2IxZTIuLjBiZTViOGNmZjAxNjQ1NjlkMjgzNGNkZmVmMGQ3OWQw MjM1Mzk0NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDItMDEgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW1dQRV1bR1RLXSBC dWJibGV3cmFwTGF1bmNoZXIgc2hvdWxkIGNyZWF0ZSBmbGF0cGFrLWluZm8ga2V5ZmlsZSBvbmx5 IG9uY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MTIyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1 YmJsZXdyYXBMYXVuY2hlciBzaG91bGQgY3JlYXRlIGl0cyBmbGF0cGFrLWluZm8ga2V5ZmlsZSBv bmx5IG9uY2UsIGJlY2F1c2UgaXRzIGNvbnRlbnRzCisgICAgICAgIHdpbGwgbmV2ZXIgY2hhbmdl LiBNYWtlcyBtb3JlIHNlbnNlIHRvIGNhY2hlIHRoaXMgdGlueSBzdHJpbmcgaW4gbWVtb3J5IHRo YW4gdG8gcmVjb21wdXRlIGl0CisgICAgICAgIGV2ZXJ5IHRpbWUgYSBzdWJwcm9jZXNzIGlzIGxh dW5jaGVkLgorCisgICAgICAgIFdoZW4gd29ya2luZyBvbiB0aGlzLCBJIG5vdGljZWQgYSBxdWly ayBpbiB0aGUgZG9jdW1lbnRhdGlvbiBvZiBnX2tleV9maWxlX3RvX2RhdGE6IGFsdGhvdWdoCisg ICAgICAgIHRoZSBmdW5jdGlvbiBoYXMgYSBHRXJyb3IgcGFyYW1ldGVyLCBpdCBpcyBsZWdhY3kg YW5kIHRoZSBmdW5jdGlvbiBpcyBhY3R1YWxseSBndWFyYW50ZWVkIHRvCisgICAgICAgIHN1Y2Nl ZWQuIFNvIGlja3kgdGhvdWdoIGl0IHNlZW1zLCBJJ3ZlIHJlbW92ZWQgdGhlIGVycm9yIGNoZWNr aW5nIGZvciB0aGF0LCBhcyByZWNvbW1lbmRlZAorICAgICAgICBieSBpdHMgZG9jdW1lbnRhdGlv bi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hl ci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUZsYXRwYWtJbmZvKToKKwogMjAyMS0wMi0w MSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W1NPVVBdIEFkZCBzdXBwb3J0IGZvciBkYXRhIFVSTHMgaW4gdGhlIG5ldHdvcmsgcHJvY2Vzcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3 cmFwTGF1bmNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9C dWJibGV3cmFwTGF1bmNoZXIuY3BwCmluZGV4IDY5YjRkYzZhNmEwYmNkOTRiYWY2ZmE1ZDNkMmIy MzEwYzQwY2JkZDAuLjA1NzNhOTJiNWMyNGY4MjNhY2QwYTIxOWMzZjY4MjUzMzQ5ZmYxYjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3Jh cExhdW5jaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGli L0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKQEAgLTY5NCwyMyArNjk0LDIxIEBAIHN0YXRpYyBpbnQg c2V0dXBTZWNjb21wKCkKIAogc3RhdGljIGludCBjcmVhdGVGbGF0cGFrSW5mbygpCiB7Ci0gICAg R1VuaXF1ZVB0cjxHS2V5RmlsZT4ga2V5RmlsZShnX2tleV9maWxlX25ldygpKTsKLQotICAgIC8v IHhkZy1kZXNrdG9wLXBvcnRhbCByZWxhdGVzIHlvdXIgbmFtZSB0byBjZXJ0YWluIHBlcm1pc3Np b25zIHNvIHdlIHdhbnQKLSAgICAvLyB0aGVtIHRvIGJlIGFwcGxpY2F0aW9uIHVuaXF1ZSB3aGlj aCBpcyBiZXN0IGRvbmUgdmlhIEdBcHBsaWNhdGlvbi4KLSAgICBHQXBwbGljYXRpb24qIGFwcCA9 IGdfYXBwbGljYXRpb25fZ2V0X2RlZmF1bHQoKTsKLSAgICBpZiAoIWFwcCkgewotICAgICAgICBn X3dhcm5pbmcoIkdBcHBsaWNhdGlvbiBpcyByZXF1aXJlZCBmb3IgeGRnLWRlc2t0b3AtcG9ydGFs IGFjY2VzcyBpbiB0aGUgV2ViS2l0IHNhbmRib3guIEFjdGlvbnMgdGhhdCByZXF1aXJlIHhkZy1k ZXNrdG9wLXBvcnRhbCB3aWxsIGJlIGJyb2tlbi4iKTsKLSAgICAgICAgcmV0dXJuIC0xOwotICAg IH0KLSAgICBnX2tleV9maWxlX3NldF9zdHJpbmcoa2V5RmlsZS5nZXQoKSwgIkFwcGxpY2F0aW9u IiwgIm5hbWUiLCBnX2FwcGxpY2F0aW9uX2dldF9hcHBsaWNhdGlvbl9pZChhcHApKTsKKyAgICBz dGF0aWMgR1VuaXF1ZVB0cjxjaGFyPiBkYXRhOworICAgIHN0YXRpYyBzaXplX3Qgc2l6ZTsKKwor ICAgIGlmICghZGF0YSkgeworICAgICAgICAvLyB4ZGctZGVza3RvcC1wb3J0YWwgcmVsYXRlcyB5 b3VyIG5hbWUgdG8gY2VydGFpbiBwZXJtaXNzaW9ucyBzbyB3ZSB3YW50CisgICAgICAgIC8vIHRo ZW0gdG8gYmUgYXBwbGljYXRpb24gdW5pcXVlIHdoaWNoIGlzIGJlc3QgZG9uZSB2aWEgR0FwcGxp Y2F0aW9uLgorICAgICAgICBHQXBwbGljYXRpb24qIGFwcCA9IGdfYXBwbGljYXRpb25fZ2V0X2Rl ZmF1bHQoKTsKKyAgICAgICAgaWYgKCFhcHApIHsKKyAgICAgICAgICAgIGdfd2FybmluZygiR0Fw cGxpY2F0aW9uIGlzIHJlcXVpcmVkIGZvciB4ZGctZGVza3RvcC1wb3J0YWwgYWNjZXNzIGluIHRo ZSBXZWJLaXQgc2FuZGJveC4gQWN0aW9ucyB0aGF0IHJlcXVpcmUgeGRnLWRlc2t0b3AtcG9ydGFs IHdpbGwgYmUgYnJva2VuLiIpOworICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICB9CiAK LSAgICBzaXplX3Qgc2l6ZTsKLSAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4gZXJyb3I7Ci0gICAg R1VuaXF1ZVB0cjxjaGFyPiBkYXRhKGdfa2V5X2ZpbGVfdG9fZGF0YShrZXlGaWxlLmdldCgpLCAm c2l6ZSwgJmVycm9yLm91dFB0cigpKSk7Ci0gICAgaWYgKGVycm9yLmdldCgpKSB7Ci0gICAgICAg IGdfd2FybmluZygiJXMiLCBlcnJvci0+bWVzc2FnZSk7Ci0gICAgICAgIHJldHVybiAtMTsKKyAg ICAgICAgR1VuaXF1ZVB0cjxHS2V5RmlsZT4ga2V5RmlsZShnX2tleV9maWxlX25ldygpKTsKKyAg ICAgICAgZ19rZXlfZmlsZV9zZXRfc3RyaW5nKGtleUZpbGUuZ2V0KCksICJBcHBsaWNhdGlvbiIs ICJuYW1lIiwgZ19hcHBsaWNhdGlvbl9nZXRfYXBwbGljYXRpb25faWQoYXBwKSk7CisgICAgICAg IGRhdGEucmVzZXQoZ19rZXlfZmlsZV90b19kYXRhKGtleUZpbGUuZ2V0KCksICZzaXplLCBudWxs cHRyKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGNyZWF0ZVNlYWxlZE1lbUZkV2l0aERhdGEoImZs YXRwYWstaW5mbyIsIGRhdGEuZ2V0KCksIHNpemUpOwo= 420064 2021-02-11 16:32:44 -0800 2021-02-15 09:07:54 -0800 Patch bug-221224-20210211183243.patch text/plain 3619 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2YWJmOGI2NzNkZTFiNjk4 MTM5YTIwYWZiMTQ4ZDg1ZjIwOWEzYzguLjU3NDk2ZDlkNWIyNGVkMjQ3OTFiYzcxNjFhZWMwNmM0 YzQ3MzAwODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDItMTEgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW1dQRV1bR1RLXSBC dWJibGV3cmFwTGF1bmNoZXIgc2hvdWxkIGNyZWF0ZSBmbGF0cGFrLWluZm8ga2V5ZmlsZSBvbmx5 IG9uY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MTIyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1 YmJsZXdyYXBMYXVuY2hlciBzaG91bGQgY3JlYXRlIGl0cyBmbGF0cGFrLWluZm8ga2V5ZmlsZSBv bmx5IG9uY2UsIGJlY2F1c2UgaXRzIGNvbnRlbnRzCisgICAgICAgIHdpbGwgbmV2ZXIgY2hhbmdl LiBNYWtlcyBtb3JlIHNlbnNlIHRvIGNhY2hlIHRoaXMgdGlueSBzdHJpbmcgaW4gbWVtb3J5IHRo YW4gdG8gcmVjb21wdXRlIGl0CisgICAgICAgIGV2ZXJ5IHRpbWUgYSBzdWJwcm9jZXNzIGlzIGxh dW5jaGVkLgorCisgICAgICAgIFdoZW4gd29ya2luZyBvbiB0aGlzLCBJIG5vdGljZWQgYSBxdWly ayBpbiB0aGUgZG9jdW1lbnRhdGlvbiBvZiBnX2tleV9maWxlX3RvX2RhdGE6IGFsdGhvdWdoCisg ICAgICAgIHRoZSBmdW5jdGlvbiBoYXMgYSBHRXJyb3IgcGFyYW1ldGVyLCBpdCBpcyBsZWdhY3kg YW5kIHRoZSBmdW5jdGlvbiBpcyBhY3R1YWxseSBndWFyYW50ZWVkIHRvCisgICAgICAgIHN1Y2Nl ZWQuIFNvIGlja3kgdGhvdWdoIGl0IHNlZW1zLCBJJ3ZlIHJlbW92ZWQgdGhlIGVycm9yIGNoZWNr aW5nIGZvciB0aGF0LCBhcyByZWNvbW1lbmRlZAorICAgICAgICBieSBpdHMgZG9jdW1lbnRhdGlv bi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hl ci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUZsYXRwYWtJbmZvKToKKwogMjAyMS0wMi0w OSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgYnVpbGQgZml4IGFmdGVyIHIyNzI2MzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcAppbmRleCA2 OWI0ZGM2YTZhMGJjZDk0YmFmNmZhNWQzZDJiMjMxMGM0MGNiZGQwLi4zMDE4YjVhMWJkYjEzZTBm MzNiNDhlOTQzOGEwNWI0ZmYxNTg5ZTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwCkBAIC02 OTQsMjYgKzY5NCwyNCBAQCBzdGF0aWMgaW50IHNldHVwU2VjY29tcCgpCiAKIHN0YXRpYyBpbnQg Y3JlYXRlRmxhdHBha0luZm8oKQogewotICAgIEdVbmlxdWVQdHI8R0tleUZpbGU+IGtleUZpbGUo Z19rZXlfZmlsZV9uZXcoKSk7Ci0KLSAgICAvLyB4ZGctZGVza3RvcC1wb3J0YWwgcmVsYXRlcyB5 b3VyIG5hbWUgdG8gY2VydGFpbiBwZXJtaXNzaW9ucyBzbyB3ZSB3YW50Ci0gICAgLy8gdGhlbSB0 byBiZSBhcHBsaWNhdGlvbiB1bmlxdWUgd2hpY2ggaXMgYmVzdCBkb25lIHZpYSBHQXBwbGljYXRp b24uCi0gICAgR0FwcGxpY2F0aW9uKiBhcHAgPSBnX2FwcGxpY2F0aW9uX2dldF9kZWZhdWx0KCk7 Ci0gICAgaWYgKCFhcHApIHsKLSAgICAgICAgZ193YXJuaW5nKCJHQXBwbGljYXRpb24gaXMgcmVx dWlyZWQgZm9yIHhkZy1kZXNrdG9wLXBvcnRhbCBhY2Nlc3MgaW4gdGhlIFdlYktpdCBzYW5kYm94 LiBBY3Rpb25zIHRoYXQgcmVxdWlyZSB4ZGctZGVza3RvcC1wb3J0YWwgd2lsbCBiZSBicm9rZW4u Iik7Ci0gICAgICAgIHJldHVybiAtMTsKLSAgICB9Ci0gICAgZ19rZXlfZmlsZV9zZXRfc3RyaW5n KGtleUZpbGUuZ2V0KCksICJBcHBsaWNhdGlvbiIsICJuYW1lIiwgZ19hcHBsaWNhdGlvbl9nZXRf YXBwbGljYXRpb25faWQoYXBwKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEdVbmlxdWVQ dHI8Y2hhcj4+IGRhdGE7CisgICAgc3RhdGljIHNpemVfdCBzaXplOworCisgICAgaWYgKCFkYXRh LmdldCgpKSB7CisgICAgICAgIC8vIHhkZy1kZXNrdG9wLXBvcnRhbCByZWxhdGVzIHlvdXIgbmFt ZSB0byBjZXJ0YWluIHBlcm1pc3Npb25zIHNvIHdlIHdhbnQKKyAgICAgICAgLy8gdGhlbSB0byBi ZSBhcHBsaWNhdGlvbiB1bmlxdWUgd2hpY2ggaXMgYmVzdCBkb25lIHZpYSBHQXBwbGljYXRpb24u CisgICAgICAgIEdBcHBsaWNhdGlvbiogYXBwID0gZ19hcHBsaWNhdGlvbl9nZXRfZGVmYXVsdCgp OworICAgICAgICBpZiAoIWFwcCkgeworICAgICAgICAgICAgZ193YXJuaW5nKCJHQXBwbGljYXRp b24gaXMgcmVxdWlyZWQgZm9yIHhkZy1kZXNrdG9wLXBvcnRhbCBhY2Nlc3MgaW4gdGhlIFdlYktp dCBzYW5kYm94LiBBY3Rpb25zIHRoYXQgcmVxdWlyZSB4ZGctZGVza3RvcC1wb3J0YWwgd2lsbCBi ZSBicm9rZW4uIik7CisgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIH0KIAotICAgIHNp emVfdCBzaXplOwotICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBHVW5pcXVl UHRyPGNoYXI+IGRhdGEoZ19rZXlfZmlsZV90b19kYXRhKGtleUZpbGUuZ2V0KCksICZzaXplLCAm ZXJyb3Iub3V0UHRyKCkpKTsKLSAgICBpZiAoZXJyb3IuZ2V0KCkpIHsKLSAgICAgICAgZ193YXJu aW5nKCIlcyIsIGVycm9yLT5tZXNzYWdlKTsKLSAgICAgICAgcmV0dXJuIC0xOworICAgICAgICBH VW5pcXVlUHRyPEdLZXlGaWxlPiBrZXlGaWxlKGdfa2V5X2ZpbGVfbmV3KCkpOworICAgICAgICBn X2tleV9maWxlX3NldF9zdHJpbmcoa2V5RmlsZS5nZXQoKSwgIkFwcGxpY2F0aW9uIiwgIm5hbWUi LCBnX2FwcGxpY2F0aW9uX2dldF9hcHBsaWNhdGlvbl9pZChhcHApKTsKKyAgICAgICAgZGF0YS0+ cmVzZXQoZ19rZXlfZmlsZV90b19kYXRhKGtleUZpbGUuZ2V0KCksICZzaXplLCBudWxscHRyKSk7 CiAgICAgfQogCi0gICAgcmV0dXJuIGNyZWF0ZVNlYWxlZE1lbUZkV2l0aERhdGEoImZsYXRwYWst aW5mbyIsIGRhdGEuZ2V0KCksIHNpemUpOworICAgIHJldHVybiBjcmVhdGVTZWFsZWRNZW1GZFdp dGhEYXRhKCJmbGF0cGFrLWluZm8iLCBkYXRhLT5nZXQoKSwgc2l6ZSk7CiB9CiAKIEdSZWZQdHI8 R1N1YnByb2Nlc3M+IGJ1YmJsZXdyYXBTcGF3bihHU3VicHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hl ciwgY29uc3QgUHJvY2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zJiBsYXVuY2hPcHRpb25zLCBj aGFyKiogYXJndiwgR0Vycm9yICoqZXJyb3IpCg==