mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better check for screen bounds.

Browse Source
This commit is contained in:
mmdolze
2011-01-24 19:46:32 +00:00
parent 95512f591d
commit 004c5d7869
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/t6963.c
+19 -6
View File
@@ -324,25 +324,34 @@ t6963_flush(Driver * drvthis)
/** /**
* API: Prints a string on the lcd display, at position (x,y). The * API: Prints a string on the lcd display, at position (x,y). The
* upper-left is (1,1), and the lower right should be (20,6). * upper-left is (1,1), and the lower right should be (width,height).
*/ */
MODULE_EXPORT void MODULE_EXPORT void
t6963_string(Driver * drvthis, int x, int y, const char string[]) t6963_string(Driver * drvthis, int x, int y, const char string[])
{ {
PrivateData *p = drvthis->private_data; PrivateData *p = drvthis->private_data;
int len;
debug(RPT_DEBUG, "String out"); debug(RPT_DEBUG, "String out");
/* Don't accept start coordinates outside the screen at all */
if ((y < 1) || (y > p->height) || (x < 1) || (x > p->width))
return;
x--; /* Convert 1-based coords to 0-based */ x--; /* Convert 1-based coords to 0-based */
y--; y--;
if ((y * p->width + x + strlen(string)) <= (p->width * p->height)) /* Restrict string length to screen width */
memcpy(&p->display_buffer1[y * p->width + x], string, strlen(string)); len = strlen(string);
if (x + len > p->width)
len = p->width - x;
memcpy(&p->display_buffer1[y * p->width + x], string, len);
} }
/** /**
* API: Prints a character on the lcd display, at position (x,y). The * API: Prints a character on the lcd display, at position (x,y). The
* upper-left is (1,1), and the lower right should be (20,6). * upper-left is (1,1), and the lower right should be (width,height).
*/ */
MODULE_EXPORT void MODULE_EXPORT void
t6963_chr(Driver * drvthis, int x, int y, char c) t6963_chr(Driver * drvthis, int x, int y, char c)
@@ -351,10 +360,14 @@ t6963_chr(Driver * drvthis, int x, int y, char c)
debug(RPT_DEBUG, "Char out"); debug(RPT_DEBUG, "Char out");
/* Only copy if within screen bounds */
if ((y < 1) || (y > p->height) || (x < 1) || (x > p->width))
return;
y--; y--;
x--; x--;
if ((y * p->width) + x <= (p->width * p->height))
p->display_buffer1[(y * p->width) + x] = c; p->display_buffer1[(y * p->width) + x] = c;
} }
/** /**