[vlc-commits] filesystem: avoid potential qsort(NULL)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont r...@remlab.net | Mon Aug 
25 21:35:27 2014 +0300| [b7740617b4c2e085078faf08c938a3a3cbe14efd] | committer: 
Jean-Baptiste Kempf

filesystem: avoid potential qsort(NULL)

(cherry picked from commit 558e6b78d4c269a2de4a152cd2c72cb685c65027)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b7740617b4c2e085078faf08c938a3a3cbe14efd
---

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

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 31d4dc6..4b4d0bb 100644
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -153,7 +153,7 @@ int vlc_loaddir( DIR *dir, char ***namelist,
 num++;
 }
 
-if (compar != NULL)
+if (compar != NULL  num  0)
 qsort (tab, num, sizeof (*tab),
(int (*)( const void *, const void *))compar);
 *namelist = tab;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] filesystem: avoid potential qsort(NULL)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Mon Aug 25 
21:35:27 2014 +0300| [558e6b78d4c269a2de4a152cd2c72cb685c65027] | committer: 
Rémi Denis-Courmont

filesystem: avoid potential qsort(NULL)

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=558e6b78d4c269a2de4a152cd2c72cb685c65027
---

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

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 31d4dc6..4b4d0bb 100644
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -153,7 +153,7 @@ int vlc_loaddir( DIR *dir, char ***namelist,
 num++;
 }
 
-if (compar != NULL)
+if (compar != NULL  num  0)
 qsort (tab, num, sizeof (*tab),
(int (*)( const void *, const void *))compar);
 *namelist = tab;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits