christoph/wamr
1
Fork 0
Code Releases Activity

Fix some issues reported by CodeQL (#3064)

Browse Source 
Refer to https://github.com/bytecodealliance/wasm-micro-runtime/pull/2812
and https://github.com/bytecodealliance/wasm-micro-runtime/security/code-scanning?query=pr%3A2812+is%3Aopen
This commit is contained in:
Wenyong Huang
2024-01-23 21:38:30 +08:00
committed by GitHub
parent ab97d543e0
commit 9f64340529
9 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/iwasm/interpreter/wasm_loader.c
View File

@ -327,7 +327,7 @@ check_utf8_str(const uint8 *str, uint32 len)
return false;
}
}
else if (chr >= 0xE1 && chr <= 0xEF) {
else { /* chr >= 0xE1 && chr <= 0xEF */
if (p[1] < 0x80 || p[1] > 0xBF || p[2] < 0x80 || p[2] > 0xBF) {
return false;
}
@ -341,13 +341,13 @@ check_utf8_str(const uint8 *str, uint32 len)
return false;
}
}
else if (chr >= 0xF1 && chr <= 0xF3) {
else if (chr <= 0xF3) { /* and also chr >= 0xF1 */
if (p[1] < 0x80 || p[1] > 0xBF || p[2] < 0x80 || p[2] > 0xBF
|| p[3] < 0x80 || p[3] > 0xBF) {
return false;
}
}
else if (chr == 0xF4) {
else { /* chr == 0xF4 */
if (p[1] < 0x80 || p[1] > 0x8F || p[2] < 0x80 || p[2] > 0xBF
|| p[3] < 0x80 || p[3] > 0xBF) {
return false;