Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lib) prevent a segfault loading an empty .wat module with V8 #544

Merged
merged 2 commits into from
May 5, 2024
Merged

fix(lib) prevent a segfault loading an empty .wat module with V8 #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee4c0f
chore(ci) upload executable and coredumps on failure
thibaultcha May 5, 2024
55b5481
fix(lib) prevent a segfault loading an empty .wat module with V8
thibaultcha May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/job-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,16 @@ jobs:
os: ${{ inputs.os }}
ghcr_username: ${{ github.repository_owner }}
ghcr_password: ${{ secrets.TOKEN_GITHUB }}
- name: Setup coredumps location
run: |
mkdir ${{ github.workspace }}/coredumps
sudo bash -c 'echo "${{ github.workspace }}/coredumps/%e.%p.%t" > /proc/sys/kernel/core_pattern'
- run: make setup
- run: make
- run: make test
- name: Run make test
run: |
ulimit -c unlimited
make test
- name: Run lcov
id: lcov
if: ${{ !env.ACT && inputs.coverage }}
Expand Down Expand Up @@ -163,13 +170,18 @@ jobs:
flags: unit
- run: rm -f t/servroot/html/nginx.sock
if: ${{ failure() && !env.ACT }}
- uses: actions/upload-artifact@v4
- name: Artifacts Upload
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: ${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.module_type == 'dynamic' && 'dynamic' || 'static'}}-${{ inputs.ipc }}-${{ inputs.ssl }}-${{ inputs.debug }}-${{ inputs.hup }}
path: |
work/buildroot/
t/servroot*
${{ github.workspace }}/coredumps
#- name: Setup tmate session
# if: ${{ failure() && !env.ACT }}
# uses: mxschmitt/action-tmate@v3
- name: Cleanup
if: ${{ always() }}
uses: ./.github/actions/cleanup
8 changes: 6 additions & 2 deletions lib/ngx-wasm-rs/lib/wat/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ pub unsafe extern "C" fn ngx_wasm_wat_to_wasm(
wat: *const wasm_byte_vec_t,
wasm: *mut wasm_byte_vec_t,
) -> Option<Box<wasm_byte_vec_t>> {
let wat_slice;
let empty = Vec::new();
let mut wat_slice = empty.as_ref();

unsafe {
wat_slice = std::slice::from_raw_parts((*wat).data, (*wat).size);
if (*wat).size > 0 {
wat_slice = std::slice::from_raw_parts((*wat).data, (*wat).size);
}
}

match wabt::wat2wasm(wat_slice) {
Expand Down