msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fix potential crashes

Browse Source
This commit is contained in:
Krasimir Angelov
2024-09-03 16:41:22 +02:00
parent c519d4bfae
commit d43d2cbdb1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/c/pgf/expr.cxx
View File

@@ -202,7 +202,8 @@ PgfType PgfDBUnmarshaller::dtyp(size_t n_hypos, PgfTypeHypo *hypos,
ref<PgfDTyp> ty = ref<PgfDTyp> ty =
PgfDB::malloc<PgfDTyp>(cat->size+1); PgfDB::malloc<PgfDTyp>(cat->size+1);
memcpy(&ty->name, cat, sizeof(PgfText)+cat->size+1); memcpy(&ty->name, cat, sizeof(PgfText)+cat->size+1);
ty->hypos = vector<PgfHypo>::alloc(n_hypos); vector<PgfHypo> new_hypos = vector<PgfHypo>::alloc(n_hypos);
ty->hypos = new_hypos;
for (size_t i = 0; i < n_hypos; i++) { for (size_t i = 0; i < n_hypos; i++) {
ref<PgfHypo> hypo = ty->hypos.elem(i); ref<PgfHypo> hypo = ty->hypos.elem(i);
hypo->bind_type = hypos[i].bind_type; hypo->bind_type = hypos[i].bind_type;
@@ -210,7 +211,8 @@ PgfType PgfDBUnmarshaller::dtyp(size_t n_hypos, PgfTypeHypo *hypos,
PgfType type = m->match_type(this, hypos[i].type); PgfType type = m->match_type(this, hypos[i].type);
hypo->type = type; hypo->type = type;
} }
ty->exprs = vector<PgfExpr>::alloc(n_exprs); vector<PgfExpr> new_exprs = vector<PgfExpr>::alloc(n_exprs);
ty->exprs = new_exprs;
for (size_t i = 0; i < n_exprs; i++) { for (size_t i = 0; i < n_exprs; i++) {
PgfExpr expr = m->match_expr(this, exprs[i]); PgfExpr expr = m->match_expr(this, exprs[i]);
ty->exprs[i] = expr; ty->exprs[i] = expr;

3
src/runtime/c/pgf/pgf.cxx
View File

@@ -1572,7 +1572,8 @@ void pgf_create_category(PgfDB *db, PgfRevision revision,
ref<PgfPGF> pgf = db->revision2pgf(revision); ref<PgfPGF> pgf = db->revision2pgf(revision);
ref<PgfAbsCat> abscat = PgfDB::malloc<PgfAbsCat>(name->size+1); ref<PgfAbsCat> abscat = PgfDB::malloc<PgfAbsCat>(name->size+1);
abscat->context = vector<PgfHypo>::alloc(n_hypos); vector<PgfHypo> new_context = vector<PgfHypo>::alloc(n_hypos);
abscat->context = new_context;
abscat->prob = prob; abscat->prob = prob;
memcpy(&abscat->name, name, sizeof(PgfText)+name->size+1); memcpy(&abscat->name, name, sizeof(PgfText)+name->size+1);