suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify the use of foff as a base pointer in foreign malloc

Browse Source 
Fixes #2285.
This commit is contained in:
Paulo Matos 2018-10-01 09:31:21 +02:00 committed by Matthew Flatt
parent b223ce471e
commit 9020f5aac5
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
racket/src/foreign/foreign.c
View File

@ -2675,8 +2675,19 @@ static Scheme_Object *foreign_malloc(int argc, Scheme_Object *argv[])
}
res = scheme_malloc_fail_ok(mf,size);
if (failok && (res == NULL)) scheme_signal_error("malloc: out of memory");
if (((from != NULL) || (foff != 0)) && (res != NULL))
memcpy(res, W_OFFSET(from, foff), size);
/* We might want to use foff as the object base address if from is NULL,
* therefore set a src point to use in memcpy to clarify this */
{
void *src = NULL;
if (from != NULL)
src = W_OFFSET(from, foff);
else if (foff != 0)
src = (void *)foff;
if (src != NULL && res != NULL)
memcpy(res, src, size);
}
if (SAME_OBJ(mode, raw_sym))
return scheme_make_foreign_external_cpointer(res);
else

15
racket/src/foreign/foreign.rktc
View File

@ -1914,8 +1914,19 @@ static void* SCHEME2C(const char *who,
}
res = scheme_malloc_fail_ok(mf,size);
if (failok && (res == NULL)) scheme_signal_error("malloc: out of memory");
if (((from != NULL) || (foff != 0)) && (res != NULL))
memcpy(res, W_OFFSET(from, foff), size);
/* We might want to use foff as the object base address if from is NULL,
* therefore set a src point to use in memcpy to clarify this */
{
void *src = NULL;
if (from != NULL)
src = W_OFFSET(from, foff);
else if (foff != 0)
src = (void *)foff;
if (src != NULL && res != NULL)
memcpy(res, src, size);
}
if (SAME_OBJ(mode, raw_sym))
return scheme_make_foreign_external_cpointer(res);
else