[llvm] r201811 - [Support] Correctly handle zero length inputs to UTF conversion functions on Windows.

[Rafael Espíndola]

Is this testable? What was the issue, returning an error on every empty string?

On 20 February 2014 15:46, Michael J. Spencer <bigcheesegs at gmail.com> wrote:
> Author: mspencer
> Date: Thu Feb 20 14:46:23 2014
> New Revision: 201811
>
> URL: http://llvm.org/viewvc/llvm-project?rev=201811&view=rev
> Log:
> [Support] Correctly handle zero length inputs to UTF conversion functions on Windows.
>
> Modified:
>     llvm/trunk/lib/Support/Windows/Path.inc
>
> Modified: llvm/trunk/lib/Support/Windows/Path.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Path.inc?rev=201811&r1=201810&r2=201811&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Windows/Path.inc (original)
> +++ llvm/trunk/lib/Support/Windows/Path.inc Thu Feb 20 14:46:23 2014
> @@ -1040,22 +1040,22 @@ bool home_directory(SmallVectorImpl<char
>  namespace windows {
>  llvm::error_code UTF8ToUTF16(llvm::StringRef utf8,
>                               llvm::SmallVectorImpl<wchar_t> &utf16) {
> -  int len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
> -                                  utf8.begin(), utf8.size(),
> -                                  utf16.begin(), 0);
> -
> -  if (len == 0)
> -    return llvm::windows_error(::GetLastError());
> -
> -  utf16.reserve(len + 1);
> -  utf16.set_size(len);
> -
> -  len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
> -                              utf8.begin(), utf8.size(),
> -                              utf16.begin(), utf16.size());
> -
> -  if (len == 0)
> -    return llvm::windows_error(::GetLastError());
> +  if (!utf8.empty()) {
> +    int len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8.begin(),
> +                                    utf8.size(), utf16.begin(), 0);
> +
> +    if (len == 0)
> +      return llvm::windows_error(::GetLastError());
> +
> +    utf16.reserve(len + 1);
> +    utf16.set_size(len);
> +
> +    len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8.begin(),
> +                                utf8.size(), utf16.begin(), utf16.size());
> +
> +    if (len == 0)
> +      return llvm::windows_error(::GetLastError());
> +  }
>
>    // Make utf16 null terminated.
>    utf16.push_back(0);
> @@ -1066,26 +1066,24 @@ llvm::error_code UTF8ToUTF16(llvm::Strin
>
>  llvm::error_code UTF16ToUTF8(const wchar_t *utf16, size_t utf16_len,
>                               llvm::SmallVectorImpl<char> &utf8) {
> -  // Get length.
> -  int len = ::WideCharToMultiByte(CP_UTF8, 0,
> -                                  utf16, utf16_len,
> -                                  utf8.begin(), 0,
> -                                  NULL, NULL);
> -
> -  if (len == 0)
> -    return llvm::windows_error(::GetLastError());
> -
> -  utf8.reserve(len);
> -  utf8.set_size(len);
> -
> -  // Now do the actual conversion.
> -  len = ::WideCharToMultiByte(CP_UTF8, 0,
> -                              utf16, utf16_len,
> -                              utf8.data(), utf8.size(),
> -                              NULL, NULL);
> -
> -  if (len == 0)
> -    return llvm::windows_error(::GetLastError());
> +  if (utf16_len) {
> +    // Get length.
> +    int len = ::WideCharToMultiByte(CP_UTF8, 0, utf16, utf16_len, utf8.begin(),
> +                                    0, NULL, NULL);
> +
> +    if (len == 0)
> +      return llvm::windows_error(::GetLastError());
> +
> +    utf8.reserve(len);
> +    utf8.set_size(len);
> +
> +    // Now do the actual conversion.
> +    len = ::WideCharToMultiByte(CP_UTF8, 0, utf16, utf16_len, utf8.data(),
> +                                utf8.size(), NULL, NULL);
> +
> +    if (len == 0)
> +      return llvm::windows_error(::GetLastError());
> +  }
>
>    // Make utf8 null terminated.
>    utf8.push_back(0);
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits