motiejus
/
jgit
1
Fork 0
Code Releases Activity

reftable: remove assert calls 

The effect of assert is defined by compiler flags, so this code
introduced a potential vector for corruption. 

Change-Id: I12197432e4351a5bd4aa24d352a19937721845c3
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2019-10-22 11:56:45 +02:00
parent c020848dbb
commit e4fd171da2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
View File

@ -163,7 +163,9 @@ protected boolean compactDuringCommit() {
* if tables cannot be opened.
*/
protected DfsReftableStack stack() throws IOException {
assert getLock().isLocked();
if (!getLock().isLocked()) {
throw new IllegalStateException("most hold lock to access stack"); //$NON-NLS-1$
}
DfsObjDatabase odb = getRepository().getObjectDatabase();
if (ctx == null) {

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java
View File

@ -138,7 +138,10 @@ public ReentrantLock getLock() {
* on I/O problems
*/
private Reftable reader() throws IOException {
assert lock.isLocked();
if (!lock.isLocked()) {
throw new IllegalStateException(
"must hold lock to access merged table"); //$NON-NLS-1$
}
if (mergedTables == null) {
mergedTables = openMergedReftable();
}