 @@ -464,27 +464,27 @@ FreeTypeOpenInstance(FTInstancePtr *inst
             return xrc;
+        }
         ftrc = FT_Set_Pixel_Sizes(instance->face->face, xsize, ysize);
+    }
     if(ftrc != 0) {
         FT_Done_Size(instance->size);
         free(instance);
         return FTtoXReturnCode(ftrc);
+    }
     if( FT_IS_SFNT( face->face ) ) {
 #if 1
         FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-        FT_UInt     nn;
+        FT_Int     nn;
         instance->strike_index=0xFFFFU;
         tt_char_width  = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5);
         tt_char_height = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5);
         tt_dim_x = FLOOR64( ( tt_char_width  * trans->xres + 36 ) / 72 + 32 );
         tt_dim_y = FLOOR64( ( tt_char_height * trans->yres + 36 ) / 72 + 32 );
 	if ( tt_dim_x && !tt_dim_y )
 	    tt_dim_y = tt_dim_x;
 	else if ( !tt_dim_x && tt_dim_y )
 	    tt_dim_x = tt_dim_y;
 @@ -612,27 +612,27 @@ FreeTypeInstanceFindGlyph(unsigned idx_i
+    }
     if(*available == NULL) {
         *available = calloc(iceil(instance->nglyphs, FONTSEGMENTSIZE),
 			    sizeof(int *));
         if(*available == NULL)
             return AllocError;
+    }
     segment = ifloor(idx, FONTSEGMENTSIZE);
     offset = idx - segment * FONTSEGMENTSIZE;
     if((*available)[segment] == NULL) {
-        (*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int *));
+        (*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int));
         if((*available)[segment] == NULL)
             return AllocError;
