StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Raw logging should not allocate memory

Browse Source 
PiperOrigin-RevId: 374396461
Change-Id: I709103c7834d4803a26a0b292f342a3d629d332c
This commit is contained in:
Wiktor Garbacz 2021-05-18 05:37:10 -07:00 committed by Copybara-Service
parent 2d3a040f64
commit a986278550
6 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandboxed_api/util/BUILD.bazel
View File

@ -227,7 +227,7 @@ cc_library(
copts = sapi_platform_copts(),
deps = [
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
],
)

2
sandboxed_api/util/CMakeLists.txt
View File

@ -138,7 +138,7 @@ add_library(sapi_util_strerror ${SAPI_LIB_TYPE}
)
add_library(sapi::strerror ALIAS sapi_util_strerror)
target_link_libraries(sapi_util_strerror PRIVATE
absl::strings
absl::str_format
sapi::base
)

4
sandboxed_api/util/raw_logging.cc
View File

@ -56,8 +56,6 @@ inline static bool VADoRawLog(char** buf, int* size, const char* format,
return result;
}
static constexpr int kLogBufSize = 3000;
namespace {
// CAVEAT: vsnprintf called from *DoRawLog below has some (exotic) code paths
@ -83,7 +81,7 @@ void RawLogVA(absl::LogSeverity severity, const char* file, int line,
const char* format, va_list ap) ABSL_PRINTF_ATTRIBUTE(4, 0);
void RawLogVA(absl::LogSeverity severity, const char* file, int line,
const char* format, va_list ap) {
char buffer[kLogBufSize];
char buffer[sapi::raw_logging_internal::kLogBufSize];
char* buf = buffer;
int size = sizeof(buffer);

38
sandboxed_api/util/raw_logging.h
View File

@ -95,11 +95,17 @@
// Like SAPI_RAW_LOG(), but also logs the current value of errno and its
// corresponding error message.
#define SAPI_RAW_PLOG(severity, format, ...) \
do { \
const auto message = absl::StrFormat((format), ##__VA_ARGS__); \
SAPI_RAW_LOG(severity, "%s: %s [%d]", message.c_str(), \
::sapi::StrError(errno).c_str(), errno); \
#define SAPI_RAW_PLOG(severity, format, ...) \
do { \
char sapi_raw_plog_errno_buffer[100]; \
const char* sapi_raw_plog_errno_str = \
::sapi::RawStrError(errno, sapi_raw_plog_errno_buffer, \
sizeof(sapi_raw_plog_errno_buffer)); \
char sapi_raw_plog_buffer[::sapi::raw_logging_internal::kLogBufSize]; \
absl::SNPrintF(sapi_raw_plog_buffer, sizeof(sapi_raw_plog_buffer), \
(format), ##__VA_ARGS__); \
SAPI_RAW_LOG(severity, "%s: %s [%d]", sapi_raw_plog_buffer, \
sapi_raw_plog_errno_str, errno); \
} while (0)
// If verbose logging is enabled, uses SAPI_RAW_LOG() to log.
@ -110,17 +116,25 @@
// Like SAPI_RAW_CHECK(), but also logs errno and a message (similar to
// SAPI_RAW_PLOG()).
#define SAPI_RAW_PCHECK(condition, format, ...) \
do { \
const auto message = absl::StrFormat((format), ##__VA_ARGS__); \
if (ABSL_PREDICT_FALSE(!(condition))) { \
SAPI_RAW_LOG(FATAL, "Check %s failed: %s: %s [%d]", #condition, \
message.c_str(), ::sapi::StrError(errno).c_str(), errno); \
} \
#define SAPI_RAW_PCHECK(condition, format, ...) \
do { \
if (ABSL_PREDICT_FALSE(!(condition))) { \
char sapi_raw_plog_errno_buffer[100]; \
const char* sapi_raw_plog_errno_str = \
::sapi::RawStrError(errno, sapi_raw_plog_errno_buffer, \
sizeof(sapi_raw_plog_errno_buffer)); \
char sapi_raw_plog_buffer[::sapi::raw_logging_internal::kLogBufSize]; \
absl::SNPrintF(sapi_raw_plog_buffer, sizeof(sapi_raw_plog_buffer), \
(format), ##__VA_ARGS__); \
SAPI_RAW_LOG(FATAL, "Check %s failed: %s: %s [%d]", #condition, \
sapi_raw_plog_buffer, sapi_raw_plog_errno_str, errno); \
} \
} while (0)
namespace sapi::raw_logging_internal {
constexpr int kLogBufSize = 3000;
// Helper function to implement ABSL_RAW_LOG
// Logs format... at "severity" level, reporting it
// as called from file:line.

15
sandboxed_api/util/strerror.cc
View File

@ -20,7 +20,7 @@
#include <cstddef>
#include "absl/base/attributes.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
namespace sapi {
namespace {
@ -48,15 +48,20 @@ ABSL_ATTRIBUTE_UNUSED const char* StrErrorR(int (*strerror_r)(int, char*,
} // namespace
std::string StrError(int errnum) {
const char* RawStrError(int errnum, char* buf, size_t buflen) {
const int saved_errno = errno;
char buf[100];
const char* str = StrErrorR(strerror_r, errnum, buf, sizeof(buf));
const char* str = StrErrorR(strerror_r, errnum, buf, buflen);
if (*str == '\0') {
return absl::StrCat("Unknown error ", errnum);
absl::SNPrintF(buf, buflen, "Unknown error %d", errnum);
str = buf;
}
errno = saved_errno;
return str;
}
std::string StrError(int errnum) {
char buf[100];
return RawStrError(errnum, buf, sizeof(buf));
}
} // namespace sapi

4
sandboxed_api/util/strerror.h
View File

@ -25,6 +25,10 @@ namespace sapi {
// modified by this call. This function is thread-safe.
std::string StrError(int errnum);
// Same as StrError but uses provided buffer (does not allocate memory).
// Might use and return a static immutable buffer instead of buf.
const char* RawStrError(int errnum, char* buf, size_t buflen);
} // namespace sapi
#endif // SANDBOXED_API_STRERROR_H_