From c5353ed5ef49668a1349ccad3bfaf918087e84f6 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Wed, 2 Apr 2014 01:45:23 +0900
Subject: [PATCH] Added UTF-8 check when constructing a String from a char.

---
 taglib/toolkit/tstring.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 3367f41e..490a4277 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -156,11 +156,6 @@ public:
   {
   }
 
-  StringPrivate(size_t n, wchar_t c)
-    : data(new std::wstring(n, c))
-  {
-  }
-
   /*!
    * Stores string in UTF-16. The byte order depends on the CPU endian.
    */
@@ -239,14 +234,18 @@ String::String(wchar_t c, Type t)
   if(t == UTF16 || t == UTF16BE || t == UTF16LE)
     copyFromUTF16(&c, 1, t);
   else {
-    debug("String::String() -- A const wchar_t should not contain Latin1 or UTF-8.");
+    debug("String::String() -- A wchar_t should not contain Latin1 or UTF-8.");
   }
 }
 
 String::String(char c, Type t)
-  : d(new StringPrivate(1, static_cast<uchar>(c)))
+  : d(new StringPrivate())
 {
-  if(t != Latin1 && t != UTF8) {
+  if(t == Latin1)
+    copyFromLatin1(&c, 1);
+  else if(t == String::UTF8)
+    copyFromUTF8(&c, 1);
+  else {
     debug("String::String() -- A char should not contain UTF16.");
   }
 }