diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-25 22:50:29 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-25 22:50:29 +0900 |
| commit | c68258f454cc27135a72e4b6a3f77f95c7bb3ed5 (patch) | |
| tree | baf19b6747ccce7b831771b4f75e54945011f96d | |
| parent | 0903e2a72e8f3aa848fdbb60f1ceece7af3d1cb4 (diff) | |
| parent | d5ed73379f6f468f86ae70379786c2d78ebd1e58 (diff) | |
| download | mruby-c68258f454cc27135a72e4b6a3f77f95c7bb3ed5.tar.gz mruby-c68258f454cc27135a72e4b6a3f77f95c7bb3ed5.zip | |
Merge pull request #5297 from hasumikin/fix-typo-in-rite-binary-header
Fix TYPO and checking minor version in RITE BINARY HEADER
| -rw-r--r-- | src/dump.c | 2 | ||||
| -rw-r--r-- | src/load.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dump.c b/src/dump.c index 76508a27e..d18ffebdc 100644 --- a/src/dump.c +++ b/src/dump.c @@ -750,7 +750,7 @@ write_rite_binary_header(mrb_state *mrb, size_t binary_size, uint8_t *bin, uint8 memcpy(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)); memcpy(header->major_version, RITE_BINARY_MAJOR_VER, sizeof(header->major_version)); - memcpy(header->minor_version, RITE_BINARY_MAJOR_VER, sizeof(header->minor_version)); + memcpy(header->minor_version, RITE_BINARY_MINOR_VER, sizeof(header->minor_version)); memcpy(header->compiler_name, RITE_COMPILER_NAME, sizeof(header->compiler_name)); memcpy(header->compiler_version, RITE_COMPILER_VERSION, sizeof(header->compiler_version)); mrb_assert(binary_size <= UINT32_MAX); diff --git a/src/load.c b/src/load.c index cf8454f1c..93c16a5e1 100644 --- a/src/load.c +++ b/src/load.c @@ -529,7 +529,7 @@ read_binary_header(const uint8_t *bin, size_t bufsize, size_t *bin_size, uint8_t return MRB_DUMP_INVALID_FILE_HEADER; } /* if minor version is different, we can accept the older version */ - if (memcmp(header->minor_version, RITE_BINARY_MINOR_VER, sizeof(header->minor_version)) <= 0) { + if (memcmp(header->minor_version, RITE_BINARY_MINOR_VER, sizeof(header->minor_version)) > 0) { return MRB_DUMP_INVALID_FILE_HEADER; } |