emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a potential segfault; hand-initialized HParsers in h_choice and

Browse source 
h_sequence need PB_MIN set.

Conflicts:
	src/bindings/python/SConscript
	src/bindings/python/hammer_tests.py
This commit is contained in:
Meredith L. Patterson 2013-11-19 19:05:48 -06:00
parent 9e44bea920
commit c32c5cf5ea
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/parsers/choice.c
View file

@ -143,6 +143,8 @@ HParser* h_choice__ma(HAllocator* mm__, void *args[]) {
s->len = len; s->len = len;
HParser *ret = h_new(HParser, 1); HParser *ret = h_new(HParser, 1);
ret->vtable = &choice_vt; ret->env = (void*)s; ret->vtable = &choice_vt;
ret->env = (void*)s;
ret->backend = PB_MIN;
return ret; return ret;
} }

4
src/parsers/sequence.c
View file

@ -159,6 +159,8 @@ HParser* h_sequence__ma(HAllocator* mm__, void *args[]) {
s->len = len; s->len = len;
HParser *ret = h_new(HParser, 1); HParser *ret = h_new(HParser, 1);
ret->vtable = &sequence_vt; ret->env = (void*)s; ret->vtable = &sequence_vt;
ret->env = (void*)s;
ret->backend = PB_MIN;
return ret; return ret;
} }