nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

spandsp: fix url and patch UB on ppc64be (#499147)

Browse Source
This commit is contained in:
misuzu
2026-09-16 09:42:35 +00:00
committed by GitHub
parent d278faec92 c4d7c303d3
commit 5e48062abd
3 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/spandsp/common.nix
View File

@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/freeswitch/spandsp/pull/111
./Fix-tests-pcap_parse-build-on-musl.patch
# https://github.com/freeswitch/spandsp/pull/116
./fix-bit-operations-ub.patch
]
++ patches;
@@ -173,6 +176,10 @@ stdenv.mkDerivation (finalAttrs: {
# Seemingly runs forever, with tons of output
"v22bis_tests"
]
++ lib.optionals stdenv.hostPlatform.isPower64 [
# Output differs from x86-generated reference due to float precision
"lpc10_tests"
];
checkPhase = ''
@@ -220,6 +227,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ misuzu ];
teams = [ lib.teams.ngi ];
license = lib.licenses.gpl2;
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
downloadPage = "https://github.com/freeswitch/spandsp";
};
})

2
pkgs/development/libraries/spandsp/default.nix
View File

@@ -7,7 +7,7 @@
(callPackage ./common.nix { }) rec {
version = "0.0.6";
src = fetchurl {
url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
url = "https://src.fedoraproject.org/lookaside/pkgs/spandsp/spandsp-${version}.tar.gz/897d839516a6d4edb20397d4757a7ca3/spandsp-${version}.tar.gz";
sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
};
patches = [

53
pkgs/development/libraries/spandsp/fix-bit-operations-ub.patch Normal file
View File

@@ -0,0 +1,53 @@
From 6366823f4c6a1641543a0f3859afcafccf2e47af Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <git@amaanq.com>
Date: Wed, 11 Mar 2026 23:34:26 -0400
Subject: [PATCH] tests: fix undefined behavior in `bit_operations_tests`
The `most_significant_one32`/`least_significant_one32` test loop
started at `i = -1`, which produces a shift of `1U << -1`. This is
undefined behavior per the C standard, as the shift count must be in
`[0, bit_width)`. On x86 this happened to produce `0x80000000` due to
masking the shift count to 5 bits, but on ppc64be it produces `0`,
causing a spurious test failure.
This commit starts the loop at `i = 0` instead. Testing the zero-input
case is not meaningful here since `most_significant_one32(0)` itself
invokes UB internally (`1 << top_bit(0)` where `top_bit` returns `-1`).
I've also fixed the printf format strings to use `1U` instead of `1` to
avoid signed overflow when `i = 31`.
---
tests/bit_operations_tests.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/bit_operations_tests.c b/tests/bit_operations_tests.c
index 53cd997..53f7892 100644
--- a/tests/bit_operations_tests.c
+++ b/tests/bit_operations_tests.c
@@ -257,22 +257,22 @@ int main(int argc, char *argv[])
printf("Test failed: parity 8 - %x %x %x\n", i, ax, bx);
exit(2);
}
}
- for (i = -1; i < 32; i++)
+ for (i = 0; i < 32; i++)
{
ax32 = most_significant_one32(1 << i);
if (ax32 != (1 << i))
{
- printf("Test failed: most significant one 32 - %x %" PRIx32 " %x\n", i, ax32, (1 << i));
+ printf("Test failed: most significant one 32 - %x %" PRIx32 " %x\n", i, ax32, (1U << i));
exit(2);
}
ax32 = least_significant_one32(1 << i);
if (ax32 != (1 << i))
{
- printf("Test failed: least significant one 32 - %x %" PRIx32 " %x\n", i, ax32, (1 << i));
+ printf("Test failed: least significant one 32 - %x %" PRIx32 " %x\n", i, ax32, (1U << i));
exit(2);
}
}
for (i = 0x80000000; i < 0x800FFFFF; i++)
--
2.53.0