dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue with hex bytesToInts

Browse Source
This commit is contained in:
nathan 2020-09-25 19:15:14 +02:00
parent 81913bbd62
commit fd68a23974
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -38,7 +38,7 @@ object Extras {
// set for the project // set for the project
const val description = "Utilities for use within Java projects" const val description = "Utilities for use within Java projects"
const val group = "com.dorkbox" const val group = "com.dorkbox"
const val version = "1.8.2" const val version = "1.8.3"
// set as project.ext // set as project.ext
const val name = "Utilities" const val name = "Utilities"

14
src/dorkbox/util/Sys.java
View File

@ -347,8 +347,8 @@ class Sys {
public static public static
int[] bytesToInts(byte[] bytes, int startPosition, int length) { int[] bytesToInts(byte[] bytes, int startPosition, int length) {
int[] ints = new int[length]; int[] ints = new int[length];
int endPosition = startPosition + length;
for (int i = startPosition; i < length; i++) { for (int i = startPosition; i < endPosition; i++) {
ints[i] = bytes[i] & 0xFF; ints[i] = bytes[i] & 0xFF;
} }
@ -367,11 +367,13 @@ class Sys {
public static public static
String bytesToHex(byte[] bytes, int startPosition, int length, boolean padding) { String bytesToHex(byte[] bytes, int startPosition, int length, boolean padding) {
int endPosition = startPosition + length;
if (padding) { if (padding) {
char[] hexString = new char[3 * length - startPosition]; char[] hexString = new char[3 * length];
int j = 0; int j = 0;
for (int i = startPosition; i < length; i++) { for (int i = startPosition; i < endPosition; i++) {
hexString[j++] = HEX_CHARS[(bytes[i] & 0xF0) >> 4]; hexString[j++] = HEX_CHARS[(bytes[i] & 0xF0) >> 4];
hexString[j++] = HEX_CHARS[bytes[i] & 0x0F]; hexString[j++] = HEX_CHARS[bytes[i] & 0x0F];
hexString[j++] = ' '; hexString[j++] = ' ';
@ -380,10 +382,10 @@ class Sys {
return new String(hexString); return new String(hexString);
} }
else { else {
char[] hexString = new char[2 * length - startPosition]; char[] hexString = new char[2 * length];
int j = 0; int j = 0;
for (int i = startPosition; i < length; i++) { for (int i = startPosition; i < endPosition; i++) {
hexString[j++] = HEX_CHARS[(bytes[i] & 0xF0) >> 4]; hexString[j++] = HEX_CHARS[(bytes[i] & 0xF0) >> 4];
hexString[j++] = HEX_CHARS[bytes[i] & 0x0F]; hexString[j++] = HEX_CHARS[bytes[i] & 0x0F];
} }