safe sprintf nullptrt

3 files changed, 16 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 05edf9b..8e14df2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -26,6 +26,7 @@ AUX chromium-119-minizip-types.patch 1258 BLAKE2B abeb130841611feffbdfed5b7f9102
 AUX chromium-119-minizip.patch 6867 BLAKE2B 50dcf02d6095fc75c2033afba39bae6386e4bf9d34e3a284e6eb1ba949cbe983c4ef546abc4e475f2433d608676d94855103b49bd78916085170e0cb5475ec6e SHA512 6a701b8b34e9b56d1ff03f6cc1c8542568c543299f9b60648cf1aa7d56e5958e293057d3f251634479841724e179733bd3ed2320ee5fbb56e1cb66b8fc7f70fb
 AUX chromium-119-paint-fragment-data-iterator-nullptr.patch 1017 BLAKE2B f1038cf6a485fcab0ec19449e1fb9f07a151928080db0caac4628aab03b9e526e9a6d58ee23c299d92e55c76649e81ea79710cb44eaadd9f31f9f07e01f377aa SHA512 8c9bfd61e7c04be3f105f1c27cc3a6b68454711d5b61a821d7467bad8b5420e94905d1f39f273f1e78c78c9aea5e13ac7a3d5f7489bb78f3856eac00b77171d4
 AUX chromium-120-compiler.patch 9228 BLAKE2B ccfe733c7528a0371d7cb6765e89567b6bfb0c2c2011df638e8fd0f17e9fc3b89da6bfebb2d53f81ba9130596910e276189cdb8d7ad6d950f7d78b87137fca81 SHA512 e800a6f981a03741c7b1f434f308c3d18bdd3022000a28513ad0e16d30c9424f5f15ba7b86fbc6bf35330dc083501d0be3dca84aef25e90d02e1571ab6ed5ac4
+AUX chromium-120-safe_sprintf-nullptr-t.patch 845 BLAKE2B c3859bb23ec2d1ad6d4af3251e1e6f857643d2da18ebc71d8aed1c87024661cbeaaa580b8b29cf3c46418b2d5e525d5aae9ec86d9c7f5aef79893b4916263d47 SHA512 d92355ed9a7234a197fdbfb453b5ce91d4caba63e65e29b0f58832cd57193db8fb544934ca48a4a51c5e6bd4828d43e6d5c4e46dce164c53a8b324cee081cf0e
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
@@ -40,4 +41,4 @@ DIST chromium-119.0.6045.10.tar.xz 3276428548 BLAKE2B 724bb65bb965aa838ae4127aff
 DIST chromium-120.0.6073.0.tar.xz 3299349228 BLAKE2B a7618e44280a8d28770903301638f9a63ba910f6e2ce520da05f010d22524e395375c3afdb33bd4cd897478555655bf87ac3fa7839bd00bd96ec37a8a37a0b73 SHA512 3f9de5f49da5e9a9b4beee35d22558fd08a5bb1278eb1e5c067168ff7e108fb6cf07ab3d6f02b26b27855d9ea9a27fb35bd07529d90745cbf5889e5235ad8321
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 EBUILD chromium-119.0.6045.10.ebuild 39061 BLAKE2B 0adc77a07d8ad6596f6aa634e9df78f11e76c4d46d74377691bee4c96523a0af5ed22d8df1ca570b82d93d2b993c7ff473ebdd420247cc6cc2a4994124340e1d SHA512 0c08ee52d5a0511903a27f7ef430c0157e913924fa092eeaae675e7bdfd202aa4fb29f865e8ce023ed16221af6822df6a1060e9333f1a64cf62518445216e156
-EBUILD chromium-120.0.6073.0.ebuild 38940 BLAKE2B ec9110ee9fdb011da5b7160f9695d11bb4c210733f25364cc22915c704f07bdcf2ad4d113b27cecff79edb0966a366cd4c22914c9a338ec2906ab04f89efa32a SHA512 f3178b7059caa3a030853cbd5e97eb4774aa4a5900b2574eb49cee1fd21deedf94d81d3c7184bc74dafb16dbb195753906349ea9137d8f3c4f591281476492f7
+EBUILD chromium-120.0.6073.0.ebuild 38998 BLAKE2B 96ec566312be31cb88a7b4202d7b0e05a6af257c12136007d8c18e52d8ea584a71bf81fb9618917ba5e6715d8b59af3dcaf95a520a9350ef57bc09c4940c6474 SHA512 440f25c833bb9e08f367819e6d30b2965c72993c870dedbce2e798b5bcf362c1b5c337edb0ea8edd338d32e04153f32efbf8a93b8e7d12260c163cc3232e2c6a
diff --git a/www-client/chromium/chromium-120.0.6073.0.ebuild b/www-client/chromium/chromium-120.0.6073.0.ebuild
index 9776355..d83bf66 100644
--- a/www-client/chromium/chromium-120.0.6073.0.ebuild
+++ b/www-client/chromium/chromium-120.0.6073.0.ebuild
@@ -328,6 +328,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-118-lightweight-detector-include.patch"
 		"${FILESDIR}/chromium-119-atspi2-build.patch"
 		"${FILESDIR}/chromium-119-minizip-types.patch"
+		"${FILESDIR}/chromium-120-safe_sprintf-nullptr-t.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-109-EnumTable-crash.patch"
diff --git a/www-client/chromium/files/chromium-120-safe_sprintf-nullptr-t.patch b/www-client/chromium/files/chromium-120-safe_sprintf-nullptr-t.patch
new file mode 100644
index 0000000..b0cf884
--- /dev/null
+++ b/www-client/chromium/files/chromium-120-safe_sprintf-nullptr-t.patch
@@ -0,0 +1,13 @@
+diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
+index 3644afae8b..386f86ac80 100644
+--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
++++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
+@@ -184,7 +184,7 @@ struct Arg {
+   //
+   // Warning: don't just do Arg(NULL) here because in some libcs, NULL is an
+   // alias for nullptr!
+-  Arg(nullptr_t p) : type(INT) {
++  Arg(std::nullptr_t p) : type(INT) {
+     integer.i = 0;
+     // Internally, SafeSprintf expects to represent nulls as integers whose
+     // width is equal to sizeof(NULL), which is not necessarily equal to