aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2013-09-24 16:01:10 -0700
committerjmarshallnz <jcmarsha@gmail.com>2013-09-24 16:01:10 -0700
commit7f452883195f672f5237afbce8de09bd642ea72a (patch)
treeb3d06236b348d32507aaecd565172d87ee04288c
parent7b22691ff76e46f8ea326062a595ffad439bb472 (diff)
parentd273c32467651741033549ff2e4700232ed1a066 (diff)
Merge pull request #3321 from Karlson2k/charsetconverter_fix_01
CharsetConverter: fix for logicalToVisualBiDi
-rw-r--r--xbmc/utils/CharsetConverter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/xbmc/utils/CharsetConverter.cpp b/xbmc/utils/CharsetConverter.cpp
index 9b098d2fe6..b7b15104d2 100644
--- a/xbmc/utils/CharsetConverter.cpp
+++ b/xbmc/utils/CharsetConverter.cpp
@@ -299,6 +299,8 @@ static bool logicalToVisualBiDi(const std::string& stringSrc, std::string& strin
for (size_t i = 0; i < numLines; i++)
{
int sourceLen = lines[i].length();
+ if (sourceLen == 0)
+ continue;
// Convert from the selected charset to Unicode
FriBidiChar* logical = (FriBidiChar*) malloc((sourceLen + 1) * sizeof(FriBidiChar));