From 764596ccf5abd8b5f95fad967d695c071d4a56b3 Mon Sep 17 00:00:00 2001 From: "Daniel K. O." Date: Sat, 22 Aug 2026 07:24:26 -0300 Subject: [PATCH] Fix crash due to incorrect OSReport() usage. (#454) * Fixed incorrect usage of OSReport in log_cafe. * Make all OSReport messages end with a newline. --------- Co-authored-by: Daniel K. O. (dkosmari) --- libraries/libwhb/src/log_cafe.c | 2 +- libraries/nn_erreula/nn_erreula.cpp | 8 ++++---- libraries/nn_swkbd/nn_swkbd.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/libwhb/src/log_cafe.c b/libraries/libwhb/src/log_cafe.c index cf37e81c..aa7318a0 100644 --- a/libraries/libwhb/src/log_cafe.c +++ b/libraries/libwhb/src/log_cafe.c @@ -11,7 +11,7 @@ cafeLogHandler(const char *msg) if (msg[length - 1] != '\n') { OSReport("%s\n", msg); } else { - OSReport(msg); + OSReport("%s", msg); } } diff --git a/libraries/nn_erreula/nn_erreula.cpp b/libraries/nn_erreula/nn_erreula.cpp index 65e2d5ed..dccc92ed 100644 --- a/libraries/nn_erreula/nn_erreula.cpp +++ b/libraries/nn_erreula/nn_erreula.cpp @@ -88,12 +88,12 @@ Create(const CreateArg &args) bool result = true; if (!args.workMemory) { - OSReport("ERREULA: Create failed. CreateArg.workMemory is NULL."); + OSReport("ERREULA: Create failed. CreateArg.workMemory is NULL.\n"); return false; } if (!args.fsClient) { - OSReport("ERREULA: Create failed. CreateArg.fsClient is NULL."); + OSReport("ERREULA: Create failed. CreateArg.fsClient is NULL.\n"); return false; } @@ -114,7 +114,7 @@ Create(const CreateArg &args) dynloadAcquireUseSize, kRplAcquireBufferSize); if (dynloadAcquireUseSize > kRplAcquireBufferSize) { - OSReport("ERREULA: Create failed. dynload_acquire_use_size > kRplAcquireBufferSize."); + OSReport("ERREULA: Create failed. dynload_acquire_use_size > kRplAcquireBufferSize.\n"); result = false; goto out; } @@ -147,7 +147,7 @@ Create(const CreateArg &args) kWorkMemorySize - kRplAcquireBufferSize, 4); if (!workMemory) { - OSReport("ERREULA: Create failed. framework_buffer == NULL."); + OSReport("ERREULA: Create failed. framework_buffer == NULL.\n"); result = false; goto out; } else { diff --git a/libraries/nn_swkbd/nn_swkbd.cpp b/libraries/nn_swkbd/nn_swkbd.cpp index d382dda8..9bbebd8d 100644 --- a/libraries/nn_swkbd/nn_swkbd.cpp +++ b/libraries/nn_swkbd/nn_swkbd.cpp @@ -99,12 +99,12 @@ Create(const CreateArg &args) bool result = true; if (!args.workMemory) { - OSReport("SWKBD: Create failed. CreateArg.workMemory is NULL."); + OSReport("SWKBD: Create failed. CreateArg.workMemory is NULL.\n"); return false; } if (!args.fsClient) { - OSReport("SWKBD: Create failed. CreateArg.fsClient is NULL."); + OSReport("SWKBD: Create failed. CreateArg.fsClient is NULL.\n"); return false; } @@ -132,7 +132,7 @@ Create(const CreateArg &args) dynloadAcquireUseSize, sRplAcquireBufferSize); if (dynloadAcquireUseSize > sRplAcquireBufferSize) { - OSReport("SWKBD: Create failed. dynload_acquire_use_size > sRplAcquireBufferSize."); + OSReport("SWKBD: Create failed. dynload_acquire_use_size > sRplAcquireBufferSize.\n"); result = false; goto out; } @@ -178,7 +178,7 @@ Create(const CreateArg &args) GetWorkMemorySize(args.unk_0x08) - sRplAcquireBufferSize, 4); if (!workMemory) { - OSReport("SWKBD: Create failed. framework_buffer == NULL."); + OSReport("SWKBD: Create failed. framework_buffer == NULL.\n"); result = false; goto out; } else {