Fix #124995: Crashes in rendering code due to invalid material indices #125309

Merged
Falk David merged 2 commits from filedescriptor/blender:fix-124995 into main 2024-07-23 14:35:43 +02:00
Member

The issue was that some material_index were -1. This meant that
the rendering code was accessing out-of-bounds memory to read
from the material pool.

The fix adds an assert to the gpencil_material_resources_get and
clamps the material_index to >= 0 to ensure that the material is
valid. It also changes the default read value for the material indices
in create_curves_outline and retrieve_visible_strokes to be 0
instead of -1.

The issue was that some `material_index` were `-1`. This meant that the rendering code was accessing out-of-bounds memory to read from the material pool. The fix adds an assert to the `gpencil_material_resources_get` and clamps the `material_index` to >= 0 to ensure that the material is valid. It also changes the default read value for the material indices in `create_curves_outline` and `retrieve_visible_strokes` to be 0 instead of -1.
Falk David added 1 commit 2024-07-23 13:38:48 +02:00
Fix #124995: Crashes in rendering code due to invalid material indices
All checks were successful
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
2d56f4ad16
The issue was that some `material_index` were `-1`. This meant that
the rendering code was accessing out-of-bounds memory to read
from the material pool.

The fix adds an assert to the `gpencil_material_resources_get` and
clamps the `material_index` to >= 0 to ensure that the material is
valid. It also changes the default read value for the material indices
in `create_curves_outline` and `retrieve_visible_strokes` to be 0
instead of -1.
Author
Member

@blender-bot build

@blender-bot build
Lukas Tönne approved these changes 2024-07-23 13:48:14 +02:00
@ -791,3 +791,3 @@
visible_strokes.foreach_index([&](const int stroke_i, const int pos) {
const IndexRange points = points_by_curve[stroke_i];
const int material_index = stroke_materials[stroke_i];
/* The material index shouldn't be negative. We clamp it here to avoid crashing in the
Member

I'd say "can be negative". "shouldn't" makes it sound like it must be prevented (where and by whom?), but in fact any user can write to the material_index attribute, so the code just has to check before using the values.

I'd say "can be negative". _"shouldn't"_ makes it sound like it must be prevented (where and by whom?), but in fact any user can write to the `material_index` attribute, so the code just has to check before using the values.
Author
Member

Updated the comment.

Updated the comment.
filedescriptor marked this conversation as resolved
Falk David added 1 commit 2024-07-23 13:51:05 +02:00
Falk David merged commit 56bd0c7e4a into main 2024-07-23 14:35:43 +02:00
Falk David deleted branch fix-124995 2024-07-23 14:35:47 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#125309
No description provided.