From e4fd171da2c467b04d30b2363b38077bdfb0bb8d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 22 Oct 2019 11:56:45 +0200 Subject: [PATCH] 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 --- .../jgit/internal/storage/dfs/DfsReftableDatabase.java | 4 +++- .../jgit/internal/storage/reftable/ReftableDatabase.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java index 2497719196..2ad3ae7e62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java @@ -163,7 +163,9 @@ public class DfsReftableDatabase extends DfsRefDatabase { * 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) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java index ce6ddb9cc6..2753c02800 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java @@ -138,7 +138,10 @@ public abstract class ReftableDatabase { * 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(); } -- 2.39.5