Attachment 13320 Details for Bug 42999

patch

xfstt.cc.diff (text/x-diff), 5.34 KB, created by Thomas Biege on 2003-08-04 22:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2003-08-04 22:12:23 UTC

Size: 5.34 KB

patch

obsolete

>Index: src/xfstt.cc
>===================================================================
>RCS file: /cvsroot/xfstt/xfstt/src/xfstt.cc,v
>retrieving revision 1.12
>retrieving revision 1.14
>diff -u -r1.12 -r1.14
>--- src/xfstt.cc	2003/07/28 22:27:25	1.12
>+++ src/xfstt.cc	2003/07/31 06:27:29	1.14
>@@ -1,7 +1,7 @@
> /*
>  * X Font Server for *.ttf Files
>  *
>- * $Id: xfstt.cc,v 1.12 2003/07/28 22:27:25 guillem Exp $
>+ * $Id: xfstt.cc,v 1.14 2003/07/31 06:27:29 guillem Exp $
>  *
>  * Copyright (C) 1997-1999 Herbert Duerr
>  * portions are (C) 1999 Stephen Carpenter and others
>@@ -874,13 +874,20 @@
> static int
> connecting(int sd)
> {
>+	debug("Connecting\n");
>+
> 	int i = read(sd, buf, MAXREQSIZE);	// read fsConnClientPrefix
> 
> 	fsConnClientPrefix *req = (fsConnClientPrefix *)buf;
>+
> 	if (i < (int)sizeof(fsConnClientPrefix))
> 		return 0;
> 
>-	debug("Connecting\n");
>+	if (req->byteOrder != 'l' && req->byteOrder != 'B') {
>+		fputs(_("xfstt: invalid byteorder, giving up\n"), stderr);
>+		return 0;
>+	}
>+
> 	debug("%s endian connection\n",
> 	      (req->byteOrder == 'l') ? "little" : "big");
> 	debug("version %d.%d\n", req->major_version, req->minor_version);
>@@ -1009,6 +1016,32 @@
> }
> 
> static int
>+send_fserror(int sd, int seqno)
>+{
>+	fsError reply;
>+
>+	reply.type = FS_Error;
>+	reply.request = FSBadLength;
>+	reply.sequenceNumber = seqno;
>+	reply.length = sizeof(reply) >> 2;
>+
>+	return write(sd, (void *)&reply, sizeof(reply));
>+}
>+
>+static int
>+check_length(int sd, int seqno, fsReq *req, int expected_size)
>+{
>+	if (req->length < (expected_size >> 2)) {
>+		debug("packet size mismatch: %d received bytes, "
>+		      "%d expected bytes\n", req->length << 2, expected_size);
>+		send_fserror(sd, seqno);
>+		return 0;
>+	} else {
>+		return 1;
>+	}
>+}
>+
>+static int
> working(int sd, Rasterizer *raster, char *replybuf)
> {
> 	FontParams fp0 = {{0, 0, 0, 0}, {0, 0, 0, 0}, {VGARES, VGARES}, 0}, fp;
>@@ -1034,15 +1067,9 @@
> 		fsReq *fsreq = (fsReq *)buf;
> 		int length = fsreq->length << 2;
> 		if (length > MAXREQSIZE) {
>-			debug("request too big: %d bytes\n", length);
>-
>-			fsError reply;
>-			reply.type = FS_Error;
>-			reply.request = FSBadLength;
>-			reply.sequenceNumber = seqno;
>-			reply.length = sizeof(reply) >> 2;
>-
>-			write(sd, (void *)&reply, sizeof(reply));
>+			debug("too much data: %d bytes (max=%d)\n",
>+			      length, MAXREQSIZE);
>+			send_fserror(sd, seqno);
> 			break;
> 		}
> 
>@@ -1192,7 +1219,13 @@
> 		case FS_SetResolution:
> 			{
> 			fsSetResolutionReq *req = (fsSetResolutionReq *)buf;
>-			int numres = req->num_resolutions;	// XXX 1
>+			int numres = req->num_resolutions;
>+			int expected_size = numres * sz_fsResolution
>+					    + sz_fsSetResolutionReq;
>+
>+			if (!check_length(sd, seqno, fsreq, expected_size))
>+				break;
>+
> 			fsResolution *res = (fsResolution *)(req + 1);
> 
> 			debug("FS_SetResolution * %d\n", numres);
>@@ -1237,6 +1270,10 @@
> 			{
> 			fsListFontsReq* req = (fsListFontsReq *)buf;
> 			char *pattern = (char *)(req + 1);
>+			int expected_size = sz_fsListFontsReq + req->nbytes;
>+
>+			if (!check_length(sd, seqno, fsreq, expected_size))
>+				break;
> 
> 			pattern[req->nbytes] = 0;
> 			debug("FS_ListFonts \"%s\" * %ld\n",
>@@ -1440,24 +1477,34 @@
> 			break;
> 
> 		case FS_QueryXExtents8:
>-			// convert to QueryXExtents16 request
>-			{
>-			fsQueryXExtents8Req *req = (fsQueryXExtents8Req *)buf;
>-			U8 *p8 = (U8 *)(req + 1);
>-			U16 *p16 = (U16 *)p8;
>-			for (i = req->num_ranges; --i >= 0;)
>-				p16[i] = htons(p8[i]);
>-			}
>-			// fall through
> 		case FS_QueryXExtents16:
> 			{
> 			fsQueryXExtents16Req *req = (fsQueryXExtents16Req *)buf;
>+
> 			debug("FS_QueryXExtents%s fid = %ld, ",
> 			      (req->reqType == FS_QueryXExtents8 ? "8" : "16"),
> 			      req->fid);
> 			debug("range=%d, nranges=%ld\n",
> 			      req->range, req->num_ranges);
> 
>+			int item_size = (req->reqType == FS_QueryXExtents8)
>+				        ? 1 : 2;
>+			int expected_size = sz_fsQueryXExtents8Req
>+				            + req->num_ranges * item_size;
>+
>+			if (!check_length(sd, seqno, fsreq, expected_size))
>+				break;
>+
>+			if (req->reqType == FS_QueryXExtents8) {
>+				/*
>+				 * Convert to QueryXExtents16 request
>+				 */
>+				U8 *p8 = (U8 *)(req + 1);
>+				U16 *p16 = (U16 *)p8;
>+				for (i = req->num_ranges; --i >= 0;)
>+					p16[i] = htons(p8[i]);
>+			}
>+
> 			XFSFont *xfs = findFont(req->fid, sd, seqno);
> 			if (!xfs)
> 				break;
>@@ -1527,22 +1574,32 @@
> 			break;
> 
> 		case FS_QueryXBitmaps8:
>-			// convert to QueryXBitmaps16 request
>-			{
>-			fsQueryXBitmaps8Req *req = (fsQueryXBitmaps8Req *)buf;
>-			U8 *p8 = (U8 *)(req + 1);
>-			U16 *p16 = (U16 *)p8;
>-			for (i = req->num_ranges; --i >= 0;)
>-				p16[i] = ntohs(p8[i]);
>-			}
>-			// fall through
> 		case FS_QueryXBitmaps16:
> 			{
> 			fsQueryXBitmaps16Req *req = (fsQueryXBitmaps16Req *)buf;
>+
> 			debug("FS_QueryXBitmaps16 fid = %ld, fmt = %04lX\n",
> 			      req->fid, req->format);
> 			debug("range=%d, nranges=%ld\n",
> 			      req->range, req->num_ranges);
>+
>+			int item_size = (req->reqType == FS_QueryXExtents8)
>+				        ? 1: 2;
>+			int expected_size = sz_fsQueryXBitmaps8Req
>+					    + req->num_ranges * item_size;
>+
>+			if (!check_length(sd, seqno, fsreq, expected_size))
>+				break;
>+
>+			if (req->reqType == FS_QueryXBitmaps8) {
>+				/*
>+				 * Convert to QueryXBitmaps16 request
>+				 */
>+				U8 *p8 = (U8 *)(req + 1);
>+				U16 *p16 = (U16 *)p8;
>+				for (i = req->num_ranges; --i >= 0;)
>+					p16[i] = ntohs(p8[i]);
>+			}
> 
> 			XFSFont *xfs = findFont(req->fid, sd, seqno);
> 			if (!xfs)

Actions: View

Attachments on bug 42999: 13131 | 13132 | 13320