]> git.sesse.net Git - vlc/commitdiff
vlc_readdir: thread-safety fix
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 17 Apr 2010 14:43:59 +0000 (17:43 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 17 Apr 2010 14:56:10 +0000 (17:56 +0300)
Use readdir_r() instead of readdir().

src/text/filesystem.c

index 34d03f44ff8e1773391c67a3efe61938ec1a6fa8..ffb590827435df1d2da2d1fa8f3a7bdc8549c60b 100644 (file)
@@ -322,12 +322,18 @@ char *vlc_readdir( DIR *dir )
     return FromWide (ent->d_name);
 #else
     struct dirent *ent;
-
-    ent = readdir( (DIR *)dir );
-    if( ent == NULL )
+    struct
+    {
+        struct dirent ent;
+        char buf[NAME_MAX + 1];
+    } buf;
+    int val = readdir_r (dir, &buf.ent, &ent);
+    if (val)
+    {
+        errno = val;
         return NULL;
-
-    return vlc_fix_readdir( ent->d_name );
+    }
+    return ent ? vlc_fix_readdir( ent->d_name ) : NULL;
 #endif
 }