diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/trace/imagemap.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/trace/imagemap.cpp')
| -rw-r--r-- | src/trace/imagemap.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/trace/imagemap.cpp b/src/trace/imagemap.cpp index a9ad9b9c8..c5a6bc2b5 100644 --- a/src/trace/imagemap.cpp +++ b/src/trace/imagemap.cpp @@ -78,10 +78,16 @@ GrayMap *GrayMapCreate(int width, int height) me->height = height; me->pixels = (unsigned long *) malloc(sizeof(unsigned long) * width * height); + if (!me->pixels) + { + free(me); + return NULL; + } me->rows = (unsigned long **) malloc(sizeof(unsigned long *) * height); - if (!me->pixels || !me->rows) + if (!me->rows) { + free(me->pixels); free(me); return NULL; } |