Skip to content

fix(test): drop the second MALLOC_PERTURB_ entry and state row that #2548 landed twice - #2560

Merged
lusoris merged 1 commit into
masterfrom
fix/dedupe-uaf-perturb-2548
Oct 8, 2026
Merged

lusoris merged 1 commit into
masterfrom
fix/dedupe-uaf-perturb-2548

Conversation

@lusoris

@lusoris lusoris commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor

Summary

reverts: #2548 (partially: drop duplicate MALLOC_PERTURB_ entry and state row)
intentional revert: drop the duplicate MALLOC_PERTURB_ entry and state row from #2548

#2548 landed the merge train's squash of its first revision (43298360b, built before the rework c0a0a61ed). That revision still carried its own MALLOC_PERTURB_=0 entry for test_gpu_picture_pool_uaf and a state row for the same bug, both of which #2547 had already landed. Master therefore lists the env entry twice and the bug twice.

The merge train now re-reads every PR head right before it pushes a batch and drops a PR whose head moved while it was gated (local tooling, not in this repository).

Type

  • fix — bug fix

Checklist

  • Commits follow Conventional Commits; signed off.
  • check-state-md-rows.sh OK, make docs-fragments-check OK, commit hooks passed.
  • Unit tests: no behaviour change (the duplicate entry set the same value).
  • SIMD/GPU / twins: not touched.

Bug-status hygiene

  • docs/state.md updated: the duplicate row of the same closed bug is removed.

Netflix golden-data gate

  • I did not modify any assertAlmostEqual(...) score in the Netflix golden Python tests.

Deep-dive deliverables

  • Research digest — no digest needed: trivial.
  • Decision matrix — no alternatives: only-one-way fix.
  • AGENTS.md invariant note — no rebase-sensitive invariants.
  • Reproducer / smoke-test command — below.
  • CHANGELOG fragment — no changelog needed: it only edits an existing fragment to drop a duplicate claim.
  • Rebase note — no rebase impact: it removes a duplicate line from an existing fragment.

Reproducer

grep -c "'MALLOC_PERTURB_=0'" core/test/meson.build   # 1
grep -c 'T-TEST-GPU-POOL-UAF-PERTURB-OVERCOMMIT' docs/state.md   # 0
bash scripts/ci/check-state-md-rows.sh

@github-actions github-actions Bot added the type:bug Something isn't working label Oct 8, 2026
@lusoris
lusoris force-pushed the fix/dedupe-uaf-perturb-2548 branch from d0a3fbe to 9be6a0f Compare October 8, 2026 01:37
…2548 landed twice (#2560)

* fix(test): drop the second MALLOC_PERTURB_ entry and state row that #2548 landed twice

#2548 landed the merge train's squash of its first revision, which still carried its own MALLOC_PERTURB_=0 entry for test_gpu_picture_pool_uaf and a state row for the same bug; #2547 had already landed both. core/test/meson.build now lists the entry once (#2547's), docs/state.md keeps T-GPU-POOL-UAF-TEST-FILLS-HOST-MEMORY-2026-10-08 only, and the #2548 changelog and rebase-note fragments no longer claim that fix.

Signed-off-by: Lusoris <lusoris@proton.me>
@lusoris
lusoris force-pushed the fix/dedupe-uaf-perturb-2548 branch from 9be6a0f to ec72231 Compare October 8, 2026 02:16
@lusoris
lusoris merged commit ec72231 into master Oct 8, 2026
9 of 33 checks passed
@lusoris
lusoris deleted the fix/dedupe-uaf-perturb-2548 branch October 8, 2026 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type:bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant