openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

system/core: using equivalent code to fix build break for win host 

Error from x86_64-w64-mingw32-g++ was:
system/core/libutils/Unicode.cpp: In function ‘ssize_t utf16_to_utf8_length(const char16_t*, size_t)’:
system/core/libutils/Unicode.cpp:487:78: error: ‘std::basic_ostream<char>::__ostream_type’ has no member named ‘str’
     std::string logged_string = (std::ostringstream() << ret_difference).str();

Bug: 29250543

Test: make winsdk-tools, ran libutils_test, checked that safetynet logs appear using adb


Change-Id: I09fc1e3e0dcc4683bde987f9e23e3bb4bea8b367
This commit is contained in:
Sergio Giro 2016-07-11 15:43:54 +01:00
parent 7714abac6b
commit 1e61274532
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libutils/Unicode.cpp
View File

@ -484,7 +484,9 @@ ssize_t utf16_to_utf8_length(const char16_t *src, size_t src_len)
if (ret_difference >= 5) {
// Log the difference between new and old calculation. A high number, or equal numbers
// appearing frequently, would be indicative of an attack.
std::string logged_string = (std::ostringstream() << ret_difference).str();
std::ostringstream logged_string_stream;
logged_string_stream << ret_difference;
std::string logged_string = logged_string_stream.str();
android_errorWriteWithInfoLog(0x534e4554, "29250543", -1 /* int_uid */,
logged_string.c_str(), logged_string.length() + 1);
}