libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKENDS: DIALOGS: GTK: Fix incorrect memory usage & replace unsafe code.

Browse Source 
- Encoding::convert which was previously used needed to be freed by the caller.
- With the direct conversion to utf8 by .encode(), this doesn't need to happen anymore
This commit is contained in:
aryanrawlani28 2020-08-20 23:10:18 +05:30 committed by Eugene Sandulenko
parent d2da98d3b0
commit d4a280ef29
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/dialogs/gtk/gtk-dialogs.cpp
View File

@ -41,13 +41,14 @@ Common::DialogManager::DialogResult GtkDialogManager::showFileBrowser(const Comm
DialogResult result = kDialogCancel;
Common::U32String choose = _("Choose");
Common::U32String cancel = _("Cancel");
// Convert labels to UTF-8
char *utf8Title = (char *)title.encode().c_str();
char *utf8Choose = (char *)choose.encode().c_str();
char* utf8Cancel = (char *)cancel.encode().c_str();
Common::String titleStr = title.encode();
Common::String choose = _("Choose").encode();
Common::String cancel = _("Cancel").encode();
char *utf8Title = (char *)(titleStr.c_str());
char *utf8Choose = (char *)(choose.c_str());
char *utf8Cancel = (char *)(cancel.c_str());
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
if (isDirBrowser) {
@ -60,9 +61,6 @@ Common::DialogManager::DialogResult GtkDialogManager::showFileBrowser(const Comm
GtkWidget *dialog = gtk_file_chooser_dialog_new(utf8Title, NULL, action, utf8Choose, GTK_RESPONSE_ACCEPT, utf8Cancel, GTK_RESPONSE_CANCEL, NULL);
GtkFileChooser *chooser = GTK_FILE_CHOOSER(dialog);
#endif
free(utf8Cancel);
free(utf8Choose);
free(utf8Title);
// Customize dialog
gtk_file_chooser_set_show_hidden(chooser, ConfMan.getBool("gui_browser_show_hidden", Common::ConfigManager::kApplicationDomain));