Fix #113154: Improved Cursor Step Error Handling #113172

Closed
Harley Acheson wants to merge 1 commits from Harley/blender:Fix113154 into blender-v4.0-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Member

Allow BLI_str_cursor_step_bounds_utf8 to handle being called with -1
for pos, which can sometimes happen.


In this complaint, double-clicking on that data-block selector, it is a UI_BTYPE_SEARCH_MENU so we call ui_do_but_TEX. It has a blank str and its pos has a value of -1. It makes it to the event handling for KM_DBL_CLICK in ui_do_but_textedit. There it calls BLI_str_cursor_step_bounds_utf8 with a blank string and pos of -1. Because pos < str_maxlen we call cursor_delim_type_utf8 where the cast to size_t turns the -1 into maxint64, which causes the assert in BLI_str_utf8_as_unicode_step_or_error.

To my eye the only part actually misbehaving is BLI_str_cursor_step_bounds_utf8. This PR just makes it handle pos being negative. And then an assert is added to cursor_delim_type_utf8 that it never get a negative pos.

Allow `BLI_str_cursor_step_bounds_utf8` to handle being called with -1 for `pos`, which can sometimes happen. --- In this complaint, double-clicking on that data-block selector, it is a `UI_BTYPE_SEARCH_MENU` so we call `ui_do_but_TEX`. It has a blank str and its pos has a value of -1. It makes it to the event handling for KM_DBL_CLICK in `ui_do_but_textedit`. There it calls `BLI_str_cursor_step_bounds_utf8` with a blank string and pos of -1. Because `pos < str_maxlen` we call `cursor_delim_type_utf8` where the cast to size_t turns the -1 into maxint64, which causes the assert in `BLI_str_utf8_as_unicode_step_or_error`. To my eye the only part actually misbehaving is `BLI_str_cursor_step_bounds_utf8`. This PR just makes it handle pos being negative. And then an assert is added to `cursor_delim_type_utf8` that it never get a negative pos.
Harley Acheson added 1 commit 2023-10-02 19:49:15 +02:00
Allow `BLI_str_cursor_step_bounds_utf8` to handle being called with -1
for `pos`, which can sometimes happen.
Harley Acheson added this to the Core project 2023-10-02 19:49:23 +02:00
Harley Acheson requested review from Campbell Barton 2023-10-02 19:49:31 +02:00

Thanks for looking into this, committed an alternate fix: 26bb029ad8.

As cursor manipulation happens in a few isolated places, I'd rather assume the input position is always valid.
If there is some risk the input is out of range the caller can clamp.

Otherwise there is the risk of invalid cursor positions relying on cursor stepping to correct/clamp the cursor position.

In this case the press event wasn't inside the button, leaving but->pos set to -1, so calling word selection didn't make sense, now fixed.

Thanks for looking into this, committed an alternate fix: 26bb029ad89da22eb4266a4e274de568e221c3a3. As cursor manipulation happens in a few isolated places, I'd rather assume the input position is always valid. If there is some risk the input is out of range the caller can clamp. Otherwise there is the risk of invalid cursor positions relying on cursor stepping to correct/clamp the cursor position. In this case the press event wasn't inside the button, leaving `but->pos` set to -1, so calling word selection didn't make sense, now fixed.
Campbell Barton closed this pull request 2023-10-03 05:06:15 +02:00

Pull request closed

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
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
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
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 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#113172
No description provided.