Bug#1104235: Update debian/patches/utsn.patch for hurd-any
From
Mattias Ellert@21:1/5 to
All on Sun Apr 27 16:10:01 2025
--=-8ijCNgPJm9jq/VHLavzW
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Package: src:libs3
Version: 2.0-4
Severity: important
Tags: ftbfs patch
On Linux _UTSNAME_SYSNAME_LENGTH and _UTSNAME_MACHINE_LENGTH are 65,
and the platform string, which is defined as
char platform[_UTSNAME_SYSNAME_LENGTH + 1 + _UTSNAME_MACHINE_LENGTH];
fits into the subsequent snprintf command:
snprintf(userAgentG, sizeof(userAgentG),
"Mozilla/4.0 (Compatible; %s; libs3 %s.%s; %s)",
userAgentInfo, LIBS3_VER_MAJOR, LIBS3_VER_MINOR, platform);
where the target string is defined as:
#define USER_AGENT_SIZE 256
static char userAgentG[USER_AGENT_SIZE];
However, on Hurd _UTSNAME_SYSNAME_LENGTH and _UTSNAME_MACHINE_LENGTH
are 1024, and the compilation fails:
src/request.c:1105:57: error: ‘%s’ directive output may be truncated writing up to 2048 bytes into a region of size between 211 and 218 [-Werror=format-truncation=]
1105 | "Mozilla/4.0 (Compatible; %s; libs3 %s.%s; %s)",
| ^~
1106 | userAgentInfo, LIBS3_VER_MAJOR, LIBS3_VER_MINOR, platform);
| ~~~~~~~~ src/request.c:1104:5: note: ‘snprintf’ output 40 or more bytes (assuming 2095) into a destination of size 256
1104 | snprintf(userAgentG, sizeof(userAgentG),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1105 | "Mozilla/4.0 (Compatible; %s; libs3 %s.%s; %s)",
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1106 | userAgentInfo, LIBS3_VER_MAJOR, LIBS3_VER_MINOR, platform);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors
The attached updated patch (intended to replace the current debian/patches/utsn.patch has the following change:
-#define USER_AGENT_SIZE 256
+#define USER_AGENT_SIZE 126 + _UTSNAME_SYSNAME_LENGTH + _UTSNAME_MACHINE_LENGTH
This implies no change for Linux (126 + 65 + 65 = 256), but increases
the size to the appropriate size on Hurd.
--=-8ijCNgPJm9jq/VHLavzW
Content-Disposition: attachment; filename="utsn.patch"
Content-Type: text/x-patch; name="utsn.patch"; charset="UTF-8" Content-Transfer-Encoding: base64
ZGlmZiAtdXIgbGliczMtMi4wLm9yaWcvc3JjL3JlcXVlc3QuYyBsaWJzMy0yLjAvc3JjL3JlcXVl c3QuYwotLS0gbGliczMtMi4wLm9yaWcvc3JjL3JlcXVlc3QuYwkyMDExLTA5LTI4IDEwOjE2OjA5 LjAwMDAwMDAwMCArMDIwMAorKysgbGliczMtMi4wL3NyYy9yZXF1ZXN0LmMJMjAyNS0wNC0yNyAx MzoxMjo1Mi4wMDAwMDAwMDAgKzAyMDAKQEAgLTM1LDcgKzM1LDcgQEAKICNpbmNsdWRlICJ1dGls LmgiCiAKIAotI2RlZmluZSBVU0VSX0FHRU5UX1NJWkUgMjU2CisjZGVmaW5lIFVTRVJfQUdFTlRf U0laRSAxMjYgKyBfVVRTTkFNRV9TWVNOQU1FX0xFTkdUSCArIF9VVFNOQU1FX01BQ0hJTkVfTEVO R1RICiAjZGVmaW5lIFJFUVVFU1RfU1RBQ0tfU0laRSAzMgogCiBzdGF0aWMgY2hhciB1c2VyQWdl bnRHW1VTRVJfQUdFTlRfU0laRV07CkBAIC0xMDg5LDcgKzEwODksNyBAQAogICAgICAgICB1c2Vy QWdlbnRJbmZvID0gIlVua25vd24iOwogICAgIH0KIAotICAgIGNoYXIgcGxhdGZvcm1bOTZdOwor ICAgIGNoYXIgcGxhdGZvcm1bX1VUU05BTUVfU1lTTkFNRV9MRU5HVEggKyAxICsgX1VUU05BTUVf TUFDSElORV9MRU5HVEhdOwogICAgIHN0cnVjdCB1dHNuYW1lIHV0c247CiAgICAgaWYgKHVuYW1l KCZ1dHNuKSkgewogICAgICAgICBzdHJuY3B5KHBsYXRmb3JtLCAiVW5rbm93biIsIHNpemVvZihw bGF0Zm9ybSkpOwo=
--=-8ijCNgPJm9jq/VHLavzW--
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE6hgwr99NQxrZ4RRS6K7C/zvhqUsFAmgOOEwACgkQ6K7C/zvh qUtxvA/+LqUMTHQi0b1Hhegq8thE6gxDa+Qn0VNhqCM+63nl/++hzuPcznWPm9ze HKuBVnA1yPEvkv4OjHXNeHAIAoJnnVPe0Sikl7BVkAJ8YC5aRki1SMAaPNgmSYzN WtL2AE7zn3BmWQeF1UB/mVmcHqsyd0JtRzD7SteQewtFUFtLRDZ19aV/kuYawNz6 YSr5q9yqakcoO3xa94fDdDtpmHDS/FFe1a99Ch48P09xB5oCcMjHvs3+o3XQ534A U2Vvwi2XihvKdz8cKqzYyjZfxrktjx3RkkACXOSSI8wsZwZxpwMvfIaN16GX2yYm vQrEQh3u9LbQFy+r7QkHX97DSkWNAgDXS48vxSM8QPavKB2N53WeqJYxONjX0/1R SNqNvXifCvnes/dzPqPsAG6YrYa6HLOJqDYBgyqVLzP5ZQqQbmnRMjb1umiSOGov keH+53Zk1jMTl005NgjGQjCEVF0MdT9k47il577zIHmbImfbHx8u/11G//TETRN6 eE1N/ykaX4cpfXYHfUC7lQEBaERm50zCrwsYHr6hcgNwK+lPXCGcUtfdpPXygPha uGa1+/6wnXLWVHcLYYsJ16BtE4WeNkS6qdXKfLqLv/5e0pqg3oJCIzInXbcuvtxs qB2FoRQiHisG7j7cTtNFUDOkBqmncF+KT/E9ZpxKR8zwDHZeWtc=
=4i/j
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)