From 754090435ceea8df77683009a0546a9e6f740452 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 20 Sep 2016 12:26:31 -0400 Subject: [PATCH 1/1] ss: Check return value of FileChannel.read() call Fixes a Coverity warning. Change-Id: Ic11af8b32d7dccf136812400a689964c04bedf50 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/81497 Reviewed-by: Hudson CI Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien --- .../core/backend/historytree/HistoryTreeClassic.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/historytree/HistoryTreeClassic.java b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/historytree/HistoryTreeClassic.java index 29f62481c0..461fbf6eb2 100644 --- a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/historytree/HistoryTreeClassic.java +++ b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/historytree/HistoryTreeClassic.java @@ -141,10 +141,14 @@ public class HistoryTreeClassic implements IHistoryTree { FileChannel fc = fis.getChannel();) { ByteBuffer buffer = ByteBuffer.allocate(TREE_HEADER_SIZE); - buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.clear(); - fc.read(buffer); + + res = fc.read(buffer); + if (res != TREE_HEADER_SIZE) { + throw new IOException("Invalid header size"); //$NON-NLS-1$ + } + buffer.flip(); /* -- 2.34.1