git: a33ecd73b409 - main - www/chromium: fix obtaining HOST_NAME_MAX
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Dec 2021 18:40:09 UTC
The branch main has been updated by oshogbo (src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=a33ecd73b409488686af2342b8d143923805a984
commit a33ecd73b409488686af2342b8d143923805a984
Author: Adam Wolk <a.wolk@fudosecurity.com>
AuthorDate: 2021-12-15 18:34:48 +0000
Commit: Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2021-12-15 18:40:00 +0000
www/chromium: fix obtaining HOST_NAME_MAX
Using sysconf(3) API lead to accidental introduction of variable length arrays
(VLA) in the port. Additionally gethostname(3) has been passed _SC_HOST_NAME_MAX
incorrectly as the HOST_NAME_MAX length.
Fall back to using _POSIX_HOST_NAME_MAX as the remaining code is not ready for
introducing sysconf(3) as a patch.
Bump PORTREVISION to rebuild with the new patch.
Reviewed by: bapt
Sponsored by: Fudo Security
Differential Revision: https://reviews.freebsd.org/D30062
---
www/chromium/Makefile | 2 +-
...onents_sync__device__info_local__device__info__util__linux.cc | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 96cb5ca75eb2..f5f6ea1f51cf 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
PORTNAME= chromium
PORTVERSION= 94.0.4606.81
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts
diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
index f7aa5e4cfe4d..5b28209a44f6 100644
--- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
@@ -1,14 +1,13 @@
---- components/sync_device_info/local_device_info_util_linux.cc.orig 2021-04-14 18:41:01 UTC
+--- components/sync_device_info/local_device_info_util_linux.cc.orig 2021-04-27 04:07:31 UTC
+++ components/sync_device_info/local_device_info_util_linux.cc
-@@ -38,8 +38,9 @@ std::string GetPersonalizableDeviceNameInternal() {
+@@ -38,8 +38,8 @@ std::string GetPersonalizableDeviceNameInternal() {
#if BUILDFLAG(IS_CHROMEOS_ASH)
return GetChromeOSDeviceNameFromType();
#else
- char hostname[HOST_NAME_MAX];
- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
-+ int len = sysconf(_SC_HOST_NAME_MAX);
-+ char hostname[len];
-+ if (gethostname(hostname, _SC_HOST_NAME_MAX) == 0) // Success.
++ char hostname[_POSIX_HOST_NAME_MAX];
++ if (gethostname(hostname, _POSIX_HOST_NAME_MAX) == 0) // Success.
return hostname;
return base::GetLinuxDistro();
#endif