You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2014/05/19 14:01:22 UTC
svn commit: r1595854 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
Author: jukka
Date: Mon May 19 12:01:21 2014
New Revision: 1595854
URL: http://svn.apache.org/r1595854
Log:
1.0.1: Merged revision 1593554 (OAK-1810)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1593554
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java?rev=1595854&r1=1595853&r2=1595854&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java Mon May 19 12:01:21 2014
@@ -439,7 +439,7 @@ class TarReader {
return null; // magic byte mismatch
}
- if (count < 0 || bytes < count * 24 + 16 || BLOCK_SIZE + bytes > pos) {
+ if (count < 0 || bytes < count * 16 + 16 || BLOCK_SIZE + bytes > pos) {
log.warn("Invalid graph metadata in tar file {}", file);
return null; // impossible uuid and/or byte counts
}