diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-08-29 18:52:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-29 18:52:23 +0200 |
| commit | 9a3c8f64a77742684e847221990a06ad87c03985 (patch) | |
| tree | 1ec4d83d66d824fe78e543e50db4e30c821da731 | |
| parent | 59baa5e8a1f9e71b82f28c2723ccc558370b6fc0 (diff) | |
| parent | 176bfea1356bd151a8aaef61e02ac5a175969a59 (diff) | |
| download | rneovim-9a3c8f64a77742684e847221990a06ad87c03985.tar.gz rneovim-9a3c8f64a77742684e847221990a06ad87c03985.tar.bz2 rneovim-9a3c8f64a77742684e847221990a06ad87c03985.zip | |
Merge pull request #26950 from bfredl/s390x_fix
fix issues with s390x CI on master (xdiff and others)
| -rw-r--r-- | .github/workflows/optional.yml | 6 | ||||
| -rw-r--r-- | src/nvim/lua/xdiff.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/optional.yml b/.github/workflows/optional.yml index 742d51377f..540daccc56 100644 --- a/.github/workflows/optional.yml +++ b/.github/workflows/optional.yml @@ -11,7 +11,7 @@ concurrency: env: INSTALL_PREFIX: ${{ github.workspace }}/nvim-install # Double test timeout since it's running via qemu - TEST_TIMEOUT: 2400 + TEST_TIMEOUT: 3600 # TEST_FILE: test/functional/shada # TEST_FILTER: foo @@ -23,7 +23,7 @@ jobs: matrix: test: [functionaltest, oldtest] runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 90 steps: - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset - uses: docker://multiarch/ubuntu-core:s390x-focal @@ -34,7 +34,7 @@ jobs: bash -c " apt-get -y update && - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake curl gettext ninja-build locales-all cpanminus git attr libattr1-dev && + time DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake curl gettext ninja-build locales-all cpanminus git attr libattr1-dev xdg-utils && useradd --create-home qemuci && chown -R qemuci. . && runuser -u qemuci -- git clone --depth=1 https://github.com/neovim/neovim.git && diff --git a/src/nvim/lua/xdiff.c b/src/nvim/lua/xdiff.c index 035c171a14..8d791a7e74 100644 --- a/src/nvim/lua/xdiff.c +++ b/src/nvim/lua/xdiff.c @@ -185,7 +185,12 @@ static mmfile_t get_string_arg(lua_State *lstate, int idx) luaL_argerror(lstate, idx, "expected string"); } mmfile_t mf; - mf.ptr = (char *)lua_tolstring(lstate, idx, (size_t *)&mf.size); + size_t size; + mf.ptr = (char *)lua_tolstring(lstate, idx, &size); + if (size > INT_MAX) { + luaL_argerror(lstate, idx, "string too long"); + } + mf.size = (int)size; return mf; } |