Code

save_playlist: move NULL check up
authorMax Kellermann <max.kellermann@gmail.com>
Mon, 20 Mar 2017 21:00:20 +0000 (22:00 +0100)
committerMax Kellermann <max.kellermann@gmail.com>
Mon, 20 Mar 2017 21:00:20 +0000 (22:00 +0100)
src/save_playlist.c

index b7b7634f680e41cd0132cbaf437b488a7055c9db..118d11aeb519f880398d80711439ae1511c99d28 100644 (file)
@@ -109,6 +109,8 @@ playlist_save(struct mpdclient *c, char *name, char *defaultname)
                                         defaultname,
                                         NULL,
                                         gcmp);
+               if (filename == NULL)
+                       return -1;
 
                /* destroy completion support */
                wrln_completion_callback_data = NULL;
@@ -116,15 +118,11 @@ playlist_save(struct mpdclient *c, char *name, char *defaultname)
                wrln_post_completion_callback = NULL;
                g_completion_free(gcmp);
                list = string_list_free(list);
-               if( filename )
-                       filename=g_strstrip(filename);
+               filename = g_strstrip(filename);
        } else
 #endif
                filename=g_strdup(name);
 
-       if (filename == NULL)
-               return -1;
-
        /* send save command to mpd */
 
        connection = mpdclient_get_connection(c);