[vlc-commits] commit: Pessimist FromLocale(), fix invalid free at the end ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sat May 29 22:45:55 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 29 23:44:40 2010 +0300| [8b516a73881685b94cfce1f8c0c0858ede8dfc1c] | committer: Rémi Denis-Courmont 

Pessimist FromLocale(), fix invalid free at the end

This is a waste of time on UTF-8 system, but it fixes a crash on legacy
ones.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b516a73881685b94cfce1f8c0c0858ede8dfc1c
---

 bin/vlc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 447b808..d82ae8b 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -157,8 +157,8 @@ int main( int i_argc, const char *ppsz_argv[] )
     const char *argv[i_argc + 4];
     int argc = 0;
 
-    argv[argc++] = "--no-ignore-config";
-    argv[argc++] = "--user-agent=\"VLC media player\"";
+    argv[argc++] = FromLocale ("--no-ignore-config");
+    argv[argc++] = FromLocale ("--user-agent=\"VLC media player\"");
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif



More information about the vlc-commits mailing list