summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2015-01-20 17:24:50 -0500
committerPeter Harris <pharris@opentext.com>2015-01-20 17:25:25 -0500
commited1ea7a8f15d177d2339bdc623fd2190045e40f2 (patch)
tree90d74fdc7e8390649f9bf07b40d102bf8036e2b2
parent79afc73dbabcfce333dbb6dab187cd27f49a3f7e (diff)
libproto: Fix buffer read overrun
Found by -fsanitize=address Signed-off-by: Peter Harris <pharris@opentext.com>
-rw-r--r--xts5/src/libproto/ShowSup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xts5/src/libproto/ShowSup.c b/xts5/src/libproto/ShowSup.c
index a05ff7d0..b8ba7968 100644
--- a/xts5/src/libproto/ShowSup.c
+++ b/xts5/src/libproto/ShowSup.c
@@ -581,7 +581,7 @@ int format;
int i;
if (nval > 0) {
- valuePtr = (CARD32 *) ((CARD32 *) rp + size);
+ valuePtr = (CARD32 *) ((CARD8 *) rp + size);
for (i = 0; i < nval; i++) {
Log_Some("\tfontprop %d, name = 0x%lx, value = 0x%lx\n", i, *valuePtr, *(valuePtr+1));
valuePtr += 2;
@@ -598,7 +598,7 @@ int format;
int i;
if (nval > 0) {
- valuePtr = (CARD16 *) ((CARD16 *) rp + size);
+ valuePtr = (CARD16 *) ((CARD8 *) rp + size);
for (i = 0; i < nval; i++) {
Log_Some("\tcharinfo %d, left-side-bearing = %d, right-side-bearing = %d, character-width = %d, ascent = %d, descent = %d, attributes = 0x%x\n", i, *valuePtr, *(valuePtr+1), *(valuePtr+2), *(valuePtr+3), *(valuePtr+4), *(valuePtr+5));
valuePtr += 6;