mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-10 15:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of empty strings for encodings conversions (#11897)

Browse Source 
(cherry picked from commit f34ae81971)
This commit is contained in:
amzak
2019-08-07 20:56:42 +03:00
committed by narimiran
parent deb8d2f81a
commit c95f12699b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/pure/encodings.nim
View File

@@ -325,10 +325,6 @@ proc close*(c: EncodingConverter) =
when defined(windows):
proc convertToWideString(codePage: CodePage, s: string): string =
# special case: empty string: needed because MultiByteToWideChar
# return 0 in case of error
if s.len == 0: return ""
# educated guess of capacity:
var cap = s.len + s.len shr 2
result = newString(cap*2)
@@ -396,6 +392,9 @@ when defined(windows):
assert(false) # cannot happen
proc convertWin(codePageFrom: CodePage, codePageTo: CodePage, s: string): string =
# special case: empty string: needed because MultiByteToWideChar, WideCharToMultiByte
# return 0 in case of error
if s.len == 0: return ""
# multiByteToWideChar does not support encoding from code pages below
let unsupported = [1201, 12000, 12001]
@@ -529,4 +528,13 @@ when not defined(testing) and isMainModule and defined(windows):
block should_convert_from_utf8_to_utf16:
let original = "\xd1\x82\xd0\xb5\xd1\x81\xd1\x82" # utf-8 test string "тест"
let result = convert(original, "utf-16", "utf-8")
doAssert(result == "\x42\x04\x35\x04\x41\x04\x42\x04")
doAssert(result == "\x42\x04\x35\x04\x41\x04\x42\x04")
block should_handle_empty_string_for_any_conversion:
let original = ""
var result = convert(original, "utf-16", "utf-8")
doAssert(result == "")
result = convert(original, "utf-8", "utf-16")
doAssert(result == "")
result = convert(original, "windows-1251", "koi8-r")
doAssert(result == "")