Changeset 406 for trunk/openjdk/jdk/src/share/native

Timestamp:

Dec 21, 2012, 10:37:13 AM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b27 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• jdk/src/share/native/java/net/net_util.c (modified) (2 diffs)
• jdk/src/share/native/java/net/net_util.h (modified) (2 diffs)
• jdk/src/share/native/sun/font/layout/LookupProcessor.cpp (modified) (5 diffs)
• jdk/src/share/native/sun/font/layout/LookupProcessor.h (modified) (1 diff)

trunk/openjdk/jdk/src/share/native/java/net/net_util.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -69 +69 @@
     IPv6_available = IPv6_supported() & (!preferIPv4Stack);
     initLocalAddrTable ();
+    parseExclusiveBindProperty(env);
+
     return JNI_VERSION_1_2;
 }

trunk/openjdk/jdk/src/share/native/java/net/net_util.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -121 +121 @@
 
 void initLocalAddrTable ();
+void parseExclusiveBindProperty(JNIEnv *env);
 
 void

trunk/openjdk/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp

@@ -87 +87 @@
         if (selectMask != 0) {
             const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup);
+
+            if (!lookupTable)
+                continue;
+
             le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
 
@@ -125 +129 @@
         le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]);
 
+        if (lookupListIndex >= lookupSelectCount)
+            continue;
+
         lookupSelectArray[lookupListIndex] |= featureMask;
         lookupOrderArray[store++] = lookupListIndex;
@@ -136 +143 @@
         LETag scriptTag, LETag languageTag, const FeatureMap *featureMap,
         le_int32 featureMapCount, le_bool orderFeatures)
-    : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL),
+    : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0),
       lookupOrderArray(NULL), lookupOrderCount(0)
 {
@@ -175 +182 @@
         lookupSelectArray[i] = 0;
     }
+
+    lookupSelectCount = lookupListCount;
 
     le_int32 count, order = 0;
@@ -192 +201 @@
 
         featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag);
+
+        if (!featureTable)
+            continue;
+
         featureReferences += SWAPW(featureTable->lookupCount);
     }

trunk/openjdk/jdk/src/share/native/sun/font/layout/LookupProcessor.h

@@ -78 +78 @@
 
     FeatureMask             *lookupSelectArray;
+    le_uint32               lookupSelectCount;
 
     le_uint16               *lookupOrderArray;