oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu/Util: use std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann
2016-04-12 22:07:23 +02:00
parent 178f737971
commit a497cc46f9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/icu/Util.cxx
View File

@@ -26,6 +26,8 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <memory>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -58,17 +60,16 @@ UCharToUTF8(ConstBuffer<UChar> src)
/* worst-case estimate */ /* worst-case estimate */
size_t dest_capacity = 4 * src.size; size_t dest_capacity = 4 * src.size;
char *dest = new char[dest_capacity + 1]; std::unique_ptr<char[]> dest(new char[dest_capacity + 1]);
UErrorCode error_code = U_ZERO_ERROR; UErrorCode error_code = U_ZERO_ERROR;
int32_t dest_length; int32_t dest_length;
u_strToUTF8(dest, dest_capacity, &dest_length, src.data, src.size, u_strToUTF8(dest.get(), dest_capacity, &dest_length,
src.data, src.size,
&error_code); &error_code);
if (U_FAILURE(error_code)) { if (U_FAILURE(error_code))
delete[] dest;
return nullptr; return nullptr;
}
dest[dest_length] = 0; dest[dest_length] = 0;
return AllocatedString<>::Donate(dest); return AllocatedString<>::Donate(dest.release());
} }