This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 633e984 fix for TIKA-3401 contributed by kamaci (#442)
633e984 is described below
commit 633e9849a3a349e983c2fadf5d73ae9d64456f48
Author: Furkan KAMACI <[email protected]>
AuthorDate: Mon May 17 20:21:19 2021 +0300
fix for TIKA-3401 contributed by kamaci (#442)
---
.../main/java/org/apache/tika/io/EndianUtils.java | 24 +++++++++++-----------
.../org/apache/tika/parser/mp3/ID3v2Frame.java | 8 ++++----
.../tika/parser/microsoft/onenote/OneNotePtr.java | 2 +-
.../apache/tika/parser/hwp/HwpTextExtractorV5.java | 2 +-
.../tika/parser/wordperfect/WPInputStream.java | 4 ++--
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/tika-core/src/main/java/org/apache/tika/io/EndianUtils.java
b/tika-core/src/main/java/org/apache/tika/io/EndianUtils.java
index 83f0527..0400f40 100644
--- a/tika-core/src/main/java/org/apache/tika/io/EndianUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/io/EndianUtils.java
@@ -64,7 +64,7 @@ public class EndianUtils {
if ((ch1 | ch2) < 0) {
throw new BufferUnderrunException();
}
- return (ch2 << 8) + (ch1 << 0);
+ return (ch2 << 8) + (ch1);
}
public static int readUShortBE(InputStream stream) throws IOException,
BufferUnderrunException {
@@ -73,7 +73,7 @@ public class EndianUtils {
if ((ch1 | ch2) < 0) {
throw new BufferUnderrunException();
}
- return (ch1 << 8) + (ch2 << 0);
+ return (ch1 << 8) + (ch2);
}
/**
@@ -92,7 +92,7 @@ public class EndianUtils {
if ((ch1 | ch2 | ch3 | ch4) < 0) {
throw new BufferUnderrunException();
}
- return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0)) &
0x00FFFFFFFFl;
+ return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1)) &
0x00FFFFFFFFl;
}
/**
@@ -111,7 +111,7 @@ public class EndianUtils {
if ((ch1 | ch2 | ch3 | ch4) < 0) {
throw new BufferUnderrunException();
}
- return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0)) &
0x00FFFFFFFFl;
+ return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4)) &
0x00FFFFFFFFl;
}
/**
@@ -130,7 +130,7 @@ public class EndianUtils {
if ((ch1 | ch2 | ch3 | ch4) < 0) {
throw new BufferUnderrunException();
}
- return (ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0);
+ return (ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1);
}
/**
@@ -149,7 +149,7 @@ public class EndianUtils {
if ((ch1 | ch2 | ch3 | ch4) < 0) {
throw new BufferUnderrunException();
}
- return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0);
+ return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4);
}
/**
@@ -175,7 +175,7 @@ public class EndianUtils {
return ((long) ch8 << 56) + ((long) ch7 << 48) + ((long) ch6 << 40) +
((long) ch5 << 32) +
((long) ch4 << 24) + // cast to long to preserve bit 31 (sign
bit for ints)
- (ch3 << 16) + (ch2 << 8) + (ch1 << 0);
+ (ch3 << 16) + (ch2 << 8) + (ch1);
}
/**
@@ -201,7 +201,7 @@ public class EndianUtils {
return ((long) ch1 << 56) + ((long) ch2 << 48) + ((long) ch3 << 40) +
((long) ch4 << 32) +
((long) ch5 << 24) + // cast to long to preserve bit 31 (sign
bit for ints)
- (ch6 << 16) + (ch7 << 8) + (ch8 << 0);
+ (ch6 << 16) + (ch7 << 8) + (ch8);
}
/**
@@ -269,7 +269,7 @@ public class EndianUtils {
public static int getUShortLE(byte[] data, int offset) {
int b0 = data[offset] & 0xFF;
int b1 = data[offset + 1] & 0xFF;
- return (b1 << 8) + (b0 << 0);
+ return (b1 << 8) + (b0);
}
/**
@@ -313,7 +313,7 @@ public class EndianUtils {
public static int getUShortBE(byte[] data, int offset) {
int b0 = data[offset] & 0xFF;
int b1 = data[offset + 1] & 0xFF;
- return (b0 << 8) + (b1 << 0);
+ return (b0 << 8) + (b1);
}
/**
@@ -339,7 +339,7 @@ public class EndianUtils {
int b1 = data[i++] & 0xFF;
int b2 = data[i++] & 0xFF;
int b3 = data[i++] & 0xFF;
- return (b3 << 24) + (b2 << 16) + (b1 << 8) + (b0 << 0);
+ return (b3 << 24) + (b2 << 16) + (b1 << 8) + (b0);
}
/**
@@ -365,7 +365,7 @@ public class EndianUtils {
int b1 = data[i++] & 0xFF;
int b2 = data[i++] & 0xFF;
int b3 = data[i++] & 0xFF;
- return (b0 << 24) + (b1 << 16) + (b2 << 8) + (b3 << 0);
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + (b3);
}
/**
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
index b471886..6f39a28 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
@@ -128,20 +128,20 @@ public class ID3v2Frame implements MP3Frame {
int b1 = data[offset + 1] & 0xFF;
int b2 = data[offset + 2] & 0xFF;
int b3 = data[offset + 3] & 0xFF;
- return (b0 << 24) + (b1 << 16) + (b2 << 8) + (b3 << 0);
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + (b3);
}
protected static int getInt3(byte[] data, int offset) {
int b0 = data[offset + 0] & 0xFF;
int b1 = data[offset + 1] & 0xFF;
int b2 = data[offset + 2] & 0xFF;
- return (b0 << 16) + (b1 << 8) + (b2 << 0);
+ return (b0 << 16) + (b1 << 8) + (b2);
}
protected static int getInt2(byte[] data, int offset) {
int b0 = data[offset + 0] & 0xFF;
int b1 = data[offset + 1] & 0xFF;
- return (b0 << 8) + (b1 << 0);
+ return (b0 << 8) + (b1);
}
/**
@@ -154,7 +154,7 @@ public class ID3v2Frame implements MP3Frame {
int b1 = data[offset + 1] & 0x7F;
int b2 = data[offset + 2] & 0x7F;
int b3 = data[offset + 3] & 0x7F;
- return (b0 << 21) + (b1 << 14) + (b2 << 7) + (b3 << 0);
+ return (b0 << 21) + (b1 << 14) + (b2 << 7) + (b3);
}
protected static byte[] readFully(InputStream inp, int length) throws
IOException {
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
index 09a6f9b..09cf277 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
@@ -218,7 +218,7 @@ class OneNotePtr {
}
int c1 = dif.read();
int c2 = dif.read();
- long res = (((c1 & 0xff) << 0) + ((c2 & 0xff) << 8));
+ long res = (((c1 & 0xff)) + ((c2 & 0xff) << 8));
offset = dif.position();
return res;
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
index b68b1f6..32c7869 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
@@ -453,7 +453,7 @@ public class HwpTextExtractorV5 implements Serializable {
}
private int rand() {
- random_seed = (random_seed * 214013 + 2531011) & 0xFFFFFFFF;
+ random_seed = (random_seed * 214013 + 2531011);
return (random_seed >> 16) & 0x7FFF;
}
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
index acd08f6..896f586 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
@@ -60,7 +60,7 @@ class WPInputStream extends InputStream {
if ((ch1 | ch2) < 0) {
throw new EOFException();
}
- return (ch2 << 8) + (ch1 << 0);
+ return (ch2 << 8) + ch1;
}
/**
@@ -78,7 +78,7 @@ class WPInputStream extends InputStream {
if ((ch1 | ch2 | ch3 | ch4) < 0) {
throw new EOFException();
}
- return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0));
+ return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + ch1);
}
/**
