Fix #120113: crash reading large jpeg #120214

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:120113 into main 2024-04-03 17:38:15 +02:00
Member

Caused by 406cfd214a

Above commit added a multiplication by 4 to the offset (rightfully so),
but this could overflow with very large image dimensions.

Caused by 406cfd214aaa Above commit added a multiplication by 4 to the offset (rightfully so), but this could overflow with very large image dimensions.
Philipp Oeser added 1 commit 2024-04-03 16:33:05 +02:00
Caused by 406cfd214a

Above commit added a multiplication by 4 to the offset (rightfully so),
but this could overflow with very large image dimensions.
Philipp Oeser requested review from Sergey Sharybin 2024-04-03 16:33:18 +02:00
Philipp Oeser added this to the Core project 2024-04-03 16:33:24 +02:00
Philipp Oeser added the
Interest
Images & Movies
label 2024-04-03 16:33:31 +02:00
Sergey Sharybin reviewed 2024-04-03 16:58:50 +02:00
Sergey Sharybin left a comment
Owner

Good catch!

There is one simple tweak needed to make code as robust as we can make it.

size_t(y * ibuf->x) could still overflow. Is safer to cast a single operand first, like size_t(y) * ibuf->x. The order in which you cast does not matter (as in, size_t * int is the same as int * size_t: in both cases operands are up-casted to size_t)

Good catch! There is one simple tweak needed to make code as robust as we can make it. `size_t(y * ibuf->x)` could still overflow. Is safer to cast a single operand first, like `size_t(y) * ibuf->x`. The order in which you cast does not matter (as in, `size_t * int` is the same as `int * size_t`: in both cases operands are up-casted to `size_t`)
Philipp Oeser added 1 commit 2024-04-03 17:17:25 +02:00
Sergey Sharybin approved these changes 2024-04-03 17:18:23 +02:00
Sergey Sharybin left a comment
Owner

Thanks for the update!

Thanks for the update!
Philipp Oeser merged commit 8af4c72ddd into main 2024-04-03 17:38:15 +02:00
Philipp Oeser deleted branch 120113 2024-04-03 17:38:18 +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
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#120214
No description provided.