steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't allow byte arrays to be stored in aliens

release
Slava Pestov 2007-09-28 04:02:06 -04:00
parent 3995a5c824
commit 15057fd349
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/alien/alien-tests.factor
View File

@ -56,3 +56,7 @@ cell 8 = [
] when ] when
[ "ALIEN: 1234" ] [ 1234 <alien> unparse ] unit-test [ "ALIEN: 1234" ] [ 1234 <alien> unparse ] unit-test
[ 0 B{ 1 2 3 } <displaced-alien> alien-address ] unit-test-fails
[ 1 1 <displaced-alien> ] unit-test-fails

37
vm/alien.c
View File

@ -26,6 +26,27 @@ void *alien_offset(CELL object)
} }
} }
/* gets the address of an object representing a C pointer, with the
intention of storing the pointer across code which may potentially GC. */
void *pinned_alien_offset(CELL object)
{
F_ALIEN *alien;
switch(type_of(object))
{
case ALIEN_TYPE:
alien = untag_object(object);
if(alien->expired != F)
general_error(ERROR_EXPIRED,object,F,NULL);
return alien_offset(alien->alien) + alien->displacement;
case F_TYPE:
return NULL;
default:
type_error(ALIEN_TYPE,object);
return NULL; /* can't happen */
}
}
/* pop an object representing a C pointer */ /* pop an object representing a C pointer */
void *unbox_alien(void) void *unbox_alien(void)
{ {
@ -57,6 +78,8 @@ void box_alien(void *ptr)
DEFINE_PRIMITIVE(displaced_alien) DEFINE_PRIMITIVE(displaced_alien)
{ {
CELL alien = dpop(); CELL alien = dpop();
if(type_of(alien) != F_TYPE && type_of(alien) != ALIEN_TYPE)
type_error(ALIEN_TYPE,alien);
CELL displacement = to_cell(dpop()); CELL displacement = to_cell(dpop());
if(alien == F && displacement == 0) if(alien == F && displacement == 0)
dpush(F); dpush(F);
@ -68,17 +91,7 @@ DEFINE_PRIMITIVE(displaced_alien)
if the object is a byte array, as a sanity check. */ if the object is a byte array, as a sanity check. */
DEFINE_PRIMITIVE(alien_address) DEFINE_PRIMITIVE(alien_address)
{ {
CELL object = dpop(); box_unsigned_cell((CELL)pinned_alien_offset(dpop()));
switch(type_of(object))
{
case ALIEN_TYPE:
case F_TYPE:
box_unsigned_cell((CELL)alien_offset(object));
break;
default:
type_error(ALIEN_TYPE,object);
break;
}
} }
/* pop ( alien n ) from datastack, return alien's address plus n */ /* pop ( alien n ) from datastack, return alien's address plus n */
@ -113,7 +126,7 @@ DEFINE_ALIEN_ACCESSOR(signed_1,s8,box_signed_1,to_fixnum)
DEFINE_ALIEN_ACCESSOR(unsigned_1,u8,box_unsigned_1,to_cell) DEFINE_ALIEN_ACCESSOR(unsigned_1,u8,box_unsigned_1,to_cell)
DEFINE_ALIEN_ACCESSOR(float,float,box_float,to_float) DEFINE_ALIEN_ACCESSOR(float,float,box_float,to_float)
DEFINE_ALIEN_ACCESSOR(double,double,box_double,to_double) DEFINE_ALIEN_ACCESSOR(double,double,box_double,to_double)
DEFINE_ALIEN_ACCESSOR(cell,void *,box_alien,alien_offset) DEFINE_ALIEN_ACCESSOR(cell,void *,box_alien,pinned_alien_offset)
/* for FFI calls passing structs by value */ /* for FFI calls passing structs by value */
void to_value_struct(CELL src, void *dest, CELL size) void to_value_struct(CELL src, void *dest, CELL size)