PR for group 6 software vulnerabilities

build.gradle

@@ -250,4 +250,4 @@ retrolambda {
   javaVersion JavaVersion.VERSION_1_7
   incremental true
     jvmArgs '-noverify'
-}
+}

jme3-core/src/main/java/com/jme3/environment/util/EnvMapUtils.java

@@ -65,7 +65,7 @@ public class EnvMapUtils {
     public final static int NUM_SH_COEFFICIENT = 9;
     // See Peter-Pike Sloan paper for these coefficients
     //http://www.ppsloan.org/publications/StupidSH36.pdf
-    public static float[] shBandFactor = {1.0f,
+    private static float[] shBandFactor = {1.0f,
         2.0f / 3.0f, 2.0f / 3.0f, 2.0f / 3.0f,
         1.0f / 4.0f, 1.0f / 4.0f, 1.0f / 4.0f, 1.0f / 4.0f, 1.0f / 4.0f};
 
@@ -96,6 +96,10 @@ public static enum GenerationType {
     private EnvMapUtils() {
     }
 
+    public static float[] getShBandFactor() {
+        return shBandFactor.clone();
+    }
+
     /**
      * Creates a cube map from 6 images
      *

jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java

@@ -236,7 +236,7 @@ protected void generateDeclarationAndMainBody(List<ShaderNode> shaderNodes, Stri
     protected void appendNodeDeclarationAndMain(String loadedSource, StringBuilder sourceDeclaration, StringBuilder source, ShaderNode shaderNode, ShaderGenerationInfo info, String shaderPath) {
         if (loadedSource.length() > 1) {
             loadedSource = loadedSource.substring(0, loadedSource.lastIndexOf("}"));
-            String[] sourceParts = loadedSource.split("\\s*void\\s*main\\s*\\(\\s*\\)\\s*\\{");
+            String[] sourceParts = loadedSource.split("\\s*void\\s+main\\s*\\(\\s*\\)\\s*\\{");
             if(sourceParts.length<2){
                 throw new IllegalArgumentException("Syntax error in "+ shaderPath +". Cannot find 'void main(){' in \n"+ loadedSource);
             }

jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java

@@ -123,7 +123,7 @@ public static int getCardinality(String type, String swizzling) {
                     card = 0;
                 }
             } else {
-                card = Integer.parseInt(type.replaceAll(".*vec", ""));
+                card = type.startsWith("vec") ? Integer.parseInt(type.substring(3, 4)) : 0;
 
                 if (swizzling.length() > 0) {
                     card = swizzling.length();