diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-02 11:44:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-02 11:44:41 +0300 |
| commit | a4c655848180a8e88c1b19a1be0a96cff66670f2 (patch) | |
| tree | 2b58fff936af22492735cdecf725de6d7d386e99 /source/blender/imbuf/intern/allocimbuf.c | |
| parent | 0e1cf858a0f11d0a57ad60429af650b2da632889 (diff) | |
Fix (unreported) memleak in ImBuf mipmap code in some cases.
`IMB_remakemipmap` may 'shrink' the mipmap list without actually freeing
anything, so we need to check all possible levels in `imb_freemipmapImBuf`
to avoid memory leaks, not only those currently used.
Diffstat (limited to 'source/blender/imbuf/intern/allocimbuf.c')
| -rw-r--r-- | source/blender/imbuf/intern/allocimbuf.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index ef3743d9c8a..33750478bb4 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -89,11 +89,14 @@ void imb_mmap_unlock(void) void imb_freemipmapImBuf(ImBuf *ibuf) { int a; - - for (a = 1; a < ibuf->miptot; a++) { - if (ibuf->mipmap[a - 1]) - IMB_freeImBuf(ibuf->mipmap[a - 1]); - ibuf->mipmap[a - 1] = NULL; + + /* Do not trust ibuf->miptot, in some cases IMB_remakemipmap can leave unfreed unused levels, + * leading to memory leaks... */ + for (a = 0; a < IMB_MIPMAP_LEVELS; a++) { + if (ibuf->mipmap[a] != NULL) { + IMB_freeImBuf(ibuf->mipmap[a]); + ibuf->mipmap[a] = NULL; + } } ibuf->miptot = 0; |