mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

xmlinterface: fix broken to_utf8() algorithm

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc5d6b739b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-28 (Sun, 28 Jan 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2018-01-28 20:34:23 +01:00
committed by vanhofen
parent 62d6d7e342
commit 67047b866f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/xmltree/xmlinterface.cpp
View File

@@ -4,6 +4,7 @@
* xmlinterface for zapit - d-box2 linux project * xmlinterface for zapit - d-box2 linux project
* *
* (C) 2002 by thegoodguy <thegoodguy@berlios.de> * (C) 2002 by thegoodguy <thegoodguy@berlios.de>
* (C) 2009, 2018 Stefan Seyfried
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -74,6 +75,7 @@ xmlNodePtr xmlGetNextOccurence(xmlNodePtr cur, const char * s)
#if USE_PUGIXML #if USE_PUGIXML
std::string to_utf8(unsigned int cp) std::string to_utf8(unsigned int cp)
{ {
static const int mask[4] = { 0, 0xc0, 0xe0, 0xf0 };
std::string result; std::string result;
int count; int count;
if (cp < 0x0080) if (cp < 0x0080)
@@ -86,18 +88,16 @@ std::string to_utf8(unsigned int cp)
count = 4; count = 4;
else else
return result; return result;
result.resize(count); result.resize(count);
for (int i = count-1; i > 0; --i) for (int i = count-1; i > 0; --i)
{ {
result[i] = (char) (0x80 | (cp & 0x3F)); result[i] = (char) (0x80 | (cp & 0x3F));
cp >>= 6; cp >>= 6;
} }
for (int i = 0; i < count; ++i) cp |= mask[count-1];
cp |= (1 << (7-i));
result[0] = (char) cp; result[0] = (char) cp;
return result; return result;
} }
#endif #endif
std::string Unicode_Character_to_UTF8(const int character) std::string Unicode_Character_to_UTF8(const int character)