[vlc-commits] stream_filter: rar: reject if rar is compressed

Francois Cartegnie git at videolan.org
Sat Jul 26 01:30:25 CEST 2014


vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Jul 20 20:57:46 2014 +0900| [8831d8b87a3402841ef1a95b777faf8a70df7344] | committer: Jean-Baptiste Kempf

stream_filter: rar: reject if rar is compressed

(cherry picked from commit 8840af091352a619d12ddfa1f15f509f19b7699a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/access/rar/stream.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/rar/stream.c b/modules/access/rar/stream.c
index 68b4017..2655e3e 100644
--- a/modules/access/rar/stream.c
+++ b/modules/access/rar/stream.c
@@ -72,8 +72,8 @@ int RarStreamOpen(vlc_object_t *object)
     int count;
     rar_file_t **files;
     const int64_t position = stream_Tell(s->p_source);
-    if (RarParse(s->p_source, &count, &files, false) &&
-        RarParse(s->p_source, &count, &files, true ) )
+    if ((RarParse(s->p_source, &count, &files, false) &&
+         RarParse(s->p_source, &count, &files, true )) || count == 0 )
     {
         stream_Seek(s->p_source, position);
         msg_Err(s, "Invalid or unsupported RAR archive");



More information about the vlc-commits mailing list