[vlc-commits] input/item: sort before attaching slaves

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Oct 18 10:34:07 2019 +0200| [361cbd3cd78b26284a24e54db468275d44279763] | committer: Thomas Guillem

input/item: sort before attaching slaves

The order of readdir() is completely filesystem dependent.

Slaves should be attached using the same order across multiple OSses/access
modules.

This fixes the test_libvlc_slaves on some system when the entry order from
readdir() is different.

(cherry picked from commit 4186c94104ee528abd6860611b49515f3e6ec644)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=361cbd3cd78b26284a24e54db468275d44279763
---

 src/input/item.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/item.c b/src/input/item.c
index 2000de84a2..8eb5e84df4 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1726,8 +1726,8 @@ void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success)
 {
     if (b_success)
     {
-        rdh_attach_slaves(p_rdh, p_rdh->p_node);
         rdh_sort(p_rdh->p_node);
+        rdh_attach_slaves(p_rdh, p_rdh->p_node);
     }
     free(p_rdh->psz_ignored_exts);