From d28013e9867e091682d36133bb59efdd321a00aa Mon Sep 17 00:00:00 2001 From: Alessandro Bellina Date: Mon, 12 Oct 2020 10:07:26 -0500 Subject: [PATCH] RapidsBufferStore race could cause NPE (#928) Signed-off-by: Alessandro Bellina --- .../scala/com/nvidia/spark/rapids/RapidsBufferStore.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsBufferStore.scala b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsBufferStore.scala index a23b0dd3aecb..a3dbabc7b773 100644 --- a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsBufferStore.scala +++ b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsBufferStore.scala @@ -213,8 +213,10 @@ abstract class RapidsBufferStore( val bufferToSpill = buffers.nextSpillableBuffer() if (bufferToSpill != null) { spillAndFreeBuffer(bufferToSpill, stream) + bufferToSpill.size + } else { + 0 } - bufferToSpill.size } private def spillAndFreeBuffer(buffer: RapidsBufferBase, stream: Cuda.Stream): Unit = {