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

Only copy argv if not NULL

Browse Source 
Fixes #2283.
This commit is contained in:
Paulo Matos 2018-09-22 18:35:34 +02:00 committed by Matthew Flatt
parent e83ca7a9e5
commit bc3777792d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
racket/src/racket/src/startup-glue.inc
View File

@ -138,7 +138,7 @@ static Scheme_Object *do_apply_k(void)
static Scheme_Object *c_handle_overflow_or_space(Scheme_Object *proc, int argc, Scheme_Object **argv, int runstack_space)
{
Scheme_Thread *p;
Scheme_Object **argv2;
Scheme_Object **argv2 = NULL;
/* stash before allocation: */
p = scheme_current_thread;
@ -146,13 +146,17 @@ static Scheme_Object *c_handle_overflow_or_space(Scheme_Object *proc, int argc,
p->ku.k.i1 = argc;
p->ku.k.i2 = runstack_space;
p->ku.k.p2 = (void *)argv;
argv2 = MALLOC_N(Scheme_Object*, argc);
p = scheme_current_thread;
argv = (Scheme_Object **)p->ku.k.p2;
memcpy(argv2, argv, sizeof(Scheme_Object *) * argc);
if (argc != 0) {
argv2 = MALLOC_N(Scheme_Object*, argc);
/* In order for this code to be GC friendly, which can be triggered
* anytime memory is allocated, we need to refresh scheme_current_thread */
p = scheme_current_thread;
argv = (Scheme_Object **)p->ku.k.p2;
memcpy(argv2, argv, sizeof(Scheme_Object *) * argc);
}
if (argv == MZ_RUNSTACK)
memset(argv, 0, sizeof(Scheme_Object *) * argc); /* space safety */