diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-01-07 13:28:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-01-07 13:28:42 +0000 |
| commit | 8197ba8d9bce744ba6a88df0b75a705f4465a0e2 (patch) | |
| tree | 13e324b6974591809338bc88d10623128b67e38d | |
| parent | cdaff761f7259e9a0bafa349257abf538afe4b9f (diff) | |
STR #2505: Fixed double string conversion.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8211 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/fl_font_xft.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index 9d3ab73f1..08953e95b 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -374,8 +374,10 @@ static const wchar_t *utf8reformat(const char *str, int& n) lbuf = newn + 100; if (buffer) free(buffer); buffer = (wchar_t*)malloc(lbuf * sizeof(wchar_t)); - } - n = fl_utf8towc(str, n, (wchar_t*)buffer, lbuf); + n = fl_utf8towc(str, n, (wchar_t*)buffer, lbuf); + } else { + n = newn; + } return buffer; } |