78487 2012-02-13 05:17:37 -0800 [GTK] Add GSList to the list of GObject types in GOwnPtr 2012-02-13 08:41:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 mario mario cgarcia mrobinson pnormand oldest_to_newest 555199 0 mario 2012-02-13 05:17:37 -0800 This would be a nice addition to handle GSList's as returned from some functions (e.g. gtk_file_chooser_get_uris). 555200 1 126759 mario 2012-02-13 05:24:10 -0800 Created attachment 126759 Patch 555204 2 126759 cgarcia 2012-02-13 05:34:00 -0800 Comment on attachment 126759 Patch Looks good 555206 3 126759 pnormand 2012-02-13 05:37:55 -0800 Comment on attachment 126759 Patch Ok! Where will that new smart pointer will be used? Can you "migrate" some existing code as part of this patch? 555213 4 126763 mario 2012-02-13 06:04:01 -0800 Created attachment 126763 Patch (In reply to comment #3) > (From update of attachment 126759 [details]) > Ok! Where will that new smart pointer will be used? Can you "migrate" some existing code as part of this patch? It will be used in the code I'm now writing to implement the WebUIClient's runOpenPanel() feature in WebKit2GTK+, when handling the list of fileURIs as returned by gtk_file_chooser_get_uris(), which happens to be an GSList. The same kind of usage is already in WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp, so I guess it makes sense to migrate that code along with this patch, thus I'm attaching a new one incorporating that suggestion. 555218 5 126763 pnormand 2012-02-13 06:07:57 -0800 Comment on attachment 126763 Patch Awesome! Thanks! 555224 6 mario 2012-02-13 06:18:30 -0800 Committed r107566: <http://trac.webkit.org/changeset/107566> 555267 7 126759 mrobinson 2012-02-13 08:11:13 -0800 Comment on attachment 126759 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126759&action=review > Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp:42 > + g_slist_free(ptr); You should check if the value is null before freeing it. While g_slist_free may properly handle null values, it isn't documented, so a check is safer. 555271 8 cgarcia 2012-02-13 08:14:20 -0800 (In reply to comment #7) > (From update of attachment 126759 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126759&action=review > > > Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp:42 > > + g_slist_free(ptr); > > You should check if the value is null before freeing it. While g_slist_free may properly handle null values, it isn't documented, so a check is safer. No, you shoulnd't, NULL is a valid empty GSList. 555273 9 mrobinson 2012-02-13 08:16:47 -0800 (In reply to comment #8) > > You should check if the value is null before freeing it. While g_slist_free may properly handle null values, it isn't documented, so a check is safer. > > No, you shoulnd't, NULL is a valid empty GSList. The documentation for g_slist_free seems lacking, then. :/ 555275 10 cgarcia 2012-02-13 08:20:28 -0800 "There is no function to create a GList. NULL is considered to be the empty list so you simply set a GList* to NULL." 555278 11 mrobinson 2012-02-13 08:25:23 -0800 (In reply to comment #10) > "There is no function to create a GList. NULL is considered to be the empty list so you simply set a GList* to NULL." The g_slist_free makes no reference to this fact nor does it explicitly say that it handles empty GLists. 555286 12 cgarcia 2012-02-13 08:31:20 -0800 Because all GList and GSList API accept NULL due to the fact that NULL is a valid empty list as documented in the description section of the documentation. 555288 13 mrobinson 2012-02-13 08:35:06 -0800 (In reply to comment #12) > Because all GList and GSList API accept NULL due to the fact that NULL is a valid empty list as documented in the description section of the documentation. This is just an assumption one would make from reading the documentation though. All that's explicitly stated is that NULL is a valid GList/GSList. Indeed here is someone who made a mistake because of this: http://code.google.com/codesearch#-q96OtJF3X4/trunk/xdelta1/libedsio/edsio.c&q=g_list_free&type=cs&l=1501 It's rare that documentation is too-explicit. I don't think situations like these are the users' fault. This debate probably doesn't belong on this bug though... 555295 14 cgarcia 2012-02-13 08:41:39 -0800 (In reply to comment #13) > (In reply to comment #12) > > Because all GList and GSList API accept NULL due to the fact that NULL is a valid empty list as documented in the description section of the documentation. > > This is just an assumption one would make from reading the documentation though. All that's explicitly stated is that NULL is a valid GList/GSList. g_list_free() receives a GList, NULL is a valid empty GList as documented, so GList can receive NULL. 126759 2012-02-13 05:24:10 -0800 2012-02-13 08:11:13 -0800 Patch bug-78487-20120213142408.patch text/plain 2835 mario U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl M2VlMDhjODVjNTg4ZGQ4MWZlZGVhY2FmODljN2U1NDdmODczMzdmLi44YTY1ZDU3MTk1YjMwZDJm NTY4YjM2MTYwMDFkZmJlZDdhZjYwYTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMi0wMi0xMyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQWRkIEdTTGlzdCB0byB0aGUgbGlzdCBvZiBHT2Jq ZWN0IHR5cGVzIGluIEdPd25QdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc4NDg3CisKKyAgICAgICAgSGFuZGxlIHRoZSBHU0xpc3QgdHlwZSBpbiBH T3duUHRyLCBieSBjYWxsaW5nIGdfc2xpc3RfZnJlZSBpbiB0aGUKKyAgICAgICAgaW1wbGVtZW50 YXRpb24gb2YgdGhlIGZyZWVPd25lZEdQdHIgdGVtcGxhdGUgZnVuY3Rpb24uCisKKyAgICAgICAg KiB3dGYvZ29iamVjdC9HT3duUHRyLmNwcDoKKyAgICAgICAgKFdURjo6R1NMaXN0KToKKyAgICAg ICAgKFdURik6CisgICAgICAgICogd3RmL2dvYmplY3QvR093blB0ci5oOgorICAgICAgICAoV1RG KToKKyAgICAgICAgKiB3dGYvZ29iamVjdC9HVHlwZWRlZnMuaDoKKwogMjAxMi0wMi0xMiAgQXNo b2QgTmFrYXNoaWFuICA8YXNob2RuYWthc2hpYW5AeWFob28uY29tPgogCiAgICAgICAgIEtleXdv cmRMb29rdXBHZW5lcmF0b3IucHkgc2NyaXB0IGZhaWxzIGluIHNvbWUgY2FzZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmNwcAppbmRleCBjNzI3OTU2Y2Vh MzEzMjgxMzE2OWUxMmE3ZGI4ZmJmOWYxNGM0MDM5Li5kZmUxODdkNzg4N2ZmNTRlYTAyN2MxYzlk YzVjMDZiZDdiZGI1Y2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dv YmplY3QvR093blB0ci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0 L0dPd25QdHIuY3BwCkBAIC0zNyw2ICszNywxMSBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25l ZEdQdHI8R0xpc3Q+KEdMaXN0KiBwdHIpCiAgICAgZ19saXN0X2ZyZWUocHRyKTsKIH0KIAordGVt cGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdTTGlzdD4oR1NMaXN0KiBwdHIpCit7CisgICAg Z19zbGlzdF9mcmVlKHB0cik7Cit9CisKIHRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxH UGF0dGVyblNwZWM+KEdQYXR0ZXJuU3BlYyogcHRyKQogewogICAgIGlmIChwdHIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0ci5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuaAppbmRleCAyMjE5NzFmOTdkNWQy ODQ5NjhmOWI0MWJmYTQ0YWI5ZWE5MDI5NjY1Li40YjJkY2I3N2IyNTAwMGMyZTViNjgwOGE0Yzc0 ODRjMmJlNmQ2Y2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmpl Y3QvR093blB0ci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3du UHRyLmgKQEAgLTM1LDYgKzM1LDcgQEAgbmFtZXNwYWNlIFdURiB7CiB0ZW1wbGF0ZSA8dHlwZW5h bWUgVD4gaW5saW5lIHZvaWQgZnJlZU93bmVkR1B0cihUKiBwdHIpOwogdGVtcGxhdGU8PiB2b2lk IGZyZWVPd25lZEdQdHI8R0Vycm9yPihHRXJyb3IqKTsKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3du ZWRHUHRyPEdMaXN0PihHTGlzdCopOwordGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R1NM aXN0PihHU0xpc3QqKTsKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdQYXR0ZXJuU3Bl Yz4oR1BhdHRlcm5TcGVjKik7CiB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHRGlyPihH RGlyKik7CiB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHVGltZXI+KEdUaW1lciopOwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oCmluZGV4IGUy YjJiYTZiODMyMjE2MzJjNmNjZWVmM2JhY2ZkYWJlMTY5MzhmZGUuLmNiMzg0MmI3ODMwMDMzNjBk MzQzYzE5MWNhN2MxN2QxMWJkYjRmMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3Rm L2dvYmplY3QvR1R5cGVkZWZzLmgKQEAgLTUzLDYgKzUzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0dJ bnB1dFN0cmVhbSBHSW5wdXRTdHJlYW07CiB0eXBlZGVmIHN0cnVjdCBfR0xpc3QgR0xpc3Q7CiB0 eXBlZGVmIHN0cnVjdCBfR1BhdHRlcm5TcGVjIEdQYXR0ZXJuU3BlYzsKIHR5cGVkZWYgc3RydWN0 IF9HUG9sbGFibGVPdXRwdXRTdHJlYW0gR1BvbGxhYmxlT3V0cHV0U3RyZWFtOwordHlwZWRlZiBz dHJ1Y3QgX0dTTGlzdCBHU0xpc3Q7CiB0eXBlZGVmIHN0cnVjdCBfR1NvY2tldENsaWVudCBHU29j a2V0Q2xpZW50OwogdHlwZWRlZiBzdHJ1Y3QgX0dTb2NrZXRDb25uZWN0aW9uIEdTb2NrZXRDb25u ZWN0aW9uOwogdHlwZWRlZiBzdHJ1Y3QgX0dTb3VyY2UgR1NvdXJjZTsK 126763 2012-02-13 06:04:01 -0800 2012-02-13 06:07:57 -0800 Patch bug78487.patch text/plain 4569 mario ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGUzZWUwOGMuLjM0OTI3YWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTEzICBNYXJpbyBTYW5jaGV6 IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgR1NMaXN0 IHRvIHRoZSBsaXN0IG9mIEdPYmplY3QgdHlwZXMgaW4gR093blB0cgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg0ODcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYW5kbGUgdGhlIEdTTGlzdCB0eXBlIGlu IEdPd25QdHIsIGJ5IGNhbGxpbmcgZ19zbGlzdF9mcmVlIGluIHRoZQorICAgICAgICBpbXBsZW1l bnRhdGlvbiBvZiB0aGUgZnJlZU93bmVkR1B0ciB0ZW1wbGF0ZSBmdW5jdGlvbi4KKworICAgICAg ICAqIHd0Zi9nb2JqZWN0L0dPd25QdHIuY3BwOgorICAgICAgICAoV1RGOjpHU0xpc3QpOgorICAg ICAgICAoV1RGKToKKyAgICAgICAgKiB3dGYvZ29iamVjdC9HT3duUHRyLmg6CisgICAgICAgIChX VEYpOgorICAgICAgICAqIHd0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oOgorCiAyMDEyLTAyLTEyICBB c2hvZCBOYWthc2hpYW4gIDxhc2hvZG5ha2FzaGlhbkB5YWhvby5jb20+CiAKICAgICAgICAgS2V5 d29yZExvb2t1cEdlbmVyYXRvci5weSBzY3JpcHQgZmFpbHMgaW4gc29tZSBjYXNlcwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuY3BwCmluZGV4IGM3Mjc5NTYu LmRmZTE4N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9H T3duUHRyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0 ci5jcHAKQEAgLTM3LDYgKzM3LDExIEBAIHRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxH TGlzdD4oR0xpc3QqIHB0cikKICAgICBnX2xpc3RfZnJlZShwdHIpOwogfQogCit0ZW1wbGF0ZSA8 PiB2b2lkIGZyZWVPd25lZEdQdHI8R1NMaXN0PihHU0xpc3QqIHB0cikKK3sKKyAgICBnX3NsaXN0 X2ZyZWUocHRyKTsKK30KKwogdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdQYXR0ZXJu U3BlYz4oR1BhdHRlcm5TcGVjKiBwdHIpCiB7CiAgICAgaWYgKHB0cikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0ci5oCmluZGV4IDIyMTk3MWYuLjRiMmRjYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuaApAQCAtMzUsNiAr MzUsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgdm9p ZCBmcmVlT3duZWRHUHRyKFQqIHB0cik7CiB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxH RXJyb3I+KEdFcnJvciopOwogdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0xpc3Q+KEdM aXN0Kik7Cit0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHU0xpc3Q+KEdTTGlzdCopOwog dGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R1BhdHRlcm5TcGVjPihHUGF0dGVyblNwZWMq KTsKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdEaXI+KEdEaXIqKTsKIHRlbXBsYXRl PD4gdm9pZCBmcmVlT3duZWRHUHRyPEdUaW1lcj4oR1RpbWVyKik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmgKaW5kZXggZTJiMmJhNi4uY2IzODQyYiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaApAQCAt NTMsNiArNTMsNyBAQCB0eXBlZGVmIHN0cnVjdCBfR0lucHV0U3RyZWFtIEdJbnB1dFN0cmVhbTsK IHR5cGVkZWYgc3RydWN0IF9HTGlzdCBHTGlzdDsKIHR5cGVkZWYgc3RydWN0IF9HUGF0dGVyblNw ZWMgR1BhdHRlcm5TcGVjOwogdHlwZWRlZiBzdHJ1Y3QgX0dQb2xsYWJsZU91dHB1dFN0cmVhbSBH UG9sbGFibGVPdXRwdXRTdHJlYW07Cit0eXBlZGVmIHN0cnVjdCBfR1NMaXN0IEdTTGlzdDsKIHR5 cGVkZWYgc3RydWN0IF9HU29ja2V0Q2xpZW50IEdTb2NrZXRDbGllbnQ7CiB0eXBlZGVmIHN0cnVj dCBfR1NvY2tldENvbm5lY3Rpb24gR1NvY2tldENvbm5lY3Rpb247CiB0eXBlZGVmIHN0cnVjdCBf R1NvdXJjZSBHU291cmNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDM4ZjM4NTUuLjNiYTVlNDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wMi0xMyAgTWFyaW8gU2FuY2hl eiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQWRkIEdTTGlz dCB0byB0aGUgbGlzdCBvZiBHT2JqZWN0IHR5cGVzIGluIEdPd25QdHIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4NDg3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnJ1bk9wZW5QYW5l bCk6IFVzZSBHT3duUHRyPEdTTGlzdD4gZm9yIHRoZQorICAgICAgICBsaXN0IG9mIGZpbGVuYW1l cyByZXR1cm5lZCBieSBndGtfZmlsZV9jaG9vc2VyX2dldF9maWxlbmFtZXMoKS4KKwogMjAxMi0w Mi0wOSAgWmFuIERvYmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtH VEtdIEFkZCBEUlQgc3VwcG9ydCBmb3IgbW9kYWwgZGlhbG9ncwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKaW5kZXggZDEzNGY5 Mi4uODk0MjdhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRHdGsuY3BwCkBAIC04MjQsMTUgKzgyNCwxNCBAQCB2b2lkIENocm9tZUNs aWVudDo6cnVuT3BlblBhbmVsKEZyYW1lKiwgUGFzc1JlZlB0cjxGaWxlQ2hvb3Nlcj4gcHJwRmls ZUNob29zZXIpCiAKICAgICBpZiAoZ3RrX2RpYWxvZ19ydW4oR1RLX0RJQUxPRyhkaWFsb2cpKSA9 PSBHVEtfUkVTUE9OU0VfQUNDRVBUKSB7CiAgICAgICAgIGlmIChndGtfZmlsZV9jaG9vc2VyX2dl dF9zZWxlY3RfbXVsdGlwbGUoR1RLX0ZJTEVfQ0hPT1NFUihkaWFsb2cpKSkgewotICAgICAgICAg ICAgR1NMaXN0KiBmaWxlbmFtZXMgPSBndGtfZmlsZV9jaG9vc2VyX2dldF9maWxlbmFtZXMoR1RL X0ZJTEVfQ0hPT1NFUihkaWFsb2cpKTsKKyAgICAgICAgICAgIEdPd25QdHI8R1NMaXN0PiBmaWxl bmFtZXMoZ3RrX2ZpbGVfY2hvb3Nlcl9nZXRfZmlsZW5hbWVzKEdUS19GSUxFX0NIT09TRVIoZGlh bG9nKSkpOwogICAgICAgICAgICAgVmVjdG9yPFN0cmluZz4gbmFtZXM7Ci0gICAgICAgICAgICBm b3IgKEdTTGlzdCogaXRlbSA9IGZpbGVuYW1lcyA7IGl0ZW0gOyBpdGVtID0gaXRlbS0+bmV4dCkg eworICAgICAgICAgICAgZm9yIChHU0xpc3QqIGl0ZW0gPSBmaWxlbmFtZXMuZ2V0KCkgOyBpdGVt IDsgaXRlbSA9IGl0ZW0tPm5leHQpIHsKICAgICAgICAgICAgICAgICBpZiAoIWl0ZW0tPmRhdGEp CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIG5hbWVzLmFw cGVuZChmaWxlbmFtZVRvU3RyaW5nKHN0YXRpY19jYXN0PGNoYXIqPihpdGVtLT5kYXRhKSkpOwog ICAgICAgICAgICAgICAgIGdfZnJlZShpdGVtLT5kYXRhKTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIGdfc2xpc3RfZnJlZShmaWxlbmFtZXMpOwogICAgICAgICAgICAgY2hvb3Nlci0+Y2hv b3NlRmlsZXMobmFtZXMpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZ2NoYXIqIGZp bGVuYW1lID0gZ3RrX2ZpbGVfY2hvb3Nlcl9nZXRfZmlsZW5hbWUoR1RLX0ZJTEVfQ0hPT1NFUihk aWFsb2cpKTsK