OEMCrypto v18.3
Updates to OEMCrypto API, OPK, ODK, and unit tests. See the file CHANGELOG.md for details.
This commit is contained in:
@@ -16,20 +16,27 @@ namespace wvutil {
|
||||
bool FormatString(std::string* out, const char* fmt, ...) {
|
||||
if (out == nullptr || fmt == nullptr) return false;
|
||||
|
||||
va_list ap1;
|
||||
va_start(ap1, fmt);
|
||||
const int desired_size = vsnprintf(nullptr, 0, fmt, ap1);
|
||||
va_end(ap1);
|
||||
va_list vlist;
|
||||
va_start(vlist, fmt);
|
||||
const bool result = VFormatString(out, fmt, vlist);
|
||||
va_end(vlist);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool VFormatString(std::string* out, const char* fmt, va_list vlist) {
|
||||
if (out == nullptr || fmt == nullptr) return false;
|
||||
|
||||
va_list vlist_copy;
|
||||
va_copy(vlist_copy, vlist);
|
||||
const int desired_size = vsnprintf(nullptr, 0, fmt, vlist_copy);
|
||||
va_end(vlist_copy);
|
||||
|
||||
if (desired_size < 0) return false;
|
||||
const size_t buffer_size =
|
||||
static_cast<size_t>(desired_size) + 1; // +1 for null
|
||||
std::unique_ptr<char[]> buffer(new char[buffer_size]);
|
||||
|
||||
va_list ap2;
|
||||
va_start(ap2, fmt);
|
||||
const int actual_size = vsnprintf(buffer.get(), buffer_size, fmt, ap2);
|
||||
va_end(ap2);
|
||||
const int actual_size = vsnprintf(buffer.get(), buffer_size, fmt, vlist);
|
||||
|
||||
if (actual_size != desired_size) return false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user