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

fix an off-by-one alloc error in desugar_bits

Browse source
This commit is contained in:
Sven M. Hallberg 2013-05-14 16:12:09 +02:00
parent 4138506273
commit efae603c6b
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/parsers/bits.c
View file

@ -21,24 +21,31 @@ static HCFChoice* desugar_bits(HAllocator *mm__, void *env) {
struct bits_env *bits = (struct bits_env*)env; struct bits_env *bits = (struct bits_env*)env;
if (0 != bits->length % 8) if (0 != bits->length % 8)
return NULL; // can't handle non-byte-aligned for now return NULL; // can't handle non-byte-aligned for now
HCFSequence *seq = h_new(HCFSequence, 1);
seq->items = h_new(HCFChoice*, bits->length/8);
HCharset match_all = new_charset(mm__); HCharset match_all = new_charset(mm__);
for (int i = 0; i < 256; i++)
charset_set(match_all, i, 1);
HCFChoice *match_all_choice = h_new(HCFChoice, 1); HCFChoice *match_all_choice = h_new(HCFChoice, 1);
match_all_choice->type = HCF_CHARSET; match_all_choice->type = HCF_CHARSET;
match_all_choice->charset = match_all; match_all_choice->charset = match_all;
match_all_choice->action = NULL; match_all_choice->action = NULL;
for (int i = 0; i < 256; i++)
charset_set(match_all, i, 1); size_t n = bits->length/8;
for (size_t i=0; i<bits->length/8; ++i) { HCFSequence *seq = h_new(HCFSequence, 1);
seq->items = h_new(HCFChoice*, n+1);
for (size_t i=0; i<n; ++i) {
seq->items[i] = match_all_choice; seq->items[i] = match_all_choice;
} }
seq->items[n] = NULL;
HCFChoice *ret = h_new(HCFChoice, 1); HCFChoice *ret = h_new(HCFChoice, 1);
ret->type = HCF_CHOICE; ret->type = HCF_CHOICE;
ret->seq = h_new(HCFSequence*, 2); ret->seq = h_new(HCFSequence*, 2);
ret->seq[0] = seq; ret->seq[0] = seq;
ret->seq[1] = NULL; ret->seq[1] = NULL;
ret->action = NULL; ret->action = NULL;
return ret; return ret;
} }