Re: unicode bug about using tortoisemerge to patch

On 29.09.2011 18:36, George Panda wrote:
> Hi, there
>
> I have the nightly build version of TortoiseSVN (r21969), while using
> TortoiseMerge to patch file, I found a bug.
>
> If the source file contains a line starting with ASCII text and
> following are chinese text, after applying the patch, chinese text are
> replaced with NUL characters in that line.
>
> I debug it a little, in file *src/Utils/UnicodeUtils.cpp*, at L33,
> function*char * CUnicodeUtils:: UTF16ToUTF8 (const wchar_t * source,
> size_t size, char * target)* does not properly handle this situation.
> I'm sorry I cannot provide a fix as I am not good at c++.
>
> The attachments are source and patch file used in the debug.

Thanks for the detailed report and the test files!

Fixed in r22041.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2847946
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].