Merge

16 files changed, 67 insertions, 9 deletions

diff --git a/.hgtags b/.hgtags
index fa5ac072c..a75d76051 100644
--- a/.hgtags
+++ b/.hgtags
@@ -444,6 +444,7 @@ f7aa09aaff901d7464f2d91f3b000f54db3b68e0 8u122-b04
 fb9497596481489db67141055828b3645efb9709 8u121-b04
 ce0b6eb2bac188d57fcb5d2b17d7ef1d3a8bca74 8u131-b00
 00456aa462a664497171292c0e5d55cd7b964dd6 8u141-b00
+25e85db0bbfb7caba8e6da8602d266075b472e3a 8u151-b00
 ce0b6eb2bac188d57fcb5d2b17d7ef1d3a8bca74 8u121-b05
 8d72770b92f56dbde8623ff7dd723e32e25fc1b1 8u121-b06
 7b5317587fb1f0947efea6173528cbe423825292 8u121-b07
@@ -485,3 +486,26 @@ e3cd10d417b7fa3590b747c616c9f440945ed001 8u141-b10
 7f8356d232541fbd58c5a98191fd0a8f0d219141 8u141-b13
 d6db71e77bb1163dd6290dfda7f06cd827a02351 8u141-b14
 2991e8b097f37f8d5847bedee9025003af6011d3 8u162-b01
