|
|
|
|
@ -1,11 +1,11 @@
|
|
|
|
|
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc
|
|
|
|
|
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc 2017-05-18 16:51:44.000000000 +0200
|
|
|
|
|
+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-26 23:15:31.499258482 +0200
|
|
|
|
|
+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-26 23:48:15.166464570 +0200
|
|
|
|
|
@@ -60,6 +60,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
void* __libc_memalign(size_t alignment, size_t size);
|
|
|
|
|
|
|
|
|
|
+if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565
|
|
|
|
|
+#if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565
|
|
|
|
|
// Overriding the system memory allocation functions:
|
|
|
|
|
//
|
|
|
|
|
// For security reasons, we want malloc failures to be fatal. Too much code
|
|
|
|
|
|
Kevin Kofler
8 years ago