diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 21:18:18 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 21:18:18 +0000 |
| commit | d207d3a5415dd3d980b7f2e40ec656587b052b48 (patch) | |
| tree | fd1718f3d4cd329fc7938826419221987bdec08d | |
| parent | ff08296e54662eb32b122e656ef270d450d3754c (diff) | |
| download | xine-lib-d207d3a5415dd3d980b7f2e40ec656587b052b48.tar.gz xine-lib-d207d3a5415dd3d980b7f2e40ec656587b052b48.tar.bz2 | |
Fix the strcpy calls, backport from upstream.
CVS patchset: 8302
CVS date: 2006/09/26 21:18:18
| -rw-r--r-- | src/input/vcd/libvcd/files.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/vcd/libvcd/files.c b/src/input/vcd/libvcd/files.c index 82d28eaf7..38780edf0 100644 --- a/src/input/vcd/libvcd/files.c +++ b/src/input/vcd/libvcd/files.c @@ -1,5 +1,5 @@ /* - $Id: files.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $ + $Id: files.c,v 1.4 2006/09/26 21:18:18 dgp85 Exp $ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org> @@ -46,7 +46,7 @@ #include "pbc.h" #include "util.h" -static const char _rcsid[] = "$Id: files.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $"; +static const char _rcsid[] = "$Id: files.c,v 1.4 2006/09/26 21:18:18 dgp85 Exp $"; inline static bool _pal_p (const struct vcd_mpeg_stream_vid_info *_info) @@ -470,7 +470,7 @@ set_tracks_svd_v30 (VcdObj *obj, void *buf) int n; strncpy (tracks_svd->file_id, TRACKS_SVD_FILE_ID, - sizeof (TRACKS_SVD_FILE_ID)); + sizeof (TRACKS_SVD_FILE_ID)-1); tracks_svd->version = TRACKS_SVD_VERSION; tracks_svd->tracks = _cdio_list_length (obj->mpeg_track_list); @@ -531,7 +531,7 @@ set_tracks_svd (VcdObj *obj, void *buf) vcd_assert (sizeof (SVDTrackContent) == 1); - strncpy (tracks_svd1->file_id, TRACKS_SVD_FILE_ID, sizeof (TRACKS_SVD_FILE_ID)); + strncpy (tracks_svd1->file_id, TRACKS_SVD_FILE_ID, sizeof (TRACKS_SVD_FILE_ID)-1); tracks_svd1->version = TRACKS_SVD_VERSION; tracks_svd1->tracks = _cdio_list_length (obj->mpeg_track_list); @@ -720,7 +720,7 @@ set_search_dat (VcdObj *obj, void *buf) memset (&search_dat, 0, sizeof (search_dat)); - strncpy (search_dat.file_id, SEARCH_FILE_ID, sizeof (SEARCH_FILE_ID)); + strncpy (search_dat.file_id, SEARCH_FILE_ID, sizeof (SEARCH_FILE_ID)-1); search_dat.version = SEARCH_VERSION; search_dat.scan_points = uint16_to_be (_get_scanpoint_count (obj)); @@ -855,7 +855,7 @@ set_scandata_dat (VcdObj *obj, void *buf) /* memset (buf, 0, get_scandata_dat_size (obj)); */ /* struct 1 */ - strncpy (scandata_dat1->file_id, SCANDATA_FILE_ID, sizeof (SCANDATA_FILE_ID)); + strncpy (scandata_dat1->file_id, SCANDATA_FILE_ID, sizeof (SCANDATA_FILE_ID)-1); scandata_dat1->version = SCANDATA_VERSION_SVCD; scandata_dat1->reserved = 0x00; |