diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2003-12-10 00:54:25 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2003-12-10 00:54:25 +0000 |
| commit | 17c0d3aed1f09676ee97da972e01e7dfa35a97b6 (patch) | |
| tree | fd1632d715720da8b8d9f2610ccd28f0defea5bf /src/demuxers/demux_ogg.c | |
| parent | 31aa4a19da2de6bf3299d64a73bc2a1d39a0474a (diff) | |
| download | xine-lib-17c0d3aed1f09676ee97da972e01e7dfa35a97b6.tar.gz xine-lib-17c0d3aed1f09676ee97da972e01e7dfa35a97b6.tar.bz2 | |
- remove XINE_LANG_LABEL_MAX_SIZE, there's already XINE_LANG_MAX for that
- make sure that the strings copied with strncpy are null-terminated
- fix HAVE_STDLIB_H warning compiling the MNG demuxer
CVS patchset: 5883
CVS date: 2003/12/10 00:54:25
Diffstat (limited to 'src/demuxers/demux_ogg.c')
| -rw-r--r-- | src/demuxers/demux_ogg.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index fd68d0a89..59d410b9c 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.123 2003/12/09 23:55:11 hadess Exp $ + * $Id: demux_ogg.c,v 1.124 2003/12/10 00:54:26 hadess Exp $ * * demultiplexer for ogg streams * @@ -1585,10 +1585,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if (this->buf_types[stream_num]==BUF_SPU_OGM+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } @@ -1604,10 +1605,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if ((this->buf_types[stream_num]&0xFF00001F)==BUF_AUDIO_BASE+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } |