diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
| commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
| tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/base/syslog_logging.cc | |
| parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
| download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz | |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/syslog_logging.cc')
| -rw-r--r-- | chromium/base/syslog_logging.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/base/syslog_logging.cc b/chromium/base/syslog_logging.cc index cb9e26f6dfe..68483efccd5 100644 --- a/chromium/base/syslog_logging.cc +++ b/chromium/base/syslog_logging.cc @@ -6,10 +6,13 @@ #if defined(OS_WIN) #include <windows.h> + #include <sddl.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/debug/stack_trace.h" +#include "base/strings/string_util.h" #include "base/win/win_util.h" #elif defined(OS_LINUX) // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with @@ -99,7 +102,7 @@ EventLogMessage::~EventLogMessage() { } LPCSTR strings[1] = {message.data()}; PSID user_sid = nullptr; - if (!::ConvertStringSidToSid(g_user_sid->c_str(), &user_sid)) { + if (!::ConvertStringSidToSid(base::as_wcstr(*g_user_sid), &user_sid)) { stream() << " !!ERROR GETTING USER SID!!"; } |