motiejus
/
jgit
1
Fork 0
Code Releases Activity

reftable: increment pointer *after* reading uint16 

This fixes timezone reads out of the reflog.

Change-Id: I126d8742e5e904a074c544514180720466164f7c
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2019-08-07 23:28:32 +02:00
parent 81801d6f96
commit d7ee5aafee
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
View File

@ -624,6 +624,8 @@ public void onlyReflog() throws IOException {
assertEquals(ObjectId.zeroId(), lc.getReflogEntry().getOldId());
assertEquals(id(1), lc.getReflogEntry().getNewId());
assertEquals(who, lc.getReflogEntry().getWho());
// compare string too, to catch tz differences.
assertEquals(who.toExternalString(), lc.getReflogEntry().getWho().toExternalString());
assertEquals(msg, lc.getReflogEntry().getComment());
assertTrue(lc.next());

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java
View File

@ -557,7 +557,9 @@ private void skipString() {
}
private short readInt16() {
return (short) NB.decodeUInt16(buf, ptr += 2);
short result =(short) NB.decodeUInt16(buf, ptr);
ptr += 2;
return result;
}
private int readVarint32() {