conservatory/picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bugfix] calling dead escape continuation causes segv

Browse Source
This commit is contained in:
Yuichi Nishiwaki
2015-06-02 06:01:16 +09:00
parent 1e3bb6f1bb
commit dbcd81c8c1
8 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extlib/benz/include/picrin.h
+6
View File
@@ -48,6 +48,11 @@ extern "C" {
typedef struct pic_code pic_code;
typedef struct pic_jmpbuf {
PIC_JMPBUF buf;
struct pic_jmpbuf *prev;
} pic_jmpbuf;
struct pic_winder {
struct pic_proc *in;
struct pic_proc *out;
@@ -73,6 +78,7 @@ typedef struct {
pic_allocf allocf;
pic_jmpbuf *jmp;
struct pic_winder *wind;
pic_value *sp;
extlib/benz/include/picrin/config.h
+3 -3
View File
@@ -21,7 +21,7 @@
/* #define PIC_NONE_IS_FALSE 1 */
/** custom setjmp/longjmp */
/* #define PIC_JMPBUF_SIZE sizeof(jmp_buf) */
/* #define PIC_JMPBUF jmp_buf */
/* #define PIC_SETJMP(pic, buf) setjmp(buf) */
/* #define PIC_LONGJMP(pic, buf, val) longjmp((buf), (val)) */
@@ -100,9 +100,9 @@
# define PIC_NONE_IS_FALSE 1
#endif
#ifndef PIC_JMPBUF_SIZE
#ifndef PIC_JMPBUF
# include <setjmp.h>
# define PIC_JMPBUF_SIZE sizeof(jmp_buf)
# define PIC_JMPBUF jmp_buf
#endif
#ifndef PIC_SETJMP
extlib/benz/include/picrin/cont.h
+1 -3
View File
@@ -10,9 +10,7 @@ extern "C" {
#endif
struct pic_escape {
char jmp[PIC_JMPBUF_SIZE];
bool valid;
pic_jmpbuf jmp;
struct pic_winder *wind;
extlib/benz/include/picrin/error.h
+3 -1
View File
@@ -32,13 +32,15 @@ struct pic_error *pic_make_error(pic_state *, pic_sym *, const char *, pic_list)
do { \
struct pic_escape *escape = pic_malloc(pic, sizeof(struct pic_escape)); \
pic_save_point(pic, escape); \
if (PIC_SETJMP(pic, (void *)escape->jmp) == 0) { \
if (PIC_SETJMP(pic, (void *)escape->jmp.buf) == 0) { \
do { \
pic_push_try(pic, pic_make_econt(pic, escape));
#define pic_catch_(label) \
pic_pop_try(pic); \
} while (0); \
pic->jmp = pic->jmp->prev; \
} else { \
pic->jmp = pic->jmp->prev; \
goto label; \
} \
} while (0); \