From 695c776065e025b999607ea667f7852e220d0bbd Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Fri, 24 Feb 2012 15:15:07 +0000 Subject: [PATCH] libpgf: fix in pgf_read_into_map --- src/runtime/c/pgf/reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/runtime/c/pgf/reader.c b/src/runtime/c/pgf/reader.c index d09875dd0..d9b3897c3 100644 --- a/src/runtime/c/pgf/reader.c +++ b/src/runtime/c/pgf/reader.c @@ -352,8 +352,12 @@ pgf_read_into_map(GuMapType* mtype, PgfReader* rdr, GuMap* map) it. This allows us to create the value object and point into it before we read the content. */ - void* valp = gu_map_insert(map, key); - pgf_read_to(rdr, mtype->value_type, valp); + void* val0p = gu_map_insert(map, key); + void* valp = pgf_read_new(rdr, mtype->value_type, tmp_pool, NULL); + // if the map has been updated, + // then the old val0p may not be valid. + val0p = gu_map_find(map, key); + memcpy(val0p, valp, gu_type_size(mtype->value_type)); gu_return_on_exn(rdr->err, ); } gu_pool_free(tmp_pool);