Draft: [buster] Fix CVE-2024-34397

buster backport of:

• DSA 5682-1 (CVE-2024-34397)
• DSA 5682-2 (regression fix)
• #1070851, !37 (merged), !38 (merged) (minor regression fix)

See also https://lists.debian.org/debian-lts/2024/05/msg00008.html