kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

st: Do error check only on non-Ruby

Browse source
This commit is contained in:
K.Takata 2019-07-30 12:08:33 +09:00 • committed by 卜部昌平
parent e70e81b54e
commit 375124be51
Notes: git 2019-10-21 11:15:05 +09:00
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
st.c
View file

@ -593,9 +593,15 @@ st_init_table_with_size(const struct st_hash_type *type, st_index_t size)
#endif #endif
n = get_power2(size); n = get_power2(size);
#ifndef RUBY
if (n < 0)
return NULL;
#endif
tab = (st_table *) malloc(sizeof (st_table)); tab = (st_table *) malloc(sizeof (st_table));
#ifndef RUBY
if (tab == NULL) if (tab == NULL)
return NULL; return NULL;
#endif
tab->type = type; tab->type = type;
tab->entry_power = n; tab->entry_power = n;
tab->bin_power = features[n].bin_power; tab->bin_power = features[n].bin_power;
@ -604,17 +610,21 @@ st_init_table_with_size(const struct st_hash_type *type, st_index_t size)
tab->bins = NULL; tab->bins = NULL;
else { else {
tab->bins = (st_index_t *) malloc(bins_size(tab)); tab->bins = (st_index_t *) malloc(bins_size(tab));
#ifndef RUBY
if (tab->bins == NULL) { if (tab->bins == NULL) {
free(tab); free(tab);
return NULL; return NULL;
} }
#endif
} }
tab->entries = (st_table_entry *) malloc(get_allocated_entries(tab) tab->entries = (st_table_entry *) malloc(get_allocated_entries(tab)
* sizeof(st_table_entry)); * sizeof(st_table_entry));
#ifndef RUBY
if (tab->entries == NULL) { if (tab->entries == NULL) {
st_free_table(tab); st_free_table(tab);
return NULL; return NULL;
} }
#endif
#ifdef ST_DEBUG #ifdef ST_DEBUG
memset(tab->entries, ST_INIT_VAL_BYTE, memset(tab->entries, ST_INIT_VAL_BYTE,
get_allocated_entries(tab) * sizeof(st_table_entry)); get_allocated_entries(tab) * sizeof(st_table_entry));
@ -1312,24 +1322,30 @@ st_copy(st_table *old_tab)
st_table *new_tab; st_table *new_tab;
new_tab = (st_table *) malloc(sizeof(st_table)); new_tab = (st_table *) malloc(sizeof(st_table));
#ifndef RUBY
if (new_tab == NULL) if (new_tab == NULL)
return NULL; return NULL;
#endif
*new_tab = *old_tab; *new_tab = *old_tab;
if (old_tab->bins == NULL) if (old_tab->bins == NULL)
new_tab->bins = NULL; new_tab->bins = NULL;
else { else {
new_tab->bins = (st_index_t *) malloc(bins_size(old_tab)); new_tab->bins = (st_index_t *) malloc(bins_size(old_tab));
#ifndef RUBY
if (new_tab->bins == NULL) { if (new_tab->bins == NULL) {
free(new_tab); free(new_tab);
return NULL; return NULL;
} }
#endif
} }
new_tab->entries = (st_table_entry *) malloc(get_allocated_entries(old_tab) new_tab->entries = (st_table_entry *) malloc(get_allocated_entries(old_tab)
* sizeof(st_table_entry)); * sizeof(st_table_entry));
#ifndef RUBY
if (new_tab->entries == NULL) { if (new_tab->entries == NULL) {
st_free_table(new_tab); st_free_table(new_tab);
return NULL; return NULL;
} }
#endif
MEMCPY(new_tab->entries, old_tab->entries, st_table_entry, MEMCPY(new_tab->entries, old_tab->entries, st_table_entry,
get_allocated_entries(old_tab)); get_allocated_entries(old_tab));
if (old_tab->bins != NULL) if (old_tab->bins != NULL)