changeset 10667:98e13596c489 jdk-10+28

Merge
author kcr
date Fri, 13 Oct 2017 13:56:56 -0700
parents c9bb6396c1c6 9a566e41b9dd
children 8c150dbef9c5 1a739919d8d1 982081fec584
files
diffstat 6 files changed, 34 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/javafx.graphics/src/main/native-iio/libjpeg7/jdhuff.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.graphics/src/main/native-iio/libjpeg7/jdhuff.c	Fri Oct 13 13:56:56 2017 -0700
@@ -576,7 +576,9 @@
   /* 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 */
   }
 
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gbookmarkfile.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gbookmarkfile.c	Fri Oct 13 13:56:56 2017 -0700
@@ -1976,6 +1976,12 @@
   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.
    */
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gkeyfile.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gkeyfile.c	Fri Oct 13 13:56:56 2017 -0700
@@ -3847,6 +3847,11 @@
   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);
 
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/glist.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/glist.c	Fri Oct 13 13:56:56 2017 -0700
@@ -698,6 +698,11 @@
       GList *last;
 
       new_list = _g_list_alloc ();
+ #ifdef GSTREAMER_LITE
+      if (new_list == NULL) {
+        return NULL;
+      }
+ #endif // GSTREAMER_LITE
       if (func)
         new_list->data = func (list->data, user_data);
       else
@@ -708,6 +713,11 @@
       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;
           if (func)
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gqueue.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gqueue.c	Fri Oct 13 13:56:56 2017 -0700
@@ -411,6 +411,11 @@
   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
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gvariant-core.c	Fri Oct 13 13:54:02 2017 -0700
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib-2.42.1/glib/gvariant-core.c	Fri Oct 13 13:56:56 2017 -0700
@@ -941,6 +941,12 @@
 {
   gsize n_children;
 
+#ifdef GSTREAMER_LITE
+  if (value == NULL) {
+    return 0;
+  }
+#endif // GSTREAMER_LITE
+
   g_variant_lock (value);
 
   if (value->state & STATE_SERIALISED)