check the array exists on api calls and get_items

ampache · Apr 10, 2024 · acf09d7 · acf09d7
1 parent a818a61
commit acf09d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/Module/Api/Method/Api4/Playlist4Method.php b/src/Module/Api/Method/Api4/Playlist4Method.php
@@ -61,6 +61,11 @@ public static function playlist(array $input, User $user): bool
             // Smartlists
             $playlist = new Search((int) str_replace('smart_', '', $list_id), 'song', $user);
         }
+        if ($playlist->isNew()) {
+            Api4::message('error', T_('Library item not found'), '404', $input['api_format']);
+
+            return false;
+        }
         if (!$playlist->type == 'public' && (!$playlist->has_access($user->id) && $user->access !== 100)) {
             Api4::message('error', T_('Access denied to this playlist'), '401', $input['api_format']);
 

diff --git a/src/Module/Api/Method/Api4/PlaylistSongs4Method.php b/src/Module/Api/Method/Api4/PlaylistSongs4Method.php
@@ -63,6 +63,11 @@ public static function playlist_songs(array $input, User $user): bool
             // Smartlists
             $playlist = new Search((int) str_replace('smart_', '', $uid), 'song', $user);
         }
+        if ($playlist->isNew()) {
+            Api4::message('error', T_('Library item not found'), '404', $input['api_format']);
+
+            return false;
+        }
         if (!$playlist->type == 'public' && (!$playlist->has_access($user->id) && $user->access !== 100)) {
             Api4::message('error', T_('Access denied to this playlist'), '401', $input['api_format']);
 

diff --git a/src/Repository/Model/Playlist.php b/src/Repository/Model/Playlist.php
@@ -294,6 +294,9 @@ public function format($details = true): void
      */
     public function get_items(): array
     {
+        if ($this->isNew()) {
+            return array();
+        }
         $results = array();
         $user    = Core::get_global('user');
         $user_id = $user->id ?? 0;