Skip to content

Commit 96aee57

Browse files
committed
Merge branch 'master' into bounds-checks
2 parents 9265ebb + 294bf59 commit 96aee57

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
env:
2424
JAVA_OPTS: '-XX:+TieredCompilation -XX:TieredStopAtLevel=1'
2525
steps:
26-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
26+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
- name: Set up JDK
28-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
28+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2929
with:
3030
distribution: 'temurin'
3131
java-version: ${{ matrix.java_version }}
@@ -37,7 +37,7 @@ jobs:
3737
run: ./mvnw -B -q -ff -ntp test
3838
- name: Publish code coverage
3939
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
40-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
40+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
4141
with:
4242
token: ${{ secrets.CODECOV_TOKEN }}
4343
files: ./target/site/jacoco/jacoco.xml

src/main/java/com/ning/compress/lzf/ChunkDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void decodeChunk(byte[] in, int inPos, int inEnd, byte[] out, int outPos,
155155
public abstract int skipOrDecodeChunk(final InputStream is, final byte[] inputBuffer,
156156
final byte[] outputBuffer, final long maxToSkip)
157157
throws IOException;
158-
158+
159159
/*
160160
///////////////////////////////////////////////////////////////////////
161161
// Public static methods

src/main/java/com/ning/compress/lzf/impl/VanillaChunkDecoder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,5 +316,4 @@ protected static final void copyUpTo32WithSwitch(byte[] in, int inPos, byte[] ou
316316
out[outPos++] = in[inPos++];
317317
}
318318
}
319-
320319
}

0 commit comments

Comments
 (0)