Avoid NULL pointer exceptions when blitting without a buffer

Change-Id: Ic670895f50ff3aa12fb0963e321541b21e886e12 Reviewed-on: https://swiftshader-review.googlesource.com/3110Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Greg Hartman <ghartman@google.com>

Avoid NULL pointer exceptions when blitting without a buffer
5f3d23ca · Greg Hartman · 1780905e · 5f3d23ca
Commit 5f3d23ca authored May 12, 2015 by Greg Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

FrameBufferAndroid.cpp src/Main/FrameBufferAndroid.cpp +8 -6

No files found.
--- a/src/Main/FrameBufferAndroid.cpp
+++ b/src/Main/FrameBufferAndroid.cpp
@@ -31,14 +31,16 @@ namespace sw
    void FrameBufferAndroid::blit(void *source, const Rect *sourceRect, const Rect *destRect, Format format)
    {
        copy(source, format);
-		nativeWindow->queueBuffer(nativeWindow, buffer, -1);
-		if (buffer && locked)
+		if (buffer)
 		{
-			locked = 0;
-			unlock();
+			nativeWindow->queueBuffer(nativeWindow, buffer, -1);
+			if (locked)
+			{
+				locked = 0;
+				unlock();
+			}
+			buffer->common.decRef(&buffer->common);
 		}
-
-		buffer->common.decRef(&buffer->common);
    }

    void* FrameBufferAndroid::lock()