Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify some fish_tests code

Browse source 
This came to my attention because cppcheck was warning about possibly
dereferncing a NULL pointer.
This commit is contained in:
Kurtis Rader 2016-05-30 17:31:41 -07:00
parent 2768d2ea06
commit 3d74b160b3
1 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/fish_tests.cpp
View file

@ -845,36 +845,26 @@ static void test_utf82wchar(const char *src, size_t slen, const wchar_t *dst, si
} }
} }
if (dst != NULL) { if (!dst) {
size = utf8_to_wchar(src, slen, NULL, flags);
} else {
mem = (wchar_t *)malloc(dlen * sizeof(*mem)); mem = (wchar_t *)malloc(dlen * sizeof(*mem));
if (mem == NULL) { if (mem == NULL) {
err(L"u2w: %s: MALLOC FAILED\n", descr); err(L"u2w: %s: MALLOC FAILED\n", descr);
return; return;
} }
}
do {
if (mem == NULL) {
size = utf8_to_wchar(src, slen, NULL, flags);
} else {
std::wstring buff; std::wstring buff;
size = utf8_to_wchar(src, slen, &buff, flags); size = utf8_to_wchar(src, slen, &buff, flags);
std::copy(buff.begin(), buff.begin() + std::min(dlen, buff.size()), mem); std::copy(buff.begin(), buff.begin() + std::min(dlen, buff.size()), mem);
} }
if (res != size) { if (res != size) {
err(L"u2w: %s: FAILED (rv: %lu, must be %lu)", descr, size, res); err(L"u2w: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
break; } else if (mem && memcmp(mem, dst, size * sizeof(*mem)) != 0) {
}
if (mem == NULL) break; /* OK */
if (memcmp(mem, dst, size * sizeof(*mem)) != 0) {
err(L"u2w: %s: BROKEN", descr); err(L"u2w: %s: BROKEN", descr);
break;
} }
} while (0);
free(mem); free(mem);
} }
@ -903,7 +893,7 @@ static void test_wchar2utf8(const wchar_t *src, size_t slen, const char *dst, si
} }
} }
if (dst != NULL) { if (dst) {
mem = (char *)malloc(dlen); mem = (char *)malloc(dlen);
if (mem == NULL) { if (mem == NULL) {
err(L"w2u: %s: MALLOC FAILED", descr); err(L"w2u: %s: MALLOC FAILED", descr);
@ -914,17 +904,10 @@ static void test_wchar2utf8(const wchar_t *src, size_t slen, const char *dst, si
size = wchar_to_utf8(src, slen, mem, dlen, flags); size = wchar_to_utf8(src, slen, mem, dlen, flags);
if (res != size) { if (res != size) {
err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res); err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
goto finish; } else if (dst && memcmp(mem, dst, size) != 0) {
}
if (mem == NULL) goto finish; /* OK */
if (memcmp(mem, dst, size) != 0) {
err(L"w2u: %s: BROKEN", descr); err(L"w2u: %s: BROKEN", descr);
goto finish;
} }
finish:
free(mem); free(mem);
} }