Make the buildbot happy by fixing some of the warnings.

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index 191cce3fa242b24907095bc47f22c54fb7bd4471..145880d981e28ad05f0926505136117c71dcb540 100644 (file)
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -183,7 +183,7 @@ static inline int ps_pkt_id( block_t *p_pkt )
 {
     if( p_pkt->p_buffer[3] == 0xbd &&
         p_pkt->i_buffer >= 9 &&
-        p_pkt->i_buffer >= 9 + p_pkt->p_buffer[8] )
+        p_pkt->i_buffer >= 9 + (size_t)p_pkt->p_buffer[8] )
     {
         /* VOB extension */
         return 0xbd00 | p_pkt->p_buffer[9+p_pkt->p_buffer[8]];

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index e52993992106881a27430c3cf9e3e23a28a5105a..508a42cbd68994286ea573522551e91bfaac9c20 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -182,7 +182,11 @@ static int Open ( vlc_object_t *p_this )
         }
     }
 
-    asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path );
+    if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
     i_len = strlen( psz_vobname );
     if( i_len >= 4 ) memcpy( psz_vobname + i_len - 4, ".sub", 4 );