Merge origin/divZeroFix into modifiedCopy

Author: robert

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayShuffleModification.java

@@ -43,12 +43,14 @@ protected byte[] modifyImplementationHook(final byte[] input) {
         }
         byte[] result = input.clone();
         int size = input.length;
-        for (int i = 0; i < shuffle.length - 1; i += 2) {
-            int p1 = (shuffle[i] & 0xff) % size;
-            int p2 = (shuffle[i + 1] & 0xff) % size;
-            byte tmp = result[p1];
-            result[p1] = result[p2];
-            result[p2] = tmp;
+        if (size != 0) {
+            for (int i = 0; i < shuffle.length - 1; i += 2) {
+                int p1 = (shuffle[i] & 0xff) % size;
+                int p2 = (shuffle[i + 1] & 0xff) % size;
+                byte tmp = result[p1];
+                result[p1] = result[p2];
+                result[p2] = tmp;
+            }
         }
         return result;
     }

src/main/java/de/rub/nds/modifiablevariable/mlong/LongModificationFactory.java

@@ -13,9 +13,9 @@
 import de.rub.nds.modifiablevariable.integer.IntegerModificationFactory;
 import de.rub.nds.modifiablevariable.util.RandomHelper;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -71,13 +71,12 @@ public static synchronized List<VariableModification<Long>> modificationsFromFil
             if (modificationsFromFile == null) {
                 modificationsFromFile = new LinkedList<>();
                 ClassLoader classLoader = IntegerModificationFactory.class.getClassLoader();
-                File file = new File(classLoader.getResource(IntegerModificationFactory.FILE_NAME).getFile());
-                try (BufferedReader br = new BufferedReader(new FileReader(file))) {
-                    String line;
-                    while ((line = br.readLine()) != null) {
-                        String value = line.trim().split(" ")[0];
-                        modificationsFromFile.add(explicitValue(value));
-                    }
+                InputStream is = classLoader.getResourceAsStream(IntegerModificationFactory.FILE_NAME);
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                String line;
+                while ((line = br.readLine()) != null) {
+                    String value = line.trim().split(" ")[0];
+                    modificationsFromFile.add(explicitValue(value));
                 }
             }
             return modificationsFromFile;