vlc/vlc-1.1 | branch: master | Rémi Duraffort <[email protected]> | Wed Aug 18 22:29:14 2010 +0200| [0ace3b6403f0b367003a7e20099de61093438e9c] | committer: Rémi Duraffort
osd_simple: fix a potential null-deref (can only be triggered when OOM). (cherry picked from commit 3b98bdf8955176015dd51233cd1d9228ab625d66) Signed-off-by: Rémi Duraffort <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=0ace3b6403f0b367003a7e20099de61093438e9c --- modules/misc/osd/simple.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/misc/osd/simple.c b/modules/misc/osd/simple.c index f769242..f8ea4b7 100644 --- a/modules/misc/osd/simple.c +++ b/modules/misc/osd/simple.c @@ -504,7 +504,7 @@ int osd_parser_simpleOpen( vlc_object_t *p_this ) return VLC_SUCCESS; error: - msg_Err( p_menu, "parsing file failed (returned %d)", result ); + msg_Err( p_this, "parsing file failed (returned %d)", result ); if( p_menu ) osd_MenuFree( p_menu ); fclose( fd ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