+    }
     if(*glyphs == NULL) {
         *glyphs = calloc(iceil(instance->nglyphs, FONTSEGMENTSIZE),
 			 sizeof(CharInfoPtr));
         if(*glyphs == NULL)
             return AllocError;
+    }
     if((*glyphs)[segment] == NULL) {
         (*glyphs)[segment] = malloc(sizeof(CharInfoRec) * FONTSEGMENTSIZE);
 @@ -1444,27 +1444,27 @@ FreeTypeRasteriseGlyph(unsigned idx, int
 	bitmap = &face->face->glyph->bitmap;
 	if( 0 <= dx ){
 	    div_dx = dx / 8;
 	    mod_dx0 = dx % 8;
 	    mod_dx1 = 8-mod_dx0;
+	}
 	else{
 	    div_dx = dx / 8 -1;
 	    mod_dx1 = -dx % 8;
 	    mod_dx0 = 8-mod_dx1;
+	}
 	for( i = MAX(0, dy) ; i<ht ; i++ ){
 	    int prev_jj,jj;
-	    if( bitmap->rows <= i-dy ) break;
+	    if( bitmap->rows <= (unsigned) (i-dy) ) break;
 	    current_buffer=(unsigned char *)(bitmap->buffer+bitmap->pitch*(i-dy));
 	    current_raster=(unsigned char *)(raster+i*bpr);
 	    j       = MAX(0,div_dx);
 	    jj      = j-div_dx;
 	    prev_jj = jj-1;
 	    if( j<bpr ){
 		if( 0 <= prev_jj && prev_jj < bitmap->pitch )
 		    current_raster[j]|=current_buffer[prev_jj]<<mod_dx1;
 		if( 0 <= jj && jj < bitmap->pitch ){
 		    current_raster[j]|=current_buffer[jj]>>mod_dx0;
 		    j++; prev_jj++; jj++;
 		    for( ; j<bpr ; j++,prev_jj++,jj++ ){
 			current_raster[j]|=current_buffer[prev_jj]<<mod_dx1;
 @@ -2051,58 +2051,58 @@ restrict_code_range_by_str(int count,uns
 			   char const *str)
+{
     int nRanges = 0;
     int result = 0;
     fsRange *ranges = NULL, *oldRanges;
     char const *p, *q;
     p = q = str;
     for (;;) {
         int minpoint=0, maxpoint=65535;
         long val;
         /* skip comma and/or space */
-        while (',' == *p || isspace(*p))
+        while (',' == *p || isspace((unsigned char)*p))
             p++;
         /* begin point */
         if ('-' != *p) {
             val = strtol(p, (char **)&q, 0);
             if (p == q)
                 /* end or illegal */
                 break;
             if (val<0 || val>65535) {
                 /* out of zone */
                 break;
+            }
             minpoint = val;
             p=q;
+        }
         /* skip space */
-        while (isspace(*p))
+        while (isspace((unsigned char)*p))
             p++;
         if (',' != *p && '\0' != *p) {
             /* contiune */
             if ('-' == *p)
                 /* hyphon */
                 p++;
             else
                 /* end or illegal */
                 break;
             /* skip space */
-            while (isspace(*p))
+            while (isspace((unsigned char)*p))
                 p++;
             val = strtol(p, (char **)&q, 0);
             if (p != q) {
                 if (val<0 || val>65535)
                     break;
                 maxpoint = val;
             } else if (',' != *p && '\0' != *p)
                 /* end or illegal */
                 break;
             p=q;
         } else
             /* comma - single code */
 @@ -2975,33 +2975,33 @@ ft_compute_bounds(FTFontPtr font, FontIn
               num_chars += num_cols;
               swidth += ABS(tmpchar->characterWidth)*num_cols;
               total_width += tmpchar->characterWidth*num_cols;
               continue;
+            }
+          }
           else skip_ok=0;
+        }
+      }
       for (col = pinfo->firstCol; col <= pinfo->lastCol; col++) {
           c = row<<8|col;
           flags=0;
           if ( !force_c_outside ) {
-              if ( c <= instance->ttcap.forceConstantSpacingEnd
+	      if ( (signed) c <= instance->ttcap.forceConstantSpacingEnd
-		   && instance->ttcap.forceConstantSpacingBegin <= c )
+		   && instance->ttcap.forceConstantSpacingBegin <= (signed) c )
                   flags|=FT_FORCE_CONSTANT_SPACING;
+          }
           else {        /* for GB18030 proportional */
-              if ( c <= instance->ttcap.forceConstantSpacingEnd
+              if ( (signed) c <= instance->ttcap.forceConstantSpacingEnd
-		   || instance->ttcap.forceConstantSpacingBegin <= c )
+		   || instance->ttcap.forceConstantSpacingBegin <= (signed) c )
                   flags|=FT_FORCE_CONSTANT_SPACING;
+          }
 #if 0
           fprintf(stderr, "comp_bounds: %x ->", c);
 #endif
           if ( skip_ok == 0 || flags == 0 ){
               tmpchar=NULL;
 #if 0
               fprintf(stderr, "%x\n", c);
 #endif
 	      if( FreeTypeFontGetGlyphMetrics(c, flags, &tmpchar, font) != Successful )
 		  continue;
+          }

 @@ -288,27 +288,27 @@ bdfReadCharacters(FontFilePtr file, Font
     bitmapFont->metrics = NULL;
     ndx = 0;
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
     if ((!line) || (sscanf((char *) line, "CHARS %d", &nchars) != 1)) {
 	bdfError("bad 'CHARS' in bdf file\n");
 	return (FALSE);
+    }
     if (nchars < 1) {
 	bdfError("invalid number of CHARS in BDF file\n");
 	return (FALSE);
+    }
-    if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
+    if (nchars > (signed) (INT32_MAX / sizeof(CharInfoRec))) {
 	bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
 		 (int) sizeof(CharInfoRec));
 	goto BAILOUT;
+    }
     ci = calloc(nchars, sizeof(CharInfoRec));
     if (!ci) {
 	bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
 		 (int) sizeof(CharInfoRec));
 	goto BAILOUT;
+    }
     bitmapFont->metrics = ci;
     if (bitmapExtra) {
 @@ -416,27 +416,27 @@ bdfReadCharacters(FontFilePtr file, Font
 /* 5/31/89 (ef) -- we should be able to ditch the character and recover */
 /*		from all of these.					*/
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if ((!line) || (sscanf((char *) line, "DWIDTH %d %d", &wx, &wy) != 2)) {
 	    bdfError("bad 'DWIDTH'\n");
 	    goto BAILOUT;
+	}
 	if (wy != 0) {
 	    bdfError("DWIDTH y value must be zero\n");
 	    goto BAILOUT;
+	}
 	/* xCharInfo metrics are stored as INT16 */
-	if ((wx < 0) || (wx > INT16_MAX)) {
+	if ((wx < INT16_MIN) || (wx > INT16_MAX)) {
 	    bdfError("character '%s' has out of range width, %d\n",
 		     charName, wx);
 	    goto BAILOUT;
+	}
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if ((!line) || (sscanf((char *) line, "BBX %d %d %d %d", &bw, &bh, &bl, &bb) != 4)) {
 	    bdfError("bad 'BBX'\n");
 	    goto BAILOUT;
+	}
 	if ((bh < 0) || (bw < 0)) {
 	    bdfError("character '%s' has a negative sized bitmap, %dx%d\n",
 		     charName, bw, bh);
 	    goto BAILOUT;
 @@ -621,27 +621,27 @@ bdfReadProperties(FontFilePtr file, Font
                 secondbuf[BDFLINELEN],
                 thirdbuf[BDFLINELEN];
     unsigned char *line;
     unsigned char        lineBuf[BDFLINELEN];
     BitmapFontPtr  bitmapFont = (BitmapFontPtr) pFont->fontPrivate;
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
     if (!line || !bdfIsPrefix(line, "STARTPROPERTIES")) {
 	bdfError("missing 'STARTPROPERTIES'\n");
 	return (FALSE);
+    }
     if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) ||
 	(nProps <= 0) ||
-	(nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
+	(nProps > (signed) ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
 	bdfError("bad 'STARTPROPERTIES'\n");
 	return (FALSE);
+    }
     pFont->info.isStringProp = NULL;
     pFont->info.props = NULL;
     pFont->info.nprops = 0;
     stringProps = malloc((nProps + BDF_GENPROPS) * sizeof(char));
     pFont->info.isStringProp = stringProps;
     if (stringProps == NULL) {
 	bdfError("Couldn't allocate stringProps (%d*%d)\n",
 		 (nProps + BDF_GENPROPS), (int) sizeof(Bool));
 	goto BAILOUT;

 @@ -621,28 +621,28 @@ fs_get_reply (FSFpePtr conn, int *error)
 	return 0;
+    }
     rep = (fsGenericReply *) buf;
     /*
      * Refuse to accept replies longer than a maximum reasonable length,
      * before we pass to _fs_start_read, since it will try to resize the
      * incoming connection buffer to this size.  Also avoids integer overflow
      * on 32-bit systems.
      */
     if (rep->length > MAX_REPLY_LENGTH)
+    {
-	ErrorF("fserve: reply length %d > MAX_REPLY_LENGTH, disconnecting"
+	ErrorF("fserve: reply length %ld > MAX_REPLY_LENGTH, disconnecting"
-	       " from font server\n", rep->length);
+	       " from font server\n", (long)rep->length);
 	_fs_connection_died (conn);
 	*error = FSIO_ERROR;
 	return 0;
+    }
     ret = _fs_start_read (conn, rep->length << 2, &buf);
     if (ret != FSIO_READY)
+    {
 	*error = FSIO_BLOCK;
 	return 0;
+    }
     *error = FSIO_READY;
 @@ -2840,34 +2840,32 @@ _fs_client_access (FSFpePtr conn, pointe
 	    freeac.id = cur->acid;
 	    freeac.length = sizeof (fsFreeACReq) >> 2;
 	    _fs_add_req_log(conn, FS_FreeAC);
 	    _fs_write (conn, (char *) &freeac, sizeof (fsFreeACReq));
+	}
 	crac.reqType = FS_CreateAC;
 	crac.num_auths = set_font_authorizations(&authorizations, &authlen,
 						 client);
 	/* Work around bug in xfs versions up through modular release 1.0.8
 	   which rejects CreateAC packets with num_auths = 0 & authlen < 4 */
 	if (crac.num_auths == 0) {
 	    authorizations = padding;
 	    authlen = 4;
 	} else {
 	    authlen = (authlen + 3) & ~0x3;
+	}
 	crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
 	crac.acid = cur->acid;
 	_fs_add_req_log(conn, FS_CreateAC);
 	_fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
-	_fs_write(conn, authorizations, authlen);
+	_fs_write_pad(conn, authorizations, authlen);
 	/* ignore reply; we don't even care about it */
 	conn->curacid = 0;
 	cur->auth_generation = client_auth_generation(client);
+    }
     if (conn->curacid != cur->acid)
+    {
     	setac.reqType = FS_SetAuthorization;
 	setac.pad = 0;
     	setac.length = sizeof (fsSetAuthorizationReq) >> 2;
     	setac.id = cur->acid;
     	_fs_add_req_log(conn, FS_SetAuthorization);
     	_fs_write(conn, (char *) &setac, sizeof (fsSetAuthorizationReq));
 	conn->curacid = cur->acid;

 @@ -65,45 +65,45 @@
    */
 #undef LT_OBJDIR
 /* Name of package */
 #define PACKAGE "libXfont"
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libXfont"
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libXfont 1.5.1"
+#define PACKAGE_STRING "libXfont 1.5.2"
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libXfont"
 /* Define to the home page for this package. */
 #undef PACKAGE_URL
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.1"
+#define PACKAGE_VERSION "1.5.2"
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 /* Minor version of this package */
 #define PACKAGE_VERSION_MINOR 5
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 1
+#define PACKAGE_VERSION_PATCHLEVEL 2
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 /* Support TCP socket connections */
 #define TCPCONN 1
 /* Support UNIX socket connections */
 #define UNIXCONN 1
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 @@ -117,27 +117,27 @@
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
 #endif
 /* Version number of package */
-#define VERSION "1.5.1"
+#define VERSION "1.5.2"
 /* Support bdf format bitmap font files */
 #define XFONT_BDFFORMAT 1
 /* Support bitmap font files */
 #define XFONT_BITMAP 1
 /* Support built-in fonts */
 #define XFONT_BUILTINS 1
 /* Support the X Font Services Protocol */
 #define XFONT_FC 1

 @@ -477,27 +477,26 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     if (!offsets) {
 	pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n",
 		 nbitmaps, (int) sizeof(CARD32));
 	goto Bail;
+    }
     for (i = 0; i < nbitmaps; i++) {
 	offsets[i] = pcfGetINT32(file, format);
 	if (IS_EOF(file)) goto Bail;
+    }
     for (i = 0; i < GLYPHPADOPTIONS; i++) {
 	bitmapSizes[i] = pcfGetINT32(file, format);
 	if (IS_EOF(file)) goto Bail;
 	if (bitmapSizes[i] < 0) goto Bail;
+    }
     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
     /* guard against completely empty font */
     bitmaps = malloc(sizebitmaps ? sizebitmaps : 1);
     if (!bitmaps) {
       pcfError("pcfReadFont(): Couldn't allocate bitmaps (%d)\n", sizebitmaps ? sizebitmaps : 1);
 	goto Bail;
+    }
     FontFileRead(file, bitmaps, sizebitmaps);
     if (IS_EOF(file)) goto Bail;
     position += sizebitmaps;