diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-09-16 15:48:04 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-09-16 15:48:04 +0000 |
| commit | 50a205d20f25d26e77299f5bf8e62e1aa038d2b7 (patch) | |
| tree | 3a032a6f8225c02db315a862306fee857ca5f479 /src/lib/openjp2/tgt.c | |
| parent | b0072bf658c9294d0bd337cb3acd638d01124ee8 (diff) | |
[trunk] improve memory management (fixes issue 359)
Diffstat (limited to 'src/lib/openjp2/tgt.c')
| -rw-r--r-- | src/lib/openjp2/tgt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c index e77adb3b..6143c08a 100644 --- a/src/lib/openjp2/tgt.c +++ b/src/lib/openjp2/tgt.c @@ -57,12 +57,11 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) { OPJ_UINT32 numlvls; OPJ_UINT32 n; - tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t)); + tree = (opj_tgt_tree_t *) opj_calloc(1,sizeof(opj_tgt_tree_t)); if(!tree) { fprintf(stderr, "ERROR in tgt_create while allocating tree\n"); return 00; } - memset(tree,0,sizeof(opj_tgt_tree_t)); tree->numleafsh = numleafsh; tree->numleafsv = numleafsv; @@ -92,7 +91,6 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) { opj_free(tree); return 00; } - memset(tree->nodes,0,tree->numnodes * sizeof(opj_tgt_node_t)); tree->nodes_size = tree->numnodes * (OPJ_UINT32)sizeof(opj_tgt_node_t); node = tree->nodes; |