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

fix memory leak introduced by putting setjmp in the wrong place

Browse source
This commit is contained in:
Meredith L. Patterson 2015-08-02 21:46:57 +02:00
parent 1ffd8d9276
commit 6bffacefaf
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/backends/regex.c
View file

@ -348,12 +348,7 @@ bool h_svm_action_clear_to_mark(HArena *arena, HSVMContext *ctx, void* env) {
// Glue regex backend to rest of system // Glue regex backend to rest of system
bool h_compile_regex(HRVMProg *prog, const HParser *parser) { bool h_compile_regex(HRVMProg *prog, const HParser *parser) {
if (setjmp(prog->except)) { return parser->vtable->compile_to_rvm(prog, parser->env);
return false;
}
bool ret = parser->vtable->compile_to_rvm(prog, parser->env);
memset(prog->except, 0, sizeof(prog->except));
return ret;
} }
static void h_regex_free(HParser *parser) { static void h_regex_free(HParser *parser) {
@ -375,12 +370,16 @@ static int h_regex_compile(HAllocator *mm__, HParser* parser, const void* params
prog->insns = NULL; prog->insns = NULL;
prog->actions = NULL; prog->actions = NULL;
prog->allocator = mm__; prog->allocator = mm__;
if (setjmp(prog->except)) {
return false;
}
if (!h_compile_regex(prog, parser)) { if (!h_compile_regex(prog, parser)) {
h_free(prog->insns); h_free(prog->insns);
h_free(prog->actions); h_free(prog->actions);
h_free(prog); h_free(prog);
return 2; return 2;
} }
memset(prog->except, 0, sizeof(prog->except));
h_rvm_insert_insn(prog, RVM_ACCEPT, 0); h_rvm_insert_insn(prog, RVM_ACCEPT, 0);
parser->backend_data = prog; parser->backend_data = prog;
return 0; return 0;