Skip to content

Change type of allocate64 to uint64_t (backport #9307)#9353

Open
mergify[bot] wants to merge 2 commits into
0.28.xfrom
mergify/bp/0.28.x/pr-9307
Open

Change type of allocate64 to uint64_t (backport #9307)#9353
mergify[bot] wants to merge 2 commits into
0.28.xfrom
mergify/bp/0.28.x/pr-9307

Conversation

@mergify

@mergify mergify Bot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

The claim in #3526 that there could be an integer overflow is not true on 64-bit architectures. It could only happen if size_t is 32-bits. The solution is to change the type of allocate64 to uint64_t so that it isn't affected by the architecture. I was puzzled why the variable is called allocate64 but its type is size_t. It turns out that this is a regression that happened in 7576a27. I had previously changed the type to uint64_t in e4e3362.


This is an automatic backport of pull request #9307 done by Mergify.

@mergify mergify Bot added the conflicts label Jun 21, 2026
@mergify

mergify Bot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of ba0c456 has failed:

On branch mergify/bp/0.28.x/pr-9307
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit ba0c456b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/image.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos added this to the v0.28.9 milestone Jun 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants