diff options
| author | stf <7o5rfu92t@ctrlc.hu> | 2019-10-17 16:19:22 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-17 19:32:29 +0000 |
| commit | e7285fc580e027a5ab1135487fadacf821374f69 (patch) | |
| tree | bf859f4757a05912dc30a764d4817dc6167923de /community/qt5-qtwebengine | |
| parent | 6092daf61f89d9b4cc93fe8406ecfffe9955d4c3 (diff) | |
| download | aports-e7285fc580e027a5ab1135487fadacf821374f69.tar.bz2 aports-e7285fc580e027a5ab1135487fadacf821374f69.tar.xz | |
community/qt5-qtwebengine fixed crashing UB in ProcessMetrics::GetMallocUsage
fixes #10405
Diffstat (limited to 'community/qt5-qtwebengine')
| -rw-r--r-- | community/qt5-qtwebengine/APKBUILD | 4 | ||||
| -rw-r--r-- | community/qt5-qtwebengine/qt-musl-mallinfo.patch | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index df3c04013b..a8afef3a7d 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtwebengine pkgver=5.12.5 -pkgrel=0 +pkgrel=1 pkgdesc="Qt5 - QtWebEngine components" url="http://qt-project.org/" # ppc64le, s390x: not supported @@ -100,7 +100,7 @@ sha512sums="b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6ce 5e017e6500af56d0e608839c466782193ab3f6e5d01938b84b7f9c86fbb826e140f9fca789a23e7a7431ba42377be328a8bfcacbf7c302746de79f7857f2832d arm-void-is-not-android.patch 5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch 982550095ccebc49b15f71bddc7c7373e8bc1aa88cbc6db0e8984c31d02760e6ed8ec635f5e16faa022cc312f354fc6811d3cd2438e20561be565f3c00bebc67 qt-musl-execinfo.patch -f580239dc09ba0592ddcba8225411baef9c2116fb4d401bdf0327f3567d9c2428f33bb1fd1ec21f4d8208fb0c9aff70263b77ff5041eb289ea1375790901eebc qt-musl-mallinfo.patch +229f148c2b9bbb517409d3627e3bacf144cd39bfd3b7915f35de2f3b8c3e19f80c93799ef42784014cdd79af7b56557b6852632c4f1646a747d9eed24f61decb qt-musl-mallinfo.patch 7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0 qt-musl-off_t.patch ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5 qt-musl-pvalloc.patch 8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610 qt-musl-resolve.patch diff --git a/community/qt5-qtwebengine/qt-musl-mallinfo.patch b/community/qt5-qtwebengine/qt-musl-mallinfo.patch index 7b30717136..c332b92b69 100644 --- a/community/qt5-qtwebengine/qt-musl-mallinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-mallinfo.patch @@ -20,7 +20,7 @@ MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); --- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2017-11-28 14:06:53.000000000 +0100 +++ qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2018-01-27 20:48:11.571040348 +0100 -@@ -94,7 +94,7 @@ +@@ -100,14 +100,14 @@ malloc_statistics_t stats = {0}; malloc_zone_statistics(nullptr, &stats); return stats.size_in_use; @@ -29,3 +29,12 @@ struct mallinfo minfo = mallinfo(); #if defined(USE_TCMALLOC) return minfo.uordblks; + #else + return minfo.hblkhd + minfo.arena; + #endif +-#elif defined(OS_FUCHSIA) ++#else //if defined(OS_FUCHSIA) // also musl doesn't do this. + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. + return 0; + #endif + |