chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change sz to 64-bit integer in mj_setPtrData.

Browse Source 
PiperOrigin-RevId: 569123159
Change-Id: If16777f06a2b0ea08083261d1b77c95fc14f2751
This commit is contained in:
Saran Tunyasuvunakool
2023-09-28 03:19:19 -07:00
committed by Copybara-Service
parent 772326e9eb
commit ca60de79c8
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_io.c
+4 -7
View File
@@ -386,7 +386,6 @@ static inline unsigned int SKIP(intptr_t offset) {
// set pointers in mjModel buffer // set pointers in mjModel buffer
static void mj_setPtrModel(mjModel* m) { static void mj_setPtrModel(mjModel* m) {
char* ptr = (char*)m->buffer; char* ptr = (char*)m->buffer;
ptrdiff_t sz;
// prepare symbols needed by xmacro // prepare symbols needed by xmacro
MJMODEL_POINTERS_PREAMBLE(m); MJMODEL_POINTERS_PREAMBLE(m);
@@ -401,10 +400,9 @@ static void mj_setPtrModel(mjModel* m) {
#undef X #undef X
// check size // check size
sz = ptr - (char*)m->buffer; ptrdiff_t sz = ptr - (char*)m->buffer;
if (m->nbuffer != sz) { if (m->nbuffer != sz) {
printf("expected size: %zu, actual size: %zu\n", m->nbuffer, sz); mjERROR("mjModel buffer size mismatch, expected size: %zd, actual size: %zu", m->nbuffer, sz);
mjERROR("mjModel buffer size mismatch");
} }
} }
@@ -1028,7 +1026,6 @@ static void checkDBSparse(const mjModel* m, mjData* d) {
// set pointers into mjData buffer // set pointers into mjData buffer
static void mj_setPtrData(const mjModel* m, mjData* d) { static void mj_setPtrData(const mjModel* m, mjData* d) {
char* ptr = (char*)d->buffer; char* ptr = (char*)d->buffer;
int sz;
// prepare symbols needed by xmacro // prepare symbols needed by xmacro
MJDATA_POINTERS_PREAMBLE(m); MJDATA_POINTERS_PREAMBLE(m);
@@ -1043,9 +1040,9 @@ static void mj_setPtrData(const mjModel* m, mjData* d) {
#undef X #undef X
// check size // check size
sz = (int)(ptr - (char*)d->buffer); ptrdiff_t sz = ptr - (char*)d->buffer;
if (d->nbuffer != sz) { if (d->nbuffer != sz) {
mjERROR("mjData buffer size mismatch"); mjERROR("mjData buffer size mismatch, expected size: %zd, actual size: %zu", d->nbuffer, sz);
} }
// zero-initialize arena pointers // zero-initialize arena pointers