fix potential crashes

GrammaticalFramework · Sep 3, 2024 · d43d2cb · d43d2cb
1 parent c519d4b
commit d43d2cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/runtime/c/pgf/expr.cxx b/src/runtime/c/pgf/expr.cxx
@@ -202,15 +202,17 @@ PgfType PgfDBUnmarshaller::dtyp(size_t n_hypos, PgfTypeHypo *hypos,
     ref<PgfDTyp> ty =
         PgfDB::malloc<PgfDTyp>(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++) {
         ref<PgfHypo> hypo = ty->hypos.elem(i);
         hypo->bind_type = hypos[i].bind_type;
         hypo->cid = textdup_db(hypos[i].cid);
         PgfType type = m->match_type(this, hypos[i].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++) {
         PgfExpr expr = m->match_expr(this, exprs[i]);
         ty->exprs[i] = expr;

diff --git a/src/runtime/c/pgf/pgf.cxx b/src/runtime/c/pgf/pgf.cxx
@@ -1572,7 +1572,8 @@ void pgf_create_category(PgfDB *db, PgfRevision revision,
 
         ref<PgfPGF> pgf = db->revision2pgf(revision);
         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;
         memcpy(&abscat->name, name, sizeof(PgfText)+name->size+1);