[vlc-devel] [PATCH] gme: fixed out-of-memory/out-of-range tests

Piotr Fusik piotr at fusik.info
Fri Mar 23 17:15:33 CET 2012


---
 modules/demux/gme.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/gme.c b/modules/demux/gme.c
index 464ba9e..8f56887 100644
--- a/modules/demux/gme.c
+++ b/modules/demux/gme.c
@@ -261,8 +261,8 @@ static int Control (demux_t *demux, int query, va_list 
args)
              || (sys->titlev[sys->track_id]->i_length == 0))
                 break;
 
-            int seek = (sys->titlev[sys->track_id]->i_length / 1000) * pos;
-            if (seek > INT_MAX || gme_seek (sys->emu, seek))
+            double seek = (sys->titlev[sys->track_id]->i_length / 1000) * 
pos;
+            if (seek > INT_MAX || gme_seek (sys->emu, (int) 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++)
-- 
1.7.5.1


More information about the vlc-devel mailing list