mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Fix argument passing to foreign functions.

Browse source 
* libguile/foreign.c (scm_i_foreign_call): When allocating room for
  DATA, use the sum of all the argument sizes, not `cif->bytes'.
This commit is contained in:
Ludovic Courtès 2010-03-20 16:45:14 +01:00
parent 7f10a113c5
commit a2c6904911
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libguile/foreign.c
View file

@ -952,16 +952,28 @@ scm_i_foreign_call (SCM foreign, SCM *argv)
void *rvalue; void *rvalue;
void **args; void **args;
unsigned i; unsigned i;
size_t arg_size;
scm_t_ptrdiff off; scm_t_ptrdiff off;
cif = SCM_FOREIGN_POINTER (scm_car (foreign), ffi_cif); cif = SCM_FOREIGN_POINTER (scm_car (foreign), ffi_cif);
func = SCM_FOREIGN_POINTER (scm_cdr (foreign), void); func = SCM_FOREIGN_POINTER (scm_cdr (foreign), void);
/* arg pointers */ /* Argument pointers. */
args = alloca (sizeof(void*) * cif->nargs); args = alloca (sizeof(void*) * cif->nargs);
/* arg values, then return type value */
data = alloca (ROUND_UP (cif->bytes, cif->rtype->alignment) /* Compute the amount of memory needed to store all the argument values.
+ cif->rtype->size); Note: as of libffi 3.0.9 `cif->bytes' is undocumented and is zero, so it
can't be used for that purpose. */
for (i = 0, arg_size = 0;
i < cif->nargs;
i++, arg_size)
arg_size += ROUND_UP (cif->arg_types[i]->size,
cif->arg_types[i]->alignment);
/* Space for argument values, followed by return value. */
data = alloca (arg_size
+ ROUND_UP (cif->rtype->size, cif->rtype->alignment));
/* unpack argv to native values, setting argv pointers */ /* unpack argv to native values, setting argv pointers */
off = 0; off = 0;
for (i = 0; i < cif->nargs; i++) for (i = 0; i < cif->nargs; i++)