diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-11-29 21:23:43 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-11-29 21:23:43 +0300 |
| commit | e7ae9f493aaa004caf3627489752139f177a807b (patch) | |
| tree | 0877ae732204c3b6f5d5e9aa630340bd29087a1b /source/blender/compositor/intern | |
| parent | aa7051c8f21a6b7e2b413b40317502e69764fa05 (diff) | |
Fix T93310: crash due to broken image paths
The crash was caused by allocating an uninitialized amount of memory.
This fix initializes a bunch of variables that could cause the error.
It should be possible to also fix this in the function that actually uses
the uninitialized memory, but that could cause unknown consequences
that are a bit too risky for 3.0. Just initializing some variables should
be safe though. For more details see D13369.
Differential Revision: https://developer.blender.org/D13369
Diffstat (limited to 'source/blender/compositor/intern')
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.cc | 2 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc index 8a7ae1f4fcb..3050d82bf62 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cc +++ b/source/blender/compositor/intern/COM_NodeOperation.cc @@ -150,7 +150,7 @@ void NodeOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) modify_determined_canvas_fn_(r_area); } - rcti unused_area; + rcti unused_area = COM_AREA_NONE; const rcti &local_preferred_area = r_area; for (unsigned int index = 0; index < inputs_.size(); index++) { if (index == used_canvas_index) { diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 627fffb1ec7..e969d836464 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -351,7 +351,7 @@ class NodeOperation { */ eExecutionModel execution_model_; - rcti canvas_; + rcti canvas_ = COM_AREA_NONE; /** * Flags how to evaluate this operation. |