4faef28cc5
-----BEGIN PGP SIGNATURE----- iQJEBAABCAAuFiEEA5IzWngIOJSkMBxDI26KWMbbRRIFAlkaFL0QHG1heEBtdXNp Y3BkLm9yZwAKCRAjbopYxttFEr4ID/9iAQC+7fFv06uLOm48Ufu+PgoD8uJkAwF5 QuLQkc85g9urn+bu9N7Qs7Vypp7aLyGcJKY0jyA8wxkOj24pUC3GYk80daUt561V 5s20FnoS/Uoman3CSJL94IfCUBxejizE6vgIIHTc5bb6U0qIsPub/8JTTE2Ih7uP nvFZ5uBQ+YTc7at+iIH9123eUMKkitkh8osNblovqQT9v42++Tm4ztAytRHBjwUA Itew5HhlvahbLKqFs/7vmICh/YX1FcOV7cV+erEWYfkH0KCI2bhSle4u2d0CBOvD VJlDnBCo9bM7WKcPYqJiFFFXA0CRk06wbkkkAtwF4zjp8xos7aQcq4FyQnYL8KXo 5lijIhRwBURBd+nt8oA9kuEhBt/T75otcemJkzVaYappHTJCLjhxSGcPt8mw+nE9 9WQzsp/MIVzg9l5g3D9S/43xM7uhvn98Tn1Qf2s8YRd2o8CZeOhW+X3RvbCvVPv2 mOlx4sFAv8DOJ3KxMdqiJT+PmylPyJluQdqH+tMc8BdPg/kpSpYIPTuSjjRqK1yh ld5do0HtAAwiHtvXfk5YVFjJSpO0c8yVn6xci2Cl4k/5ZHj2UE1ln+N5vCea2BRF 2J3HAjROwtcwY3lU1jFnEAogf24KWiFJqhhC0EqBGUdlrM8Dn37P5cEWWjROIMNK lPEdovokNw== =CdDy -----END PGP SIGNATURE----- Merge tag 'v0.20.7' release v0.20.7
138 lines
3.2 KiB
C++
138 lines
3.2 KiB
C++
/*
|
|
* Copyright 2003-2017 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "FixString.hxx"
|
|
#include "util/Alloc.hxx"
|
|
#include "util/WritableBuffer.hxx"
|
|
#include "util/StringView.hxx"
|
|
#include "util/UTF8.hxx"
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
|
|
gcc_pure
|
|
static const char *
|
|
FindInvalidUTF8(const char *p, const char *const end) noexcept
|
|
{
|
|
while (p < end) {
|
|
const size_t s = SequenceLengthUTF8(*p);
|
|
if (p + s > end)
|
|
/* partial sequence at end of string */
|
|
return p;
|
|
|
|
/* now call the other SequenceLengthUTF8() overload
|
|
which also validates the continuations */
|
|
const size_t t = SequenceLengthUTF8(p);
|
|
if (t == 0)
|
|
return p;
|
|
assert(s == t);
|
|
|
|
p += s;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/**
|
|
* Replace invalid sequences with the question mark.
|
|
*/
|
|
static WritableBuffer<char>
|
|
patch_utf8(StringView src, const char *_invalid)
|
|
{
|
|
/* duplicate the string, and replace invalid bytes in that
|
|
buffer */
|
|
char *dest = (char *)xmemdup(src.data, src.size);
|
|
char *const end = dest + src.size;
|
|
|
|
char *invalid = dest + (_invalid - src.data);
|
|
do {
|
|
*invalid = '?';
|
|
|
|
const char *__invalid = FindInvalidUTF8(invalid + 1, end);
|
|
invalid = const_cast<char *>(__invalid);
|
|
} while (invalid != nullptr);
|
|
|
|
return { dest, src.size };
|
|
}
|
|
|
|
static WritableBuffer<char>
|
|
fix_utf8(StringView p)
|
|
{
|
|
/* check if the string is already valid UTF-8 */
|
|
const char *invalid = FindInvalidUTF8(p.begin(), p.end());
|
|
if (invalid == nullptr)
|
|
return nullptr;
|
|
|
|
/* no, broken - patch invalid sequences */
|
|
return patch_utf8(p, invalid);
|
|
}
|
|
|
|
static bool
|
|
char_is_non_printable(unsigned char ch)
|
|
{
|
|
return ch < 0x20;
|
|
}
|
|
|
|
static const char *
|
|
find_non_printable(StringView p)
|
|
{
|
|
for (const char &ch : p)
|
|
if (char_is_non_printable(ch))
|
|
return &ch;
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/**
|
|
* Clears all non-printable characters, convert them to space.
|
|
* Returns nullptr if nothing needs to be cleared.
|
|
*/
|
|
static WritableBuffer<char>
|
|
clear_non_printable(StringView src)
|
|
{
|
|
const char *first = find_non_printable(src);
|
|
if (first == nullptr)
|
|
return nullptr;
|
|
|
|
char *dest = (char *)xmemdup(src.data, src.size);
|
|
|
|
for (size_t i = first - src.data; i < src.size; ++i)
|
|
if (char_is_non_printable(dest[i]))
|
|
dest[i] = ' ';
|
|
|
|
return { dest, src.size };
|
|
}
|
|
|
|
WritableBuffer<char>
|
|
FixTagString(StringView p)
|
|
{
|
|
auto utf8 = fix_utf8(p);
|
|
if (!utf8.IsNull())
|
|
p = {utf8.data, utf8.size};
|
|
|
|
WritableBuffer<char> cleared = clear_non_printable(p);
|
|
if (cleared.IsNull())
|
|
cleared = utf8;
|
|
else
|
|
free(utf8.data);
|
|
|
|
return cleared;
|
|
}
|