Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-12 15:27:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #297 - Complete validation for closures

Browse source 
Renumbered the type tags such that we can quickly check if an object is a closure or not. This will prevent crashes where an object of the wrong type (such as NULL or boolean) is passed in place of a closure. Previously we did not distinguish these objects, leading to segfaults and undefined behavior.
This commit is contained in:
Justin Ethier 2019-08-22 13:41:20 -04:00
parent 99c5bee97a
commit 9ee7c49334
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/cyclone/types.h
View file

@ -35,20 +35,20 @@ typedef void *object;
*\ingroup objects *\ingroup objects
*/ */
enum object_tag { enum object_tag {
boolean_tag = 0 closure0_tag = 0
, bytevector_tag = 1 , closure1_tag = 1
, c_opaque_tag = 2 , closureN_tag = 2
, closure0_tag = 3 , macro_tag = 3 // Keep closures here for quick type checking
, closure1_tag = 4 , boolean_tag = 4
, closureN_tag = 5 , bytevector_tag = 5
, cond_var_tag = 6 , c_opaque_tag = 6
, cvar_tag = 7 , cond_var_tag = 7
, double_tag = 8 , cvar_tag = 8
, eof_tag = 9 , double_tag = 9
, forward_tag = 10 , eof_tag = 10
, integer_tag = 11 , forward_tag = 11
, bignum_tag = 12 , integer_tag = 12
, macro_tag = 13 , bignum_tag = 13
, mutex_tag = 14 , mutex_tag = 14
, pair_tag = 15 , pair_tag = 15
, port_tag = 16 , port_tag = 16
@ -60,8 +60,17 @@ enum object_tag {
, atomic_tag = 22 , atomic_tag = 22
}; };
#define type_is_pair_prim(clo) \ /**
(type_of(clo) >= pair_tag) * Returns a true value if object is not a closure, or false otherwise
*/
#define type_is_not_closure(clo) \
((clo == NULL) || is_value_type(clo) || (type_of(clo) > macro_tag))
/**
* Returns a true value if object is not a closure, or false otherwise
*/
#define type_is_pair_prim(clo) (type_is_not_closure(clo))
/** /**
* Defines the size of object tags * Defines the size of object tags

10
runtime.c
View file

@ -35,12 +35,13 @@ object Cyc_global_set(void *thd, object * glo, object value)
/* Error checking section - type mismatch, num args, etc */ /* Error checking section - type mismatch, num args, etc */
/* Type names to use for error messages */ /* Type names to use for error messages */
const char *tag_names[] = { const char *tag_names[] = {
/*boolean_tag */ "boolean" /*closure0_tag */ "procedure"
/*bytevector_tag */ , "bytevector"
/*c_opaque_tag */ , "opaque"
/*closure0_tag */ , "procedure"
/*closure1_tag */ , "procedure" /*closure1_tag */ , "procedure"
/*closureN_tag */ , "procedure" /*closureN_tag */ , "procedure"
/*macro_tag */ , "macro"
/*boolean_tag */ , "boolean"
/*bytevector_tag */ , "bytevector"
/*c_opaque_tag */ , "opaque"
/*cond_var_tag */ , "condition variable" /*cond_var_tag */ , "condition variable"
/*cvar_tag */ , "C primitive" /*cvar_tag */ , "C primitive"
/*double_tag */ , "number" /*double_tag */ , "number"
@ -48,7 +49,6 @@ const char *tag_names[] = {
/*forward_tag */ , "" /*forward_tag */ , ""
/*integer_tag */ , "number" /*integer_tag */ , "number"
/*bignum_tag */ , "bignum" /*bignum_tag */ , "bignum"
/*macro_tag */ , "macro"
/*mutex_tag */ , "mutex" /*mutex_tag */ , "mutex"
/*pair_tag */ , "pair" /*pair_tag */ , "pair"
/*port_tag */ , "port" /*port_tag */ , "port"