]> git.sesse.net Git - vlc/commitdiff
gme: fixed out-of-memory/out-of-range tests
authorPiotr Fusik <piotr@fusik.info>
Mon, 26 Mar 2012 21:35:38 +0000 (23:35 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 4 Apr 2012 18:26:43 +0000 (21:26 +0300)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
modules/demux/gme.c

index 464ba9e8faa5e117120e8e44297aeb5b4add3037..a389f9e42bbe040db8675ab0ae2bd994d4096df9 100644 (file)
@@ -262,7 +262,7 @@ static int Control (demux_t *demux, int query, va_list args)
                 break;
 
             int seek = (sys->titlev[sys->track_id]->i_length / 1000) * pos;
-            if (seek > INT_MAX || gme_seek (sys->emu, seek))
+            if (gme_seek (sys->emu, seek))
                 break;
             return VLC_SUCCESS;
         }
@@ -302,7 +302,7 @@ static int Control (demux_t *demux, int query, va_list args)
 
             unsigned n = sys->titlec;
             *titlev = malloc (sizeof (**titlev) * n);
-            if (unlikely(titlev == NULL))
+            if (unlikely(*titlev == NULL))
                 n = 0;
             *titlec = n;
             for (unsigned i = 0; i < n; i++)