# HG changeset patch # User reimar # Date 1286996204 0 # Node ID 69fb7b91bf760e5d8dfef1f8dd54d89733c3baa3 # Parent 83d15532e9047ad08a842df3749f6ccbd930d2d4 Replace snprintf by av_strlcpy. Patch by Frdric Marchal [fmarchal perso be]. diff -r 83d15532e904 -r 69fb7b91bf76 gui/mplayer/gtk/gtk_menu.c --- a/gui/mplayer/gtk/gtk_menu.c Wed Oct 13 18:38:50 2010 +0000 +++ b/gui/mplayer/gtk/gtk_menu.c Wed Oct 13 18:56:44 2010 +0000 @@ -533,7 +533,7 @@ AddMenuItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_MENU_None,( (unsigned short)-1 << 16 ) + evSetDVDSubtitle ); for ( i=0;i < guiIntfStruct.DVD.nr_of_subtitles;i++ ) { - snprintf( tmp,64,"%s",GetLanguage( guiIntfStruct.DVD.subtitles[i].language ) ); + av_strlcpy( tmp,GetLanguage( guiIntfStruct.DVD.subtitles[i].language ),sizeof(tmp) ); AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,tmp, dvdsub_id == guiIntfStruct.DVD.subtitles[i].id, ( guiIntfStruct.DVD.subtitles[i].id << 16 ) + evSetDVDSubtitle ); diff -r 83d15532e904 -r 69fb7b91bf76 stream/librtsp/rtsp_rtp.c --- a/stream/librtsp/rtsp_rtp.c Wed Oct 13 18:38:50 2010 +0000 +++ b/stream/librtsp/rtsp_rtp.c Wed Oct 13 18:56:44 2010 +0000 @@ -218,7 +218,7 @@ len = strlen (parse1) - strlen (parse2) - strlen (RTSP_SETUP_DESTINATION) + 1; dest = (char *) malloc (len + 1); - snprintf (dest, len, parse1 + strlen (RTSP_SETUP_DESTINATION)); + av_strlcpy (dest, parse1 + strlen (RTSP_SETUP_DESTINATION), len); free (line_copy); return dest;