Fix #119554: Remove links to and from unsupported socket types #119630

Merged
Lukas Tönne merged 2 commits from LukasTonne/blender:fix-unsupported-socket-links into blender-v3.6-release 2024-03-19 09:38:01 +01:00
Member

#114401 added forward compatibility code to remove unsupported socket
types and avoid crashing with unknown default_value data. However, this
did not update link pointers (which haven't been read at that point),
so the tree can end up with dangling pointers.

To fix this, removal of unsupported sockets is moved further back to a
point where links have been read and can be fixed accordingly.

#114401 added forward compatibility code to remove unsupported socket types and avoid crashing with unknown default_value data. However, this did not update link pointers (which haven't been read at that point), so the tree can end up with dangling pointers. To fix this, removal of unsupported sockets is moved further back to a point where links have been read and can be fixed accordingly.
Lukas Tönne added this to the 3.6 LTS milestone 2024-03-18 16:56:36 +01:00
Lukas Tönne added 1 commit 2024-03-18 16:56:47 +01:00
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
865e643264
Fix #119554: Remove links to and from unsupported socket types.
types and avoid crashing with unknown default_value data. However, this
did not update link pointers (which haven't been read at that point),
so the tree can end up with dangling pointers.

To fix this, removal of unsupported sockets is moved further back to a
point where links have been read and can be fixed accordingly.
Lukas Tönne added this to the Nodes & Physics project 2024-03-18 16:56:54 +01:00
Lukas Tönne requested review from Jacques Lucke 2024-03-18 16:57:00 +01:00
Author
Member

@blender-bot build

@blender-bot build
Jacques Lucke requested changes 2024-03-18 17:24:25 +01:00
Dismissed
@ -716,1 +724,4 @@
}
BLI_remlink(sockets, sock);
MEM_freeN(sock->runtime);
Member

The socket runtime data is not trivial data (I think that was the case in 3.6 already). So this should be freed with MEM_delete.

The socket runtime data is not trivial data (I think that was the case in 3.6 already). So this should be freed with `MEM_delete`.
LukasTonne marked this conversation as resolved
Lukas Tönne added 1 commit 2024-03-18 17:28:59 +01:00
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
a63b5191c2
Use MEM_delete to free non-trivial socket runtime data.
Author
Member

@blender-bot build

@blender-bot build
Jacques Lucke approved these changes 2024-03-18 17:32:21 +01:00
Jacques Lucke left a comment
Member

I haven't actually tested running this. I could if you prefer, but the changes look reasonable to me. If I should test it myself, do you have any tips for building 3.6 without the hassle that you apparently ran into today?

I haven't actually tested running this. I could if you prefer, but the changes look reasonable to me. If I should test it myself, do you have any tips for building 3.6 without the hassle that you apparently ran into today?
Author
Member

I haven't actually tested running this.

Fine with me.

do you have any tips for building 3.6 without the hassle that you apparently ran into today?

Part of that was having to change my git worktree setup and build folder, since i haven't touched the 3.6 branch since the git LFS migration. And then make update seems to have trouble picking up the right libraries under unknown circumstances.

> I haven't actually tested running this. Fine with me. > do you have any tips for building 3.6 without the hassle that you apparently ran into today? Part of that was having to change my git worktree setup and build folder, since i haven't touched the 3.6 branch since the git LFS migration. And then `make update` seems to have trouble picking up the right libraries under unknown circumstances.
Lukas Tönne merged commit 95f35a86ee into blender-v3.6-release 2024-03-19 09:38:01 +01:00
Lukas Tönne deleted branch fix-unsupported-socket-links 2024-03-19 09:38:07 +01:00
Member

Was a bit surprised to see this land on release day, we usually let these kinds of things settle for a week.
This also is not on #109399.

CC @ThomasDinges

Was a bit surprised to see this land on release day, we usually let these kinds of things settle for a week. This also is not on #109399. CC @ThomasDinges
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
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
EEVEE & Viewport
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
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
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
EEVEE & Viewport
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
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
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 Assignees
3 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#119630
No description provided.