From ca60de79c89881d6e8acb937b3b4c25a0241037a Mon Sep 17 00:00:00 2001 From: Saran Tunyasuvunakool Date: Thu, 28 Sep 2023 03:19:19 -0700 Subject: [PATCH] Change `sz` to 64-bit integer in `mj_setPtrData`. PiperOrigin-RevId: 569123159 Change-Id: If16777f06a2b0ea08083261d1b77c95fc14f2751 --- src/engine/engine_io.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/engine/engine_io.c b/src/engine/engine_io.c index ee479005..1df8bd29 100644 --- a/src/engine/engine_io.c +++ b/src/engine/engine_io.c @@ -386,7 +386,6 @@ static inline unsigned int SKIP(intptr_t offset) { // set pointers in mjModel buffer static void mj_setPtrModel(mjModel* m) { char* ptr = (char*)m->buffer; - ptrdiff_t sz; // prepare symbols needed by xmacro MJMODEL_POINTERS_PREAMBLE(m); @@ -401,10 +400,9 @@ static void mj_setPtrModel(mjModel* m) { #undef X // check size - sz = ptr - (char*)m->buffer; + ptrdiff_t sz = ptr - (char*)m->buffer; if (m->nbuffer != sz) { - printf("expected size: %zu, actual size: %zu\n", m->nbuffer, sz); - mjERROR("mjModel buffer size mismatch"); + mjERROR("mjModel buffer size mismatch, expected size: %zd, actual size: %zu", m->nbuffer, sz); } } @@ -1028,7 +1026,6 @@ static void checkDBSparse(const mjModel* m, mjData* d) { // set pointers into mjData buffer static void mj_setPtrData(const mjModel* m, mjData* d) { char* ptr = (char*)d->buffer; - int sz; // prepare symbols needed by xmacro MJDATA_POINTERS_PREAMBLE(m); @@ -1043,9 +1040,9 @@ static void mj_setPtrData(const mjModel* m, mjData* d) { #undef X // check size - sz = (int)(ptr - (char*)d->buffer); + ptrdiff_t sz = ptr - (char*)d->buffer; 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