From e82fcf9549052de8ed77a448abd274f93b3c63dc Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 24 Jan 2018 12:35:22 -0500 Subject: [PATCH] From Raphael Marinier: Fix Linux crash importing bad .wav file... ... A mistaken, unneeded change of a vsprintf format string caused a crashing misinterpretation of a format argument; just writing errors to log. --- src/FFmpeg.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 3c4c0e706..86b9f3f94 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -140,11 +140,7 @@ void av_log_wx_callback(void* ptr, int level, const char* fmt, va_list vl) #if defined(__WXMSW__) frm.Replace(wxT("%t"),wxT("%i"),true); //TODO: on Windows vprintf won't handle %t, and probably some others. Investigate. #endif -#if defined(wxUSE_UNICODE) - // String comes with %s format field and a value in value list is ascii char*. Thus in Unicode configurations - // we have to convert %s to %S. - frm.Replace(wxT("%s"),wxT("%S"),true); -#endif + printstring.Append(wxString::FormatV(frm,vl)); wxString cpt; switch (level)