Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

fix for P2 Metadata in imported files can cause the .aup to store unhandled characters.

Browse Source
This commit is contained in:
mchinen 2010-04-24 20:54:39 +00:00
parent 41dc1f2f6c
commit 635931c6be
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xml/XMLWriter.cpp
View File

@ -34,6 +34,16 @@ the general functionality for creating XML in UTF8 encoding.
#include "XMLWriter.h"
#include "XMLTagHandler.h"
#include "../../lib-src/expat/xmltok/xmltok_impl.h"
static int charXMLCompatiblity[] =
{
#define BT_COLON BT_NMSTRT
#include "../../lib-src/expat/xmltok/asciitab.h"
#undef BT_COLON
#include "../../lib-src/expat/xmltok/latin1tab.h"
};
///
/// XMLWriter base class
///
@ -274,7 +284,14 @@ wxString XMLWriter::XMLEsc(const wxString & s)
default:
if (!wxIsprint(c)) {
result += wxString::Format(wxT("&#x%04x;"), c);
//ignore several characters such ase eot (0x04) and stx (0x02) because it makes expat parser bail
//see xmltok.c in expat checkCharRefNumber() to see how expat bails on these chars.
//also see lib-src/expat/xmltok/asciitab.h to see which characters are nonxml compatible post decode
//(we can still encode '&' and '<' with this table, but it prevents us from encoding eot)
//the table only goes up to 0x7F, so we don't check higher than this.
//this assumes that c as ascii compatible, which utf8 is.
if(c> 0x7F || charXMLCompatiblity[c]!=BT_NONXML)
result += wxString::Format(wxT("&#x%04x;"), c);
}
else {
result += c;