changeset 10296:234f6d8b3289

Merge
author kcr
date Fri, 11 Jan 2019 14:45:39 -0800
parents 84fff2455f2d 7470fe60e3e8
children 9f49e3b6147f
files build.gradle build.properties buildSrc/linux.gradle modules/web/src/main/native/Source/WebCore/platform/java/WebPage.cpp modules/web/src/main/native/Source/WebCore/rendering/RenderBox.h modules/web/src/main/native/Source/WebCore/rendering/RenderListItem.cpp modules/web/src/main/native/Source/WebCore/rendering/RenderListMarker.cpp modules/web/src/main/native/Source/WebCore/rendering/RenderMultiColumnSet.cpp
diffstat 9 files changed, 41 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jan 09 11:41:49 2019 +0530
+++ b/.hgtags	Fri Jan 11 14:45:39 2019 -0800
@@ -582,6 +582,7 @@
 0c129bd8e7681704a681b681703ccd74b9f3faa9 8u202-b00
 65ce6658a7579f2f80dac0ed107432829f54c878 8u192-b04
 65959fbe192522599785e65cdbbf8ac070cb648e 8u191-b01
+7e99fcc325d9f2b7a834ea127ee34f2549fec485 8u201-b00
 c3131d10ba716dfc952219284f3aef02a24f21b5 8u191-b02
 e4c02e0b11e874b4c5a7b0ba426594de5d74668b 8u191-b03
 b72eb5996129ab5c940d3364db1b64eccb1abd8a 8u191-b04
@@ -599,3 +600,16 @@
 88287370703c85f04707b5abb7e0700d827b30f2 8u191-b10
 77d04bfe18d72bc9f917d458b0835a9c06458de8 8u202-b01
 7292eb9f26edd5caf7d14d035de432a339356f57 8u202-b02
