archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPencil: Fix double-free issue in update cache

Browse Source 
When a `GPencilUpdateCacheNode` is created, it always allocates the
`children` pointer. This should not be freed until the whole cache is
deleted.
The `cache_node_update` would free the `children` pointer in a specific
case, causing a double-free later when the cache was removed.
This commit is contained in:
Falk David
2022-03-30 11:41:27 +02:00
parent 8621fdb10d
commit ebb49ddd83
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/gpencil_update_cache.c
View File

@@ -51,10 +51,8 @@ static void cache_node_free(void *node);
static void update_cache_free(GPencilUpdateCache *cache)
{
if (cache->children != NULL) {
BLI_dlrbTree_free(cache->children, cache_node_free);
MEM_freeN(cache->children);
}
BLI_dlrbTree_free(cache->children, cache_node_free);
MEM_SAFE_FREE(cache->children);
MEM_freeN(cache);
}
@@ -83,9 +81,8 @@ static void cache_node_update(void *node, void *data)
/* In case the new cache does a full update, remove its children since they will be all
* updated by this cache. */
if (new_update_cache->flag == GP_UPDATE_NODE_FULL_COPY && update_cache->children != NULL) {
if (new_update_cache->flag == GP_UPDATE_NODE_FULL_COPY) {
BLI_dlrbTree_free(update_cache->children, cache_node_free);
MEM_freeN(update_cache->children);
}
update_cache_free(new_update_cache);