[gentoo-commits] proj/sandbox:master commit in: libsandbox/

[Mike Gilbert]

commit:     b5eac2b864b2d410ad81ed8fabc3ef090d736c01
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 19:19:36 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 19:36:04 2025 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=b5eac2b8

libsandbox: use alloca as a fallback when malloc fails

Fixes some errors in the coreutils test suite.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 libsandbox/libsandbox.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
index e9dc816..402928a 100644
--- a/libsandbox/libsandbox.c
+++ b/libsandbox/libsandbox.c
@@ -15,6 +15,7 @@
 #include "libsandbox.h"
 #include "wrappers.h"
 #include "sb_nr.h"
+#include <alloca.h>
 
 #define LOG_VERSION                    "1.0"
 #define LOG_STRING                     "VERSION " LOG_VERSION "\n"
@@ -584,8 +585,9 @@ static int check_syscall(sbcontext_t *sbcontext, int sb_nr, 
const char *func,
        int old_errno = errno;
        int result;
        bool access, debug, verbose, set;
-       _cleanup_free_ char *absolute_path = xmalloc(SB_PATH_MAX);
-       _cleanup_free_ char *resolved_path = xmalloc(SB_PATH_MAX);
+       char *absolute_path, *resolved_path;
+       _cleanup_free_ char *abuf = NULL;
+       _cleanup_free_ char *rbuf = NULL;
 
        int trace_dirfd = -1;
        if (trace_pid && (file == NULL || file[0] != '/')) {
@@ -604,11 +606,19 @@ static int check_syscall(sbcontext_t *sbcontext, int 
sb_nr, const char *func,
        if (is_symlink_func(sb_nr))
                flags |= AT_SYMLINK_NOFOLLOW;
 
+       absolute_path = abuf = malloc(SB_PATH_MAX);
+       if (!absolute_path)
+               absolute_path = alloca(SB_PATH_MAX);
+
        if (!sb_abspathat(dirfd, file, absolute_path, SB_PATH_MAX))
                return 1;
 
        sb_debug_dyn("absolute_path: %s\n", absolute_path);
 
+       resolved_path = rbuf = malloc(SB_PATH_MAX);
+       if (!resolved_path)
+               resolved_path = alloca(SB_PATH_MAX);
+
        if (!sb_realpathat(dirfd, file, resolved_path, SB_PATH_MAX,
                                flags, is_create(sb_nr)))
                return 1;