diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_ogg.c | 10 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index dc1d85ab2..751687f28 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.128 2003/12/23 21:22:38 miguelfreitas Exp $ + * $Id: demux_ogg.c,v 1.129 2003/12/26 16:13:21 mroi Exp $ * * demultiplexer for ogg streams * @@ -1569,6 +1569,10 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, if (this->language[stream_num]) { strncpy (str, this->language[stream_num], XINE_LANG_MAX); str[XINE_LANG_MAX - 1] = '\0'; + if (strlen(this->language[stream_num]) >= XINE_LANG_MAX) + /* the string got truncated */ + str[XINE_LANG_MAX - 2] = str[XINE_LANG_MAX - 3] = str[XINE_LANG_MAX - 4] = '.'; + /* TODO: provide long version in XINE_META_INFO_FULL_LANG */ return DEMUX_OPTIONAL_SUCCESS; } else { snprintf(str, XINE_LANG_MAX, "channel %d",channel); @@ -1589,6 +1593,10 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, if (this->language[stream_num]) { strncpy (str, this->language[stream_num], XINE_LANG_MAX); str[XINE_LANG_MAX - 1] = '\0'; + if (strlen(this->language[stream_num]) >= XINE_LANG_MAX) + /* the string got truncated */ + str[XINE_LANG_MAX - 2] = str[XINE_LANG_MAX - 3] = str[XINE_LANG_MAX - 4] = '.'; + /* TODO: provide long version in XINE_META_INFO_FULL_LANG */ return DEMUX_OPTIONAL_SUCCESS; } else { snprintf(str, XINE_LANG_MAX, "channel %d",channel); diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 4e60ce84e..11031882c 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.178 2003/12/14 22:13:23 siggi Exp $ + * $Id: input_dvd.c,v 1.179 2003/12/26 16:13:21 mroi Exp $ * */ @@ -1215,6 +1215,7 @@ static int dvd_plugin_get_optional_data (input_plugin_t *this_gen, if(lang != 0xffff) sprintf(data, " %c%c", lang >> 8, lang & 0xff); + /* TODO: provide long version in XINE_META_INFO_FULL_LANG */ else sprintf(data, " %c%c", '?', '?'); return INPUT_OPTIONAL_SUCCESS; @@ -1256,6 +1257,7 @@ static int dvd_plugin_get_optional_data (input_plugin_t *this_gen, if(lang != 0xffff) sprintf(data, " %c%c", lang >> 8, lang & 0xff); + /* TODO: provide long version in XINE_META_INFO_FULL_LANG */ else sprintf(data, " %c%c", '?', '?'); return INPUT_OPTIONAL_SUCCESS; @@ -1734,6 +1736,10 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.179 2003/12/26 16:13:21 mroi + * * cure the ABI breakage: XINE_LANG_MAX cannot be increased + * * add TODO items to provide a better solution + * * Revision 1.178 2003/12/14 22:13:23 siggi * API version bounce * |