forked from WebAssembly/binaryen
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Memory flattening: Check for overflow (WebAssembly#6233)
Fixes a fuzz testcase for wasm-ctor-eval. Add the beginnings of a polyfill for stdckdint.h to help that.
- Loading branch information
Showing
3 changed files
with
65 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright 2024 WebAssembly Community Group participants | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef wasm_stdckdint_h | ||
#define wasm_stdckdint_h | ||
|
||
// This is a partial "polyfill" for the C23 file stdckdint.h. It allows us to | ||
// use that API even in older compilers. | ||
|
||
namespace std { | ||
|
||
template<typename T> bool ckd_add(T* output, T a, T b) { | ||
#if __has_builtin(__builtin_add_overflow) | ||
return __builtin_add_overflow(a, b, output); | ||
#else | ||
// Atm this polyfill only supports unsigned types. | ||
static_assert(std::is_unsigned_v<T>); | ||
|
||
T result = a + b; | ||
if (result < a) { | ||
return true; | ||
} | ||
*output = result; | ||
return false; | ||
#endif | ||
} | ||
|
||
} // namespace std | ||
|
||
#endif // wasm_stdckdint_h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
;; The data segment here is at an offset too large to fit into the memory due | ||
;; to an overflow. That will cause us to fail during flatten, so there are no | ||
;; changes to output here, but we should not error (if we don't check for | ||
;; overflow, we'd segfault). | ||
|
||
;; RUN: wasm-ctor-eval %s --ctors=test --kept-exports=test --quiet -all | ||
|
||
(module | ||
(memory $0 10 10) | ||
(data $0 (i32.const -1) "a") | ||
|
||
(export "test" (func $test)) | ||
|
||
(func $test | ||
) | ||
) |