summaryrefslogtreecommitdiff
path: root/src/runtime/c/pgf
diff options
context:
space:
mode:
authorkr.angelov <kr.angelov@gmail.com>2012-02-24 15:15:07 +0000
committerkr.angelov <kr.angelov@gmail.com>2012-02-24 15:15:07 +0000
commit667ca8e5f7988d69393ce31058072eb8868445ae (patch)
tree0b7b0deda7da63df0c401853a90a7ed681a66d16 /src/runtime/c/pgf
parent1d239ab567f7ecbdec338563719ef19d9211a6e8 (diff)
libpgf: fix in pgf_read_into_map
Diffstat (limited to 'src/runtime/c/pgf')
-rw-r--r--src/runtime/c/pgf/reader.c8
1 files 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);