1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copy nonempty_memcpy without ruby implementation

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-06-16 18:47:36 +09:00
parent 60cf48ca4f
commit 1ff2094410
Notes: git 2023-06-16 13:33:11 +00:00 
Merged: https://github.com/ruby/ruby/pull/7948
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
parser_st.c
View File

@ -115,7 +115,19 @@
#undef RUBY #undef RUBY
#undef MEMCPY #undef MEMCPY
#define MEMCPY(tab,p1,p2,type,n) (tab->functions->nonempty_memcpy((p1), (p2), sizeof(type), (n))) #define MEMCPY(p1,p2,type,n) nonempty_memcpy((p1), (p2), (sizeof(type) * (n)))
/* The multiplication should not overflow since this macro is used
* only with the already allocated size. */
static inline void *
nonempty_memcpy(void *dest, const void *src, size_t n)
{
if (n) {
return memcpy(dest, src, n);
}
else {
return dest;
}
}
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -1313,7 +1325,6 @@ 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));
new_tab->functions = old_tab->functions;
#ifndef RUBY #ifndef RUBY
if (new_tab == NULL) if (new_tab == NULL)
return NULL; return NULL;
@ -1338,10 +1349,10 @@ st_copy(st_table *old_tab)
return NULL; return NULL;
} }
#endif #endif
MEMCPY(new_tab, 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)
MEMCPY(new_tab, new_tab->bins, old_tab->bins, char, bins_size(old_tab)); MEMCPY(new_tab->bins, old_tab->bins, char, bins_size(old_tab));
return new_tab; return new_tab;
} }