From 1bfcceaca6eb26594ab28bb68638bb480efa1879 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Wed, 13 Jul 2011 17:32:05 -0700 Subject: For the serialization context, no fifo initialization is necessary. On shutdown it was attempting to free uninitialized memory. Change-Id: I9141be5a51253f87f21594ae38f7e653f9e69c6c --- libs/rs/rsLocklessFifo.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libs/rs/rsLocklessFifo.cpp') diff --git a/libs/rs/rsLocklessFifo.cpp b/libs/rs/rsLocklessFifo.cpp index 70b7278..7023a1f 100644 --- a/libs/rs/rsLocklessFifo.cpp +++ b/libs/rs/rsLocklessFifo.cpp @@ -21,14 +21,16 @@ using namespace android; using namespace android::renderscript; -LocklessCommandFifo::LocklessCommandFifo() { +LocklessCommandFifo::LocklessCommandFifo() : mBuffer(0) { } LocklessCommandFifo::~LocklessCommandFifo() { if (!mInShutdown) { shutdown(); } - free(mBuffer); + if (mBuffer) { + free(mBuffer); + } } void LocklessCommandFifo::shutdown() { -- cgit v1.1