fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-27 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

fix(runtime-c-api) Lengths cannot be negative.

Browse Source 
This patch prevents receiving negative length in various places.
This commit is contained in:
Ivan Enderlin
2019-05-22 16:44:03 +02:00
parent 32c2ad1916
commit c92230e18e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/runtime-c-api/src/import.rs
View File

@ -8,7 +8,7 @@ use crate::{
value::wasmer_value_tag, value::wasmer_value_tag,
wasmer_byte_array, wasmer_result_t, wasmer_byte_array, wasmer_result_t,
}; };
use libc::{c_int, uint32_t}; use libc::{c_uint, uint32_t};
use std::{ffi::c_void, ptr, slice, sync::Arc}; use std::{ffi::c_void, ptr, slice, sync::Arc};
use wasmer_runtime::Module; use wasmer_runtime::Module;
use wasmer_runtime_core::{ use wasmer_runtime_core::{
@ -154,11 +154,11 @@ pub extern "C" fn wasmer_import_descriptors_destroy(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_import_descriptors_len( pub unsafe extern "C" fn wasmer_import_descriptors_len(
exports: *mut wasmer_import_descriptors_t, exports: *mut wasmer_import_descriptors_t,
) -> c_int { ) -> c_uint {
if exports.is_null() { if exports.is_null() {
return 0; return 0;
} }
(*(exports as *mut NamedImportDescriptors)).0.len() as c_int (*(exports as *mut NamedImportDescriptors)).0.len() as c_uint
} }
/// Gets import descriptor by index /// Gets import descriptor by index
@ -166,7 +166,7 @@ pub unsafe extern "C" fn wasmer_import_descriptors_len(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_import_descriptors_get( pub unsafe extern "C" fn wasmer_import_descriptors_get(
import_descriptors: *mut wasmer_import_descriptors_t, import_descriptors: *mut wasmer_import_descriptors_t,
idx: c_int, idx: c_uint,
) -> *mut wasmer_import_descriptor_t { ) -> *mut wasmer_import_descriptor_t {
if import_descriptors.is_null() { if import_descriptors.is_null() {
return ptr::null_mut(); return ptr::null_mut();
@ -244,9 +244,9 @@ pub unsafe extern "C" fn wasmer_import_func_params_arity(
pub unsafe extern "C" fn wasmer_import_func_new( pub unsafe extern "C" fn wasmer_import_func_new(
func: extern "C" fn(data: *mut c_void), func: extern "C" fn(data: *mut c_void),
params: *const wasmer_value_tag, params: *const wasmer_value_tag,
params_len: c_int, params_len: c_uint,
returns: *const wasmer_value_tag, returns: *const wasmer_value_tag,
returns_len: c_int, returns_len: c_uint,
) -> *mut wasmer_import_func_t { ) -> *mut wasmer_import_func_t {
let params: &[wasmer_value_tag] = slice::from_raw_parts(params, params_len as usize); let params: &[wasmer_value_tag] = slice::from_raw_parts(params, params_len as usize);
let params: Vec<Type> = params.iter().cloned().map(|x| x.into()).collect(); let params: Vec<Type> = params.iter().cloned().map(|x| x.into()).collect();
@ -272,7 +272,7 @@ pub unsafe extern "C" fn wasmer_import_func_new(
pub unsafe extern "C" fn wasmer_import_func_params( pub unsafe extern "C" fn wasmer_import_func_params(
func: *const wasmer_import_func_t, func: *const wasmer_import_func_t,
params: *mut wasmer_value_tag, params: *mut wasmer_value_tag,
params_len: c_int, params_len: c_uint,
) -> wasmer_result_t { ) -> wasmer_result_t {
let export = &*(func as *const Export); let export = &*(func as *const Export);
if let Export::Function { ref signature, .. } = *export { if let Export::Function { ref signature, .. } = *export {
@ -301,7 +301,7 @@ pub unsafe extern "C" fn wasmer_import_func_params(
pub unsafe extern "C" fn wasmer_import_func_returns( pub unsafe extern "C" fn wasmer_import_func_returns(
func: *const wasmer_import_func_t, func: *const wasmer_import_func_t,
returns: *mut wasmer_value_tag, returns: *mut wasmer_value_tag,
returns_len: c_int, returns_len: c_uint,
) -> wasmer_result_t { ) -> wasmer_result_t {
let export = &*(func as *const Export); let export = &*(func as *const Export);
if let Export::Function { ref signature, .. } = *export { if let Export::Function { ref signature, .. } = *export {