diff --git a/.ci-scripts/ci-build-linux.sh b/.ci-scripts/ci-build-linux.sh index 14434bc..2b9e0fc 100644 --- a/.ci-scripts/ci-build-linux.sh +++ b/.ci-scripts/ci-build-linux.sh @@ -17,7 +17,7 @@ wget -O "rizin.tar.xz" "https://github.com/rizinorg/rizin/releases/download/$CI_ tar xf "rizin.tar.xz" cd "rizin-$CI_RZ_VERSION" -meson --buildtype=release -Denable_tests=false build +meson setup --buildtype=release -Denable_tests=false build sudo ninja -C build install # cleanup @@ -28,8 +28,8 @@ rm -rf "rizin-*" cd "$CI_JSDEC" # build jsdec and install in the rizin dir. -meson --buildtype=release -Dstandalone=false build -sudo ninja -v -C build install +meson setup --buildtype=release -Dstandalone=false build +sudo ninja -C build install # check if it was installed correctly and try to run it. HAS_JSDEC=$(rizin -Qc "Lc" | grep jsdec) @@ -43,5 +43,6 @@ OUTPUT=$(rizin -Qc 'af ; pdd' /bin/ls) CHECK=$(echo -e "$OUTPUT" | grep "jsdec pseudo code output") echo -e "$OUTPUT" if [ -z "$CHECK" ]; then + echo "rizin failed to exec jsdec." exit 1 fi diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index abd6ce6..0e52ff5 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout commit - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: sudo apt -y install meson ninja-build - name: Build & run the plugin @@ -33,8 +33,8 @@ jobs: - "windows-static" - "windows-shared64" steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: 3.9.x - name: Preparing msvc toolchain diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 171a2e5..295b72a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,18 +24,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}" diff --git a/.github/workflows/continuous-tests.yml b/.github/workflows/continuous-tests.yml index e25abbd..6ceec23 100644 --- a/.github/workflows/continuous-tests.yml +++ b/.github/workflows/continuous-tests.yml @@ -11,8 +11,8 @@ jobs: name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: "16" - name: eslint @@ -22,7 +22,7 @@ jobs: name: tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: tests run: chmod +x .ci-scripts/ci-tests.sh && .ci-scripts/ci-tests.sh "${{ github.ref_name }}" @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Reuse Compliance Check uses: fsfe/reuse-action@v2 with: diff --git a/c/jsdec-plugin.c b/c/jsdec-plugin.c index addb6df..5ba25e6 100644 --- a/c/jsdec-plugin.c +++ b/c/jsdec-plugin.c @@ -77,7 +77,6 @@ static JSValue js_analysis_bytes(JSContext *ctx, RzCore *core, RzAnalysisBytes * static JSValue js_analysis_opcodes(JSContext *ctx, RzCore *core) { RzAnalysisBytes *ab; - void **it; JSValue ops = JS_NewArray(ctx); st64 op_idx = 0; @@ -85,12 +84,8 @@ static JSValue js_analysis_opcodes(JSContext *ctx, RzCore *core) { if (!iter) { return ops; } - rz_iterator_foreach (iter, it) { - if (!it || !*it) { - continue; - } - ab = *it; - if (!ab->op || !strcmp(ab->opcode, "nop")) { + rz_iterator_foreach (iter, ab) { + if (!ab || !ab->op || !strcmp(ab->opcode, "nop")) { continue; } JSValue op = js_analysis_bytes(ctx, core, ab); diff --git a/subprojects/packagefiles/libquickjs/quickjs.h b/subprojects/packagefiles/libquickjs/quickjs.h index cbb9dcf..aea9a92 100644 --- a/subprojects/packagefiles/libquickjs/quickjs.h +++ b/subprojects/packagefiles/libquickjs/quickjs.h @@ -75,7 +75,7 @@ typedef struct JSRefCountHeader { } JSRefCountHeader; -#ifndef INFINITE +#ifndef INFINITY #include #define INFINITY (DBL_MAX + DBL_MAX) #endif