+345860863e85d1384fd53e0a04862946b46b2c79 8u151-b01
+ff23e24353931fc6c09c2262b5c99bbcae3c5913 8u151-b02
+f85623b6d8eb2da07337a9baf0e970618bfedee1 8u151-b03
+ea5df2215f82d2e779a26c40eed8a16759ce96a8 8u151-b04
+02c845d270a7e14bf4d8d3457e485388aead457d 8u151-b05
+a6e2380a550223314589c733b159f3175afd4497 8u151-b06
+59382f224999afd9dc64b8c8d8f41d8ef91dcf08 8u151-b07
+871952bd7e6e359c71dface82190eeab72a1a809 8u151-b08
+d518da6af98573cbf7aab4e24bf85847087591e0 8u151-b09
+2f639073db2de88b8f334ef2f874a330f039ce6f 8u151-b10
+e7e1c7fccd89a3929ec17aef9e684d2f0b6b5864 8u151-b11
+e0c5df25bacae7e00475577328355e0f43855f8b 8u152-b06
+bf0eb93f04f1ad6eaed37a9e8ec986c94b137e96 8u151-b12
+1c35b82cd17acaf3f80248403bf2e5ad170bfbc7 8u152-b07
+7700d1631569aa75a8de9620aa06d29d18e641a9 8u152-b08
+2f341501a13b033c1fdb2d019e2438cfc2fcd4e1 8u152-b09
+ee7cddd6f5241903d0513e74e0fdd72a07abc47c 8u152-b10
+786082f48cb97184388846c889399bf00da2bee2 8u152-b11
+76812e2dedf37ad16c7a3b5f4a27fd07ab7c0ac3 8u152-b12
+88df697909de7847dc38cfe246a5392c386ec206 8u152-b13
+3fd0155c78b73c31993a658b9afe916b4aa88f11 8u152-b14
+450098d642be66f5818e4c1f0073bde869de1a37 8u152-b15
+9320e45e4780a078ac1ee229d7a530f2a4051393 8u152-b16
diff --git a/modules/base/src/main/java/javafx/beans/property/BooleanProperty.java b/modules/base/src/main/java/javafx/beans/property/BooleanProperty.java
index c7779119b..e05f912b0 100644
--- a/modules/base/src/main/java/javafx/beans/property/BooleanProperty.java
+++ b/modules/base/src/main/java/javafx/beans/property/BooleanProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/base/src/main/java/javafx/beans/property/DoubleProperty.java b/modules/base/src/main/java/javafx/beans/property/DoubleProperty.java
index b077ce210..192a6f06d 100644
--- a/modules/base/src/main/java/javafx/beans/property/DoubleProperty.java
+++ b/modules/base/src/main/java/javafx/beans/property/DoubleProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/base/src/main/java/javafx/beans/property/FloatProperty.java b/modules/base/src/main/java/javafx/beans/property/FloatProperty.java
index a0fc47fe8..6b520dab3 100644
--- a/modules/base/src/main/java/javafx/beans/property/FloatProperty.java
+++ b/modules/base/src/main/java/javafx/beans/property/FloatProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/base/src/main/java/javafx/beans/property/IntegerProperty.java b/modules/base/src/main/java/javafx/beans/property/IntegerProperty.java
index 490d6d447..6cb697e2c 100644
--- a/modules/base/src/main/java/javafx/beans/property/IntegerProperty.java
+++ b/modules/base/src/main/java/javafx/beans/property/IntegerProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/base/src/main/java/javafx/beans/property/LongProperty.java b/modules/base/src/main/java/javafx/beans/property/LongProperty.java
index 5cc538271..a65fb1b37 100644
--- a/modules/base/src/main/java/javafx/beans/property/LongProperty.java
+++ b/modules/base/src/main/java/javafx/beans/property/LongProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/graphics/src/main/native-iio/libjpeg7/jdhuff.c b/modules/graphics/src/main/native-iio/libjpeg7/jdhuff.c
index d65ea74d8..c1a1efcfc 100644
--- a/modules/graphics/src/main/native-iio/libjpeg7/jdhuff.c
+++ b/modules/graphics/src/main/native-iio/libjpeg7/jdhuff.c
@@ -576,7 +576,9 @@ jpeg_huff_decode (bitread_working_state * state,
   /* With garbage input we may reach the sentinel value l = 17. */
 
   if (l > 16) {
+    int br_offset = state->next_input_byte - state->cinfo->src->next_input_byte;
     WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);
+    state->next_input_byte = state->cinfo->src->next_input_byte + br_offset;
     return 0;                   /* fake a zero as the safest result */
   }
 
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gbookmarkfile.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gbookmarkfile.c
index a6015151c..2eb2834f4 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gbookmarkfile.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gbookmarkfile.c
@@ -2054,6 +2054,12 @@ g_bookmark_file_add_item (GBookmarkFile  *bookmark,
   g_warn_if_fail (bookmark != NULL);
   g_warn_if_fail (item != NULL);
 
+#ifdef GSTREAMER_LITE
+  if (bookmark == NULL || item == NULL) {
+    return;
+  }
+#endif // GSTREAMER_LITE
+
   /* this should never happen; and if it does, then we are
    * screwing up something big time.
    */
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gkeyfile.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gkeyfile.c
index 4c5c63115..2091c00a9 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gkeyfile.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gkeyfile.c
@@ -3434,6 +3434,11 @@ g_key_file_add_key (GKeyFile      *key_file,
   GKeyFileKeyValuePair *pair;
 
   pair = g_slice_new (GKeyFileKeyValuePair);
+#ifdef GSTREAMER_LITE
+  if (pair == NULL) {
+      return;
+  }
+#endif // GSTREAMER_LITE
   pair->key = g_strdup (key);
   pair->value = g_strdup (value);
 
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/glist.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/glist.c
index 27b110367..287b33a98 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/glist.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/glist.c
@@ -438,6 +438,11 @@ g_list_insert_before (GList   *list,
     last = last->next;
 
       last->next = _g_list_alloc ();
+#ifdef GSTREAMER_LITE
+      if (last->next == NULL) {
+        return NULL;
+      }
+#endif // GSTREAMER_LITE
       last->next->data = data;
       last->next->prev = last;
       last->next->next = NULL;
@@ -651,6 +656,11 @@ g_list_copy (GList *list)
       while (list)
     {
       last->next = _g_list_alloc ();
+#ifdef GSTREAMER_LITE
+      if (last->next == NULL) {
+        return NULL;
+      }
+#endif // GSTREAMER_LITE
       last->next->prev = last;
       last = last->next;
       last->data = list->data;
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gqueue.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gqueue.c
index 8546dc77d..562ca7431 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gqueue.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gqueue.c
@@ -367,6 +367,11 @@ g_queue_push_tail (GQueue  *queue,
   g_return_if_fail (queue != NULL);
 
   queue->tail = g_list_append (queue->tail, data);
+#ifdef GSTREAMER_LITE
+  if (queue->tail == NULL) {
+    return;
+  }
+#endif // GSTREAMER_LITE
   if (queue->tail->next)
     queue->tail = queue->tail->next;
   else
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gvariant-core.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gvariant-core.c
index f7761e4b7..73bcf95bf 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gvariant-core.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.28.8/glib/gvariant-core.c
@@ -826,6 +826,12 @@ g_variant_n_children (GVariant *value)
 {
   gsize n_children;
 
+#ifdef GSTREAMER_LITE
+  if (value == NULL) {
+    return 0;
+  }
+#endif // GSTREAMER_LITE
+
   g_variant_lock (value);
 
   if (value->state & STATE_SERIALISED)
diff --git a/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.cpp b/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.cpp
index 073de22f1..92c4fc8ba 100644
--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.cpp
+++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 
diff --git a/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.h b/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.h
index acbcb3ca3..7a061f9e9 100644
--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.h
+++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/JavaEnv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 #ifndef JavaEnv_h
 #define JavaEnv_h
diff --git a/modules/web/src/main/native/Tools/DumpRenderTree/java/TestRunnerJava.cpp b/modules/web/src/main/native/Tools/DumpRenderTree/java/TestRunnerJava.cpp
index 33e10e3a0..732649da2 100644
--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/TestRunnerJava.cpp
+++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/TestRunnerJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "JavaEnv.h"
diff --git a/modules/web/src/main/native/Tools/DumpRenderTree/java/WorkQueueItemJava.cpp b/modules/web/src/main/native/Tools/DumpRenderTree/java/WorkQueueItemJava.cpp
index d4100de05..9a6899049 100644
--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/WorkQueueItemJava.cpp
+++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/WorkQueueItemJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "JavaEnv.h"