diff --git a/include/pocketpy/common/serialize.h b/include/pocketpy/common/serialize.h index 7baa436c..1d5b1d06 100644 --- a/include/pocketpy/common/serialize.h +++ b/include/pocketpy/common/serialize.h @@ -27,7 +27,7 @@ typedef struct c11_deserializer { void c11_deserializer__ctor(c11_deserializer* self, const void* data, int size); void c11_deserializer__dtor(c11_deserializer* self); -bool c11_deserializer__check_header(c11_deserializer* self, int16_t magic, int8_t major_ver, int8_t minor_ver); +bool c11_deserializer__check_header(c11_deserializer* self, int16_t magic, int8_t major_ver, int8_t minor_ver_min); const char* c11_deserializer__read_cstr(c11_deserializer* self); void* c11_deserializer__read_bytes(c11_deserializer* self, int size); diff --git a/src/common/serialize.c b/src/common/serialize.c index 40a001a2..f3920641 100644 --- a/src/common/serialize.c +++ b/src/common/serialize.c @@ -56,7 +56,7 @@ bool c11_deserializer__error(c11_deserializer* self, const char* msg){ return false; } -bool c11_deserializer__check_header(c11_deserializer* self, int16_t magic, int8_t major_ver, int8_t minor_ver){ +bool c11_deserializer__check_header(c11_deserializer* self, int16_t magic, int8_t major_ver, int8_t minor_ver_min){ if(self->size < 8){ return c11_deserializer__error(self, "bad header: size < 8"); } @@ -80,7 +80,7 @@ bool c11_deserializer__check_header(c11_deserializer* self, int16_t magic, int8_ if(self->major_ver != major_ver){ return c11_deserializer__error(self, "bad header: major version mismatch"); } - if(self->minor_ver < minor_ver){ + if(self->minor_ver < minor_ver_min){ // file_ver: 1.1, require_ver: 1.0 => ok // file_ver: 1.1, require_ver: 1.1 => ok // file_ver: 1.1, require_ver: 1.2 => error diff --git a/src/objects/codeobject_ser.c b/src/objects/codeobject_ser.c index a94fa92c..ef95d129 100644 --- a/src/objects/codeobject_ser.c +++ b/src/objects/codeobject_ser.c @@ -370,3 +370,4 @@ char* CodeObject__loads(const void* data, int size, CodeObject* out) { #undef CODEOBJECT_MAGIC #undef CODEOBJECT_VER_MAJOR #undef CODEOBJECT_VER_MINOR +#undef CODEOBJECT_VER_MINOR_MIN