From 8879601b8eae7584b3e456dc39f23ae32940021c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 24 Mar 2013 19:21:51 +0100 Subject: [PATCH] fb_ng: allow NULL argument for Save/RestoreScreen Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/10ffeedffc6b97789319f38afb188f9760c1be90 Author: Stefan Seyfried Date: 2013-03-24 (Sun, 24 Mar 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/framebuffer_ng.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index cb2ac1776..f10558487 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -1068,7 +1068,7 @@ void CFrameBuffer::paintBackground() void CFrameBuffer::SaveScreen(int x, int y, int dx, int dy, fb_pixel_t * const memp) { - if (!getActive()) + if (!getActive() || memp == NULL) return; uint8_t * pos = ((uint8_t *)getFrameBufferPointer()) + x * sizeof(fb_pixel_t) + stride * y; @@ -1095,7 +1095,7 @@ void CFrameBuffer::SaveScreen(int x, int y, int dx, int dy, fb_pixel_t * const m void CFrameBuffer::RestoreScreen(int x, int y, int dx, int dy, fb_pixel_t * const memp) { - if (!getActive()) + if (!getActive() || memp == NULL) return; uint8_t * fbpos = ((uint8_t *)getFrameBufferPointer()) + x * sizeof(fb_pixel_t) + stride * y;