Fix NegativeArrayException

Author: LionZXY

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.0.2"
+version = "1.0.3"
 group = "ru.lionzxy.fastlogblock" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "FastLogBlock"
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Jan 21 21:37:17 MSK 2018
+#Sun Jan 26 20:15:46 MSK 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -57,8 +57,13 @@ protected void writeToFile(final OutputStream outputStream) throws IOException {
     private void putFromByte(final TByteArrayList byteArrayList) {
         final ByteBuffer byteBuffer = ByteBuffer.wrap(byteArrayList.toArray());
         final long blockid = byteBuffer.getLong();
+        int nameSize = byteArrayList.size() - Long.BYTES - 1;
 
-        final byte[] tmpbuffer = new byte[byteArrayList.size() - Long.BYTES - 1];
+        if (nameSize <= 0) {
+            return;
+        }
+
+        final byte[] tmpbuffer = new byte[nameSize];
         byteBuffer.get(tmpbuffer);
         final ASCIString asciString = new ASCIString(tmpbuffer);
         blockToId.put(asciString, blockid);

src/main/java/ru/lionzxy/fastlogblock/io/mappers/BlockMapper.java

@@ -34,8 +34,13 @@ public NickMapper(final File mapFile) throws IOException {
     private void putFromByte(final TByteArrayList byteArrayList) {
         final ByteBuffer byteBuffer = ByteBuffer.wrap(byteArrayList.toArray());
         final int userid = byteBuffer.getInt();
+        int nameSize = byteArrayList.size() - Integer.BYTES - 1;
 
-        final byte[] tmpbuffer = new byte[byteArrayList.size() - 5];
+        if (nameSize <= 0) {
+            return;
+        }
+
+        final byte[] tmpbuffer = new byte[nameSize];
         byteBuffer.get(tmpbuffer);
         final ASCIString asciString = new ASCIString(tmpbuffer);
         uuidToId.put(asciString, userid);