mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

framebuffer_spark: more sanity checks in blitRect()

Browse Source 
If code is triggering blitRect() with invalid values (x > xRes
for example), the drivers get unhappy. So let's check for invalid
input values.


Origin commit data
------------------
Branch: ni/coolstream
Commit: dc7d568d8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-28 (Sat, 28 Jul 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-28 23:47:27 +02:00
parent 2da175a159
commit cda2c8d91c
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/driver/framebuffer_spark.cpp
View File

@@ -1509,14 +1509,42 @@ void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, in
void CFrameBuffer::blitRect(int x, int y, int width, int height, unsigned long color) void CFrameBuffer::blitRect(int x, int y, int width, int height, unsigned long color)
{ {
//printf ("[fb - blitRect]: x=%d, y=%d, width=%d, height=%d\n", x, y, width, height); //printf ("[fb - blitRect]: x=%d, y=%d, width=%d, height=%d\n", x, y, width, height);
if (width == 0 || height == 0) if (width <= 0 || height <= 0)
return; return;
if (x + width > (int)xRes) { /* maybe we should just return instead of fixing this up... */
if (x < 0) {
fprintf(stderr, "[neutrino] fb::%s: x < 0 (%d)\n", __func__, x);
width += x;
if (width <= 0)
return;
x = 0;
}
if (y < 0) {
fprintf(stderr, "[neutrino] fb::%s: y < 0 (%d)\n", __func__, y);
height += y;
if (height <= 0)
return;
y = 0;
}
int right = x + width;
int bottom = y + height;
if (right > (int)xRes) {
if (x >= (int)xRes) {
fprintf(stderr, "[neutrino] fb::%s: x >= xRes (%d > %d)\n", __func__, x, xRes);
return;
}
fprintf(stderr, "[neutrino] fb::%s: x + w > xRes! (%d+%d > %d)\n", __func__, x, width, xRes); fprintf(stderr, "[neutrino] fb::%s: x + w > xRes! (%d+%d > %d)\n", __func__, x, width, xRes);
width = xRes - x; width = xRes - x;
} }
if (y + height > (int)yRes) { if (bottom > (int)yRes) {
if (y >= (int)yRes) {
fprintf(stderr, "[neutrino] fb::%s: y >= yRes (%d > %d)\n", __func__, y, yRes);
return;
}
fprintf(stderr, "[neutrino] fb::%s: y + h > yRes! (%d+%d > %d)\n", __func__, y, height, yRes); fprintf(stderr, "[neutrino] fb::%s: y + h > yRes! (%d+%d > %d)\n", __func__, y, height, yRes);
height = yRes - y; height = yRes - y;
} }
@@ -1530,8 +1558,8 @@ void CFrameBuffer::blitRect(int x, int y, int width, int height, unsigned long c
bltData.dst_left = x; bltData.dst_left = x;
bltData.dst_top = y; bltData.dst_top = y;
bltData.dst_right = x + width; bltData.dst_right = right;
bltData.dst_bottom = y + height; bltData.dst_bottom = bottom;
bltData.dstFormat = SURF_ARGB8888; bltData.dstFormat = SURF_ARGB8888;
bltData.srcFormat = SURF_ARGB8888; bltData.srcFormat = SURF_ARGB8888;