diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-07-13 17:32:05 -0700 |
|---|---|---|
| committer | Alex Sakhartchouk <alexst@google.com> | 2011-07-13 17:32:05 -0700 |
| commit | 1bfcceaca6eb26594ab28bb68638bb480efa1879 (patch) | |
| tree | bd60e3d44efe36188f7bfa3f3be541aeeb41a1d6 /libs/rs/rsLocklessFifo.cpp | |
| parent | 9cba686366870b3a4c69bcec0eb4200352ce481d (diff) | |
| download | frameworks_base-1bfcceaca6eb26594ab28bb68638bb480efa1879.zip frameworks_base-1bfcceaca6eb26594ab28bb68638bb480efa1879.tar.gz frameworks_base-1bfcceaca6eb26594ab28bb68638bb480efa1879.tar.bz2 | |
For the serialization context, no fifo initialization is necessary.
On shutdown it was attempting to free uninitialized memory.
Change-Id: I9141be5a51253f87f21594ae38f7e653f9e69c6c
Diffstat (limited to 'libs/rs/rsLocklessFifo.cpp')
| -rw-r--r-- | libs/rs/rsLocklessFifo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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() { |