+9399c230e05a9fac6cded8c0195ac7c9442a9d09 8u202-b03
+f075f14fc3ea7800626aacd76eeb0097b4872a19 8u201-b01
+07cc8060be81c0b7bf6836b033cd033677eec8ed 8u201-b02
+a93f39876d35d7633b4ac1cf6b87483cf3d5eb84 8u201-b03
+3a1646307eacea16b95bde71cc27cc745005e28b 8u202-b04
+330909e03fc9d3846dd0eef4ed49369f98f0dc68 8u201-b04
+bf1cfcdaa8c5264604fbf101a6fc15dc6c0f60ff 8u201-b05
+ba565750b1dae19ddb805a561481b0621dfbce29 8u202-b05
+13d104bf16d97aaefd3544a9ffba7ddd4e023596 8u201-b06
+ca2fe48f252f6dc4a9ba88df0f7dbe3f1d45d968 8u202-b06
+82cf90faa71387d73628804f9cb0ead0b91fa1c8 8u201-b07
+85d09981ae0da52c9425cb329ab02b9b0a2db303 8u202-b07
+37024ac21ac1493459088f0f6541024632ebea1c 8u201-b08
--- a/buildSrc/linux.gradle	Wed Jan 09 11:41:49 2019 +0530
+++ b/buildSrc/linux.gradle	Fri Jan 11 14:45:39 2019 -0800
@@ -43,6 +43,7 @@
 // A set of common parameters to use for both compiling and linking
 def commonFlags = [
         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+        "-fstack-protector",
         "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
 if (!IS_64) {
@@ -57,6 +58,7 @@
 def ccFlagsGTK3 = ccFlags
 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                 "-z", "relro",
                  "-Wl,--gc-sections"].flatten()
 def defaultLinkFlags = linkFlags.flatten()
 
@@ -252,9 +254,9 @@
 
 LINUX.launcher = [:]
 LINUX.launcher.compiler = compiler
-LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
+LINUX.launcher.ccFlags = ["-fstack-protector", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
 LINUX.launcher.linker = linker
-LINUX.launcher.linkFlags = ["-ldl"]
+LINUX.launcher.linkFlags = ["-z", "relro", "-ldl"]
 if (!IS_64) {
     LINUX.launcher.ccFlags += "-m32"
     LINUX.launcher.linkFlags += "-m32"
@@ -262,10 +264,10 @@
 
 LINUX.launcherlibrary = [:]
 LINUX.launcherlibrary.compiler = compiler
-LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC",
+LINUX.launcherlibrary.ccFlags = ["-fstack-protector", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC",
 "-std=gnu++98", "-ffunction-sections", "-fdata-sections"]
 LINUX.launcherlibrary.linker = linker
-LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
+LINUX.launcherlibrary.linkFlags = ["-z", "relro", "-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
 if (!IS_64) {
     LINUX.launcherlibrary.ccFlags += "-m32"
     LINUX.launcherlibrary.linkFlags += "-m32"
--- a/modules/graphics/src/main/native-iio/libjpeg/jmemmgr.c	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/graphics/src/main/native-iio/libjpeg/jmemmgr.c	Fri Jan 11 14:45:39 2019 -0800
@@ -403,6 +403,10 @@
   JDIMENSION rowsperchunk, currow, i;
   long ltemp;
 
+  if (samplesperrow == 0) {
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  }
+
   /* Calculate max # of rows allowed in one allocation chunk */
   ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
       ((long) samplesperrow * SIZEOF(JSAMPLE));
@@ -451,6 +455,10 @@
   JDIMENSION rowsperchunk, currow, i;
   long ltemp;
 
+  if (blocksperrow == 0) {
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  }
+
   /* Calculate max # of rows allowed in one allocation chunk */
   ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
       ((long) blocksperrow * SIZEOF(JBLOCK));
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -27,6 +27,7 @@
          -Wextra                 \
          -Wformat-security       \
          -Werror=implicit-function-declaration \
+         -fstack-protector       \
          -msse2                  \
          -fbuiltin               \
          -DHAVE_STDINT_H         \
@@ -51,6 +52,7 @@
           -I$(GLIB_DIR)/gmodule
 
 LDFLAGS = -L$(BUILD_DIR)    \
+          -z relro          \
           -lgstreamer-lite  \
           -lglib-lite  \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -24,6 +24,7 @@
          -Wextra                 \
          -Wformat-security       \
          -Werror=implicit-function-declaration \
+         -fstack-protector       \
          -msse2                  \
          -fbuiltin               \
          -DHAVE_STDINT_H         \
@@ -53,6 +54,7 @@
            -I$(GLIB_DIR)/gmodule
 
 LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
+          -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
--- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -21,6 +21,7 @@
 TARGET = $(BUILD_DIR)/$(TARGET_NAME)
 
 CFLAGS += -fPIC \
+         -fstack-protector       \
          -Werror=implicit-function-declaration \
          -DG_DISABLE_CAST_CHECKS \
          -DGLIB_COMPILATION \
@@ -51,6 +52,7 @@
 	   -I$(LIBFFI_DIR)/include
 
 LDFLAGS = -L$(BUILD_DIR) -lffi \
+          -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -45,6 +45,7 @@
         -Wformat                \
         -Wextra                 \
         -Wformat-security       \
+        -fstack-protector       \
 	-Werror=implicit-function-declaration \
         -D_GNU_SOURCE           \
         -DGST_REMOVE_DEPRECATED \
@@ -83,6 +84,7 @@
 PACKAGES_LIBS := $(shell pkg-config --libs alsa)
 
 LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
+          -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
--- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -14,6 +14,7 @@
 TARGET = $(BUILD_DIR)/$(TARGET_NAME)
 
 CFLAGS += -c \
+         -fstack-protector       \
          -Werror=implicit-function-declaration \
          -fPIC \
          -DHAVE_AS_X86_PCREL \
@@ -36,6 +37,8 @@
 
 ASM_SOURCES = src/x86/unix64.S
 
+LDFLAGS += -z relro
+
 ifeq ($(ARCH), x32)
     CFLAGS += -m32
     LDFLAGS += -m32
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	Wed Jan 09 11:41:49 2019 +0530
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	Fri Jan 11 14:45:39 2019 -0800
@@ -42,6 +42,7 @@
                   -Wformat \
                   -Wextra \
                   -Wformat-security \
+                  -fstack-protector \
                   -Werror=implicit-function-declaration \
 		  -msse2 \
 	          -DGSTREAMER_LITE
@@ -57,6 +58,7 @@
 	           -I$(GLIB_LITE_DIR)/gmodule
 
 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
+            -z relro \
             -static-libgcc -static-libstdc++ -Wl,--gc-sections
 else
 	CFLAGS += $(EXTRA_CFLAGS)