From 42a47d656ce5ce075bc320eaeda406bf92ad240a Mon Sep 17 00:00:00 2001 From: Nick Chan Date: Sat, 4 Feb 2023 21:42:25 +0800 Subject: [PATCH] fixes --- .github/workflows/build.yml | 4 ++-- src/exec_checkra1n.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d20a91..19b7d48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: - name: Download dependencies (source code) run: | - curl -LOOOOOOO \ + curl -LOOOOOO \ https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \ https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \ https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \ @@ -451,7 +451,7 @@ jobs: - name: Download dependencies (source code) run: | - curl -LOOOOOOOO \ + curl -LOOOOOOO \ https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \ https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \ https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \ diff --git a/src/exec_checkra1n.c b/src/exec_checkra1n.c index eadc657..593208d 100644 --- a/src/exec_checkra1n.c +++ b/src/exec_checkra1n.c @@ -30,10 +30,8 @@ int exec_checkra1n() { checkra1n_path = ext_checkra1n; goto checkra1n_exec; } - if (getenv("TMPDIR") != NULL) { - checkra1n_path = malloc(strlen(getenv("TMPDIR")) + 20); - snprintf(checkra1n_path, strlen(getenv("TMPDIR")) + 20, "%s/checkra1n.XXXXXX", getenv("TMPDIR")); - } else checkra1n_path = "/tmp/checkra1n.XXXXXX"; + checkra1n_path = malloc(strlen(getenv("TMPDIR")) + 20); + snprintf(checkra1n_path, strlen(getenv("TMPDIR")) + 20, "%s/checkra1n.XXXXXX", getenv("TMPDIR") != NULL ? getenv("TMPDIR") : "/tmp"); fd = mkstemp(checkra1n_path); if (fd == -1) { LOG(LOG_FATAL, "Cannot open temporary file: %d (%s)", errno, strerror(errno));