Skip to content
Permalink
Browse files

Fix minor memory leak (Android)

  • Loading branch information
Zeno- committed Feb 27, 2015
1 parent 14f7df9 commit 338e66af5f0a645e5d161ca83d048b27c3095165
Showing with 10 additions and 5 deletions.
  1. +10 −5 src/util/string.cpp
@@ -40,6 +40,7 @@ static bool parseHexColorString(const std::string &value, video::SColor &color);
static bool parseNamedColorString(const std::string &value, video::SColor &color);

#ifdef __ANDROID__

const wchar_t* wide_chars =
L" !\"#$%&'()*+,-./0123456789:;<=>?@"
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
@@ -62,14 +63,18 @@ int wctomb(char *s, wchar_t wc)

int mbtowc(wchar_t *pwc, const char *s, size_t n)
{
if (s == NULL || *s == '\0')
return -1;

const wchar_t *tmp = narrow_to_wide_c(s);
bool success = tmp[0] != '\0';

if (tmp[0] != '\0') {
if (success)
*pwc = tmp[0];
return 1;
} else {
return -1;
}

delete tmp;

return success ? 1 : -1;
}

// You must free the returned string!

0 comments on commit 338e66a

Please sign in to comment.