Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-03 22:19:07 +02:00
Code Issues Releases Wiki Activity

Bug 421 - Crash importing malformed MP3 file using libmad

Browse Source 
This adds LAME tag handling and bad MP3 detection, but
it's pretty much a complete rewrite, so plenty of testing
is needed.
This commit is contained in:
Leland Lucius 2020-05-23 22:03:41 -05:00
parent 8ce72748bf
commit 35e88d995b
2 changed files with 793 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/import/Import.cpp
View File

@ -578,24 +578,6 @@ bool Importer::Import( AudacityProject &project,
{ {
if (plugin->SupportsExtension(extension)) if (plugin->SupportsExtension(extension))
{ {
// If libmad is accidentally fed a wav file which has been incorrectly
// given an .mp3 extension then it can choke on the contents and crash.
// To avoid this, put libsndfile ahead of libmad in the lists created for
// mp3 files, or for any of the extensions supported by libmad.
// A genuine .mp3 file will first fail an attempted import with libsndfile
// but then get processed as desired by libmad.
// But a wav file which bears an incorrect .mp3 extension will be successfully
// processed by libsndfile and thus avoid being submitted to libmad.
if (plugin->GetPluginStringID() == wxT("libmad"))
{
// Make sure libsndfile is not already in the list
if (importPlugins.end() ==
std::find(importPlugins.begin(), importPlugins.end(), libsndfilePlugin))
{
wxLogDebug(wxT("Appending %s"),libsndfilePlugin->GetPluginStringID());
importPlugins.push_back(libsndfilePlugin);
}
}
wxLogDebug(wxT("Appending %s"),plugin->GetPluginStringID()); wxLogDebug(wxT("Appending %s"),plugin->GetPluginStringID());
importPlugins.push_back(plugin); importPlugins.push_back(plugin);
} }
@ -608,15 +590,12 @@ bool Importer::Import( AudacityProject &project,
// formats unsuitable for it, and produce distorted results. // formats unsuitable for it, and produce distorted results.
for (const auto &plugin : sImportPluginList()) for (const auto &plugin : sImportPluginList())
{ {
if (!(plugin->GetPluginStringID() == wxT("libmad"))) // Make sure its not already in the list
if (importPlugins.end() ==
std::find(importPlugins.begin(), importPlugins.end(), plugin))
{ {
// Make sure its not already in the list wxLogDebug(wxT("Appending %s"),plugin->GetPluginStringID());
if (importPlugins.end() == importPlugins.push_back(plugin);
std::find(importPlugins.begin(), importPlugins.end(), plugin))
{
wxLogDebug(wxT("Appending %s"),plugin->GetPluginStringID());
importPlugins.push_back(plugin);
}
} }
} }

1118
src/import/ImportMP3.cpp
View File

File diff suppressed because it is too large Load Diff