christoph/wamr
1
Fork 0
Code Releases Activity

Enlarge max pool size and fix bh_memcpy_s dest max size check (#1151)

Browse Source 
Enlarge max pool size and fix bh_memcpy_s dest max size check to support
large linear memory, e.g. with initial page count 65535.
This commit is contained in:
Wenyong Huang
2022-05-07 16:09:16 +08:00
committed by GitHub
parent a7f4c3c15c
commit d62543c99c
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/shared/utils/bh_common.c
View File

@ -5,12 +5,6 @@
#include "bh_common.h"
#ifdef RSIZE_MAX
#undef RSIZE_MAX
#endif
#define RSIZE_MAX 0x7FFFFFFF
int
b_memcpy_s(void *s1, unsigned int s1max, const void *s2, unsigned int n)
{
@ -20,7 +14,7 @@ b_memcpy_s(void *s1, unsigned int s1max, const void *s2, unsigned int n)
return 0;
}
if (s1 == NULL || s1max > RSIZE_MAX) {
if (s1 == NULL) {
return -1;
}
if (s2 == NULL || n > s1max) {
@ -40,7 +34,7 @@ b_memmove_s(void *s1, unsigned int s1max, const void *s2, unsigned int n)
return 0;
}
if (s1 == NULL || s1max > RSIZE_MAX) {
if (s1 == NULL) {
return -1;
}
if (s2 == NULL || n > s1max) {
@ -54,8 +48,7 @@ b_memmove_s(void *s1, unsigned int s1max, const void *s2, unsigned int n)
int
b_strcat_s(char *s1, unsigned int s1max, const char *s2)
{
if (NULL == s1 || NULL == s2 || s1max < (strlen(s1) + strlen(s2) + 1)
|| s1max > RSIZE_MAX) {
if (NULL == s1 || NULL == s2 || s1max < (strlen(s1) + strlen(s2) + 1)) {
return -1;
}
@ -66,8 +59,7 @@ b_strcat_s(char *s1, unsigned int s1max, const char *s2)
int
b_strcpy_s(char *s1, unsigned int s1max, const char *s2)
{
if (NULL == s1 || NULL == s2 || s1max < (strlen(s2) + 1)
|| s1max > RSIZE_MAX) {
if (NULL == s1 || NULL == s2 || s1max < (strlen(s2) + 1)) {
return -1;
}