Fix crash when a playlist plugin does not provide save(). Closes: #371.

audacious-media-player · Nov 22, 2013 · 5fa9c0a · 5fa9c0a
1 parent 2e53b7a
commit 5fa9c0a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/audacious/playlist-files.c b/src/audacious/playlist-files.c
@@ -47,10 +47,9 @@ static PluginHandle * get_plugin (const char * filename, bool_t saving)
 
     if (! plugin)
     {
-        char * error = str_printf (_("Cannot %s %s: unsupported file "
+        SPRINTF (error, _("Cannot %s %s: unsupported file extension."),
-         "extension."), saving ? _("save") : _("load"), filename);
+         saving ? _("save") : _("load"), filename);
         interface_show_error (error);
-        str_unref (error);
         return NULL;
     }
 
@@ -127,7 +126,14 @@ bool_t playlist_save (int list, const char * filename)
         return FALSE;
 
     PlaylistPlugin * pp = plugin_get_header (plugin);
-    g_return_val_if_fail (pp && PLUGIN_HAS_FUNC (pp, load), FALSE);
+    g_return_val_if_fail (pp, FALSE);
+
+    if (! PLUGIN_HAS_FUNC (pp, save))
+    {
+        SPRINTF (error, _("Cannot save %s: plugin does not support saving."), filename);
+        interface_show_error (error);
+        return FALSE;
+    }
 
     bool_t fast = get_bool (NULL, "metadata_on_play");