tor-browser

commit d36575cee4021fcecb68613666d6b7ddf43edfcc
parent 9a08fc7dd7efdcf009b47c6283d379201315b263
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date:   Tue, 11 Nov 2025 21:47:58 +0000

Bug 1998928 - Update whatsys to avoid depending on windows.h's min() macro. r=janerik,supply-chain-reviewers

mozilla-config.h defines NOMINMAX, which prevents windows.h from
defining this macro. But it's trivial to not rely on it.

Differential Revision: https://phabricator.services.mozilla.com/D271762

Diffstat:
M
Cargo.lock
 | 
4
++--
M
supply-chain/audits.toml
 | 
6
++++++
M
third_party/rust/whatsys/.cargo-checksum.json
 | 
4
++--
M
third_party/rust/whatsys/Cargo.lock
 | 
4
++--
M
third_party/rust/whatsys/Cargo.toml
 | 
16
+++++++++++++++-
M
third_party/rust/whatsys/c/windows.c
 | 
3
++-

6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -8018,9 +8018,9 @@ dependencies = [
 
 [[package]]
 name = "whatsys"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb632c0076024630111a08ca9fcbd34736c80d10b9ae517077487b0c82f46a36"
+checksum = "192bcd2925a9791ba474bc673938f8c59b8978b3f304ef2c50672156bacf943b"
 dependencies = [
  "cc",
  "cfg-if",
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -7205,6 +7205,12 @@ criteria = "safe-to-deploy"
 delta = "0.1.2 -> 0.3.1"
 notes = "Maintained by me. I have written or reviewed all of the code."
 
+[[audits.whatsys]]
+who = "Emilio Cobos Álvarez <emilio@crisal.io>"
+criteria = "safe-to-deploy"
+delta = "0.3.1 -> 0.3.2"
+notes = "Minor tweak to avoid depending on min() macro which I authored."
+
 [[audits.windows-link]]
 who = "Mark Hammond <mhammond@skippinet.com.au>"
 criteria = "safe-to-deploy"
diff --git a/third_party/rust/whatsys/.cargo-checksum.json b/third_party/rust/whatsys/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"b14278d1089b157167570210f22c3234d12c49be5dabe7c0684a880a754810ad","Cargo.toml":"d887571e615d1b18d8f8e305189121aef1974dc65c5072fa93d9078236facd1e","LICENSE":"031c799b7549525cc605e8ea4c7f27af841ed86a2c1e88bee8039f8ba08b3bbd","README.md":"966ab1cb3749543d222f932b0b023e38f91bbd7396df84eef44d8b9e75692689","build.rs":"46387085fd9838eb9a36ed4f225668ed3055f2150682c1a9a66031dc43061ad1","c/windows.c":"38905b343f98b57890fdead3355219eed22b3f23bab5c0edeab77ff82cc9ab6f","examples/version.rs":"f7f0d42fc10b72d180cf38b45b722a67604ffb1a42d02db572dbaa6ab00c9c1a","src/apple.rs":"60ef2e17c925991b7578278bea8098c7e1b3680e73ac6c729148608f499031f9","src/fallback.rs":"98f08ebb87778421a86e568f526b053818e07b5701216deca743ded6b0e8a1bb","src/lib.rs":"45998dbf0962635794ad16dbb6fde6322c7b0b1d1e54db77d5a1fc8a471efbf9","src/linux.rs":"4fdb46384c0a81a4d0d82effecf8938e69f096255aa7eee1c2a4ab9b462178b5","src/windows.rs":"a2c71952b0bf99dcdc896f9b8d82adacaf1f036b906229c3695197bf626ce4c8"},"package":"bb632c0076024630111a08ca9fcbd34736c80d10b9ae517077487b0c82f46a36"}
-\ No newline at end of file
+{"files":{"Cargo.lock":"a85678b063960c3bd4a0541195a601015658d667250bb05ad91961fd002e86f6","Cargo.toml":"7640e64b4ae840dd9ba9e498957912ec0200e8dd0066d7465a1715d3c0f28f4f","LICENSE":"031c799b7549525cc605e8ea4c7f27af841ed86a2c1e88bee8039f8ba08b3bbd","README.md":"966ab1cb3749543d222f932b0b023e38f91bbd7396df84eef44d8b9e75692689","build.rs":"46387085fd9838eb9a36ed4f225668ed3055f2150682c1a9a66031dc43061ad1","c/windows.c":"69094d1232c40c3d5ab83c70ee4e7859770f1d531126f5211833ac20a0821084","examples/version.rs":"f7f0d42fc10b72d180cf38b45b722a67604ffb1a42d02db572dbaa6ab00c9c1a","src/apple.rs":"60ef2e17c925991b7578278bea8098c7e1b3680e73ac6c729148608f499031f9","src/fallback.rs":"98f08ebb87778421a86e568f526b053818e07b5701216deca743ded6b0e8a1bb","src/lib.rs":"45998dbf0962635794ad16dbb6fde6322c7b0b1d1e54db77d5a1fc8a471efbf9","src/linux.rs":"4fdb46384c0a81a4d0d82effecf8938e69f096255aa7eee1c2a4ab9b462178b5","src/windows.rs":"a2c71952b0bf99dcdc896f9b8d82adacaf1f036b906229c3695197bf626ce4c8"},"package":"192bcd2925a9791ba474bc673938f8c59b8978b3f304ef2c50672156bacf943b"}
+\ No newline at end of file
diff --git a/third_party/rust/whatsys/Cargo.lock b/third_party/rust/whatsys/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "cc"
@@ -22,7 +22,7 @@ checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
 
 [[package]]
 name = "whatsys"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "cc",
  "cfg-if",
diff --git a/third_party/rust/whatsys/Cargo.toml b/third_party/rust/whatsys/Cargo.toml
@@ -12,8 +12,14 @@
 [package]
 edition = "2018"
 name = "whatsys"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Jan-Erik Rediger <janerik@fnordig.de>"]
+build = "build.rs"
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Determine the kernel version"
 readme = "README.md"
 license = "MIT"
@@ -27,6 +33,14 @@ targets = [
     "x86_64-pc-windows-msvc",
 ]
 
+[lib]
+name = "whatsys"
+path = "src/lib.rs"
+
+[[example]]
+name = "version"
+path = "examples/version.rs"
+
 [dependencies.cfg-if]
 version = "1.0"
 
diff --git a/third_party/rust/whatsys/c/windows.c b/third_party/rust/whatsys/c/windows.c
@@ -56,7 +56,8 @@ int get_os_release(char *outbuf, size_t outlen) {
 
   // If the output buffer is smaller than the version (or "unknown"),
   // we only wrote until the buffer was full.
-  return min(written, (int)outlen - 1);
+  int maxsize = (int)outlen - 1;
+  return written < maxsize ? written : maxsize;
 }
 
 /**