Skip to content

Error check if banner is not there, as well as asprintf #5355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SiliconA-Z wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Error check if banner is not there, as well as asprintf #5355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/CoreFoundation/CFUtilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ static void _logToStderr(char *banner, const char *message, size_t length) {
writev(STDERR_FILENO, v[0].iov_base ? v : v + 1, nv);
os_unfair_lock_unlock(&lock);
#elif TARGET_OS_WIN32
size_t bannerLen = strlen(banner);
size_t bannerLen = banner ? strlen(banner) : 0;
size_t bufLen = bannerLen + length + 1;
char *buf = (char *)malloc(sizeof(char) * bufLen);
if (banner) {
Expand All @@ -974,7 +974,7 @@ static void _logToStderr(char *banner, const char *message, size_t length) {
// OutputDebugStringA(buf);
free(buf);
#else
size_t bannerLen = strlen(banner);
size_t bannerLen = banner ? strlen(banner) : 0;
size_t bufLen = bannerLen + length + 1;
char *buf = (char *)malloc(sizeof(char) * bufLen);
if (banner) {
Expand Down Expand Up @@ -1029,7 +1029,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length
#pragma GCC diagnostic ignored "-Wdeprecated"
uid_t euid;
__CFGetUGIDs(&euid, NULL);
asprintf(&uid, "%d", euid);
if (asprintf(&uid, "%d", euid) < 0) uid = NULL;
aslclient asl = asl_open(NULL, (__CFBundleMainID && __CFBundleMainID[0]) ? __CFBundleMainID : "com.apple.console", ASL_OPT_NO_DELAY);
aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, "CFLog Local Time", time); // not to be documented, not public API
Expand Down