admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove size_t cast in mrb_assert() since ((size_t)n <= SIZE_MAX) is always true

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-03-19 09:07:59 +09:00
parent 9084e03556
commit 72c274473b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dump.c
+5 -5
View File
@@ -90,7 +90,7 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
{
mrb_int len = RSTRING_LEN(str);
mrb_assert(len >= 0);
mrb_assert((size_t)len <= SIZE_MAX);
mrb_assert(len <= SIZE_MAX);
size += (size_t)len;
}
break;
@@ -100,7 +100,7 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
int len;
len = mrb_float_to_str(buf, mrb_float(irep->pool[pool_no]));
mrb_assert(len >= 0);
mrb_assert((size_t)len <= SIZE_MAX);
mrb_assert(len <= SIZE_MAX);
size += (size_t)len;
}
break;
@@ -109,7 +109,7 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
{
mrb_int len = RSTRING_LEN(irep->pool[pool_no]);
mrb_assert(len >= 0);
mrb_assert((size_t)len <= SIZE_MAX);
mrb_assert(len <= SIZE_MAX);
size += (size_t)len;
}
break;
@@ -420,7 +420,7 @@ write_lineno_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t* bin)
uint32_to_bin((uint32_t)diff, bin); /* record size */
mrb_assert((size_t)diff <= SIZE_MAX);
mrb_assert(diff <= SIZE_MAX);
return (size_t)diff;
}
@@ -600,7 +600,7 @@ write_debug_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const
mrb_assert(ret <= UINT32_MAX);
uint32_to_bin(ret, bin);
mrb_assert((size_t)ret <= SIZE_MAX);
mrb_assert(ret <= SIZE_MAX);
return (size_t)ret;
}
src/load.c
+3 -3
View File
@@ -166,7 +166,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, mrb_bool all
diff = src - bin;
mrb_assert(diff >= 0);
mrb_assert((size_t)diff <= SIZE_MAX);
mrb_assert(diff <= SIZE_MAX);
*len = (size_t)diff;
return irep;
@@ -350,7 +350,7 @@ read_debug_record(mrb_state *mrb, const uint8_t *start, mrb_irep* irep, size_t *
diff = bin - start;
mrb_assert(diff >= 0);
mrb_assert((size_t)diff <= SIZE_MAX);
mrb_assert(diff <= SIZE_MAX);
if (record_size != (size_t)diff) {
return MRB_DUMP_GENERAL_FAILURE;
@@ -367,7 +367,7 @@ read_debug_record(mrb_state *mrb, const uint8_t *start, mrb_irep* irep, size_t *
diff = bin - start;
mrb_assert(diff >= 0);
mrb_assert((size_t)diff <= SIZE_MAX);
mrb_assert(diff <= SIZE_MAX);
*record_len = (size_t)diff;
return MRB_DUMP_OK;