[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-2-8-gb388ba2
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Thu Feb 26 23:25:51 UTC 2009
The following commit has been merged in the sid branch:
commit cf7471ea82d49fa5598d06a7f556e7c14866ca75
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Thu Feb 26 16:16:00 2009 +0100
Delete unused patches
diff --git a/debian/patches/408-CVE-2008-4686.diff b/debian/patches/408-CVE-2008-4686.diff
deleted file mode 100644
index edbb3f3..0000000
--- a/debian/patches/408-CVE-2008-4686.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nurad vlc-0.8.6.h.orig/modules/demux/ty.c vlc-0.8.6.h/modules/demux/ty.c
---- vlc-0.8.6.h.orig/modules/demux/ty.c 2008-11-01 14:10:36.000000000 +0100
-+++ vlc-0.8.6.h/modules/demux/ty.c 2008-11-01 14:19:52.000000000 +0100
-@@ -129,8 +129,8 @@
- mtime_t lastVideoPTS;
-
- ty_rec_hdr_t *rec_hdrs; /* record headers array */
-- int i_cur_rec; /* current record in this chunk */
-- int i_num_recs; /* number of recs in this chunk */
-+ unsigned i_cur_rec; /* current record in this chunk */
-+ unsigned i_num_recs; /* number of recs in this chunk */
- int i_seq_rec; /* record number where seq start is */
- vlc_bool_t eof;
- vlc_bool_t b_first_chunk;
-@@ -763,7 +763,7 @@
- {
- demux_sys_t *p_sys = p_demux->p_sys;
- int64_t seek_pos = p_sys->i_stream_size * seek_pct;
-- int i;
-+ unsigned i;
- long l_skip_amt;
-
- /* if we're not seekable, there's nothing to do */
-@@ -856,7 +856,8 @@
- /* =========================================================================== */
- static int get_chunk_header(demux_t *p_demux)
- {
-- int i_readSize, i_num_recs, i;
-+ uint32_t i, i_readSize;
-+ unsigned i_num_recs;
- uint8_t packet_header[4];
- uint8_t record_header[16];
- ty_rec_hdr_t *p_rec_hdr;
-@@ -914,7 +915,11 @@
- /* parse headers into array */
- if (p_sys->rec_hdrs)
- free(p_sys->rec_hdrs);
-- p_sys->rec_hdrs = malloc(i_num_recs * sizeof(ty_rec_hdr_t));
-+ p_sys->rec_hdrs = calloc(i_num_recs, sizeof(ty_rec_hdr_t));
-+ if(!p_sys->rec_hdrs){
-+ i_num_recs = 0;
-+ return;
-+ }
- for (i = 0; i < i_num_recs; i++)
- {
- i_readSize = stream_Read( p_demux->s, record_header, 16 );
diff --git a/debian/patches/409-cue-overflow.diff b/debian/patches/409-cue-overflow.diff
deleted file mode 100644
index fc3087c..0000000
--- a/debian/patches/409-cue-overflow.diff
+++ /dev/null
@@ -1,125 +0,0 @@
-From: Rémi Denis-Courmont <rdenis at simphalempin.com>
-Date: Tue, 4 Nov 2008 19:31:17 +0000 (+0200)
-Subject: Fix buffer overflow
-X-Git-Tag: 0.9.6~3
-X-Git-Url: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=commitdiff_plain;h=5f63f1562d43f32331006c2c1a61742de031b84d;hp=c486b8e603f4d49a86c4891511e4f99f85bba3b1
-
-Fix buffer overflow
-
-Pointed-out-by. Tobias Klein <tk at trapkit.de>
----
-
-Index: vlc-0.8.6.h/modules/access/vcd/cdrom.c
-===================================================================
---- vlc-0.8.6.h.orig/modules/access/vcd/cdrom.c 2008-05-25 20:28:57.000000000 +0200
-+++ vlc-0.8.6.h/modules/access/vcd/cdrom.c 2008-11-05 23:08:43.000000000 +0100
-@@ -835,6 +835,7 @@
- char *psz_vcdfile2 = NULL;
- char *psz_cuefile = NULL;
- FILE *cuefile = NULL;
-+ int *p_sectors = NULL;
- char line[1024];
-
- /* Check if we are dealing with a .cue file */
-@@ -880,7 +881,6 @@
- cuefile = utf8_fopen( psz_cuefile, "rt" );
- if( cuefile == NULL )
- {
-- i_ret = -1;
- msg_Dbg( p_this, "could not find .cue file" );
- goto error;
- }
-@@ -921,58 +921,56 @@
- }
-
- if( p_vcddev->i_vcdimage_handle == -1)
-- {
-- i_ret = -1;
- goto error;
-- }
-- else i_ret = 0;
-
- /* Try to parse the i_tracks and p_sectors info so we can just forget
- * about the cuefile */
-- if( i_ret == 0 )
-+ size_t i_tracks = 0;
-+
-+ while( fgets( line, 1024, cuefile ) )
- {
-- int p_sectors[100];
-- int i_tracks = 0;
-- int i_num;
-- char psz_dummy[10];
-+ /* look for a TRACK line */
-+ char psz_dummy[9];
-+ if( !sscanf( line, "%9s", psz_dummy ) || strcmp(psz_dummy, "TRACK") )
-+ continue;
-
-+ /* look for an INDEX line */
- while( fgets( line, 1024, cuefile ) )
- {
-- /* look for a TRACK line */
-- if( !sscanf( line, "%9s", psz_dummy ) ||
-- strcmp(psz_dummy, "TRACK") )
-- continue;
-+ int i_num, i_min, i_sec, i_frame;
-
-- /* look for an INDEX line */
-- while( fgets( line, 1024, cuefile ) )
-- {
-- int i_min, i_sec, i_frame;
-+ if( (sscanf( line, "%*9s %2u %2u:%2u:%2u", &i_num,
-+ &i_min, &i_sec, &i_frame ) != 4) || (i_num != 1) )
-+ continue;
-
-- if( (sscanf( line, "%9s %2u %2u:%2u:%2u", psz_dummy, &i_num,
-- &i_min, &i_sec, &i_frame ) != 5) || (i_num != 1) )
-- continue;
--
-- i_tracks++;
-- p_sectors[i_tracks - 1] = MSF_TO_LBA(i_min, i_sec, i_frame);
-- msg_Dbg( p_this, "vcd track %i begins at sector:%i",
-- i_tracks - 1, p_sectors[i_tracks - 1] );
-- break;
-- }
-+ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int));
-+ if (buf == NULL)
-+ goto error;
-+ p_sectors = buf;
-+ p_sectors[i_tracks] = MSF_TO_LBA(i_min, i_sec, i_frame);
-+ msg_Dbg( p_this, "vcd track %i begins at sector:%i",
-+ i_tracks, p_sectors[i_tracks] );
-+ i_tracks++;
-+ break;
- }
--
-- /* fill in the last entry */
-- p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END)
-- / VCD_SECTOR_SIZE;
-- msg_Dbg( p_this, "vcd track %i, begins at sector:%i",
-- i_tracks, p_sectors[i_tracks] );
-- p_vcddev->i_tracks = i_tracks;
-- p_vcddev->p_sectors = malloc( (i_tracks + 1) * sizeof(int) );
-- memcpy( p_vcddev->p_sectors, p_sectors, (i_tracks + 1) * sizeof(int) );
--
- }
-
-+ /* fill in the last entry */
-+ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int));
-+ if (buf == NULL)
-+ goto error;
-+ p_sectors = buf;
-+ p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END)
-+ / VCD_SECTOR_SIZE;
-+ msg_Dbg( p_this, "vcd track %i, begins at sector:%i",
-+ i_tracks, p_sectors[i_tracks] );
-+ p_vcddev->i_tracks = ++i_tracks;
-+ p_vcddev->p_sectors = p_sectors;
-+ i_ret = 0;
-+
- error:
- if( cuefile ) fclose( cuefile );
-+ free( p_sectors );
- if( psz_cuefile ) free( psz_cuefile );
- if( psz_vcdfile ) free( psz_vcdfile );
-
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list