From 50986a34f231fbc7a4b62466bd89bd4ae4027d2e Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Thu, 25 Nov 2004 21:19:11 +0000 Subject: Fixes for CAN-2004-0914 (Thomas Biege). --- src/Attrib.c | 14 +++++---- src/CrBufFrI.c | 96 +++++++++++++++++++++++++++++++++++++++++++--------------- src/CrDatFrI.c | 94 +++++++++++++++++++++++++++++++++++++++++++++----------- src/RdFToBuf.c | 7 +++-- src/RdFToI.c | 36 ++++++++++++++-------- src/WrFFrBuf.c | 4 ++- src/WrFFrI.c | 36 ++++++++++++++++------ src/XpmI.h | 2 ++ src/create.c | 92 ++++++++++++++++++++++++++++++++++++++----------------- src/data.c | 11 ++++--- src/hashtab.c | 6 ++-- src/misc.c | 2 +- src/parse.c | 70 ++++++++++++++++++++++++------------------ src/scan.c | 38 ++++++++++++----------- 14 files changed, 352 insertions(+), 156 deletions(-) diff --git a/src/Attrib.c b/src/Attrib.c index cf7081c..028c2cb 100644 --- a/src/Attrib.c +++ b/src/Attrib.c @@ -32,13 +32,15 @@ * Developed by Arnaud Le Hors * \*****************************************************************************/ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" /* 3.2 backward compatibility code */ LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, XpmColor ***oldct)); -LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); +LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, unsigned int ncolors)); /* * Create a colortable compatible with the old style colortable @@ -50,9 +52,9 @@ CreateOldColorTable(ct, ncolors, oldct) XpmColor ***oldct; { XpmColor **colorTable, **color; - int a; + unsigned int a; - if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) + if (ncolors >= UINT_MAX / sizeof(XpmColor *)) return XpmNoMemory; colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); @@ -69,9 +71,9 @@ CreateOldColorTable(ct, ncolors, oldct) static void FreeOldColorTable(colorTable, ncolors) XpmColor **colorTable; - int ncolors; + unsigned int ncolors; { - int a, b; + unsigned int a, b; XpmColor **color; char **sptr; @@ -122,7 +124,7 @@ XpmFreeExtensions(extensions, nextensions) XpmExtension *ext; char **sptr; - if (extensions) { + if (extensions && nextensions > 0) { for (i = 0, ext = extensions; i < nextensions; i++, ext++) { if (ext->name) XpmFree(ext->name); diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c index 9d8545f..66b2f45 100644 --- a/src/CrBufFrI.c +++ b/src/CrBufFrI.c @@ -31,6 +31,9 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ + +/* October 2004, source code review by Thomas Biege */ + /* $XFree86$ */ #include "XpmI.h" @@ -39,15 +42,17 @@ LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size, unsigned int *used_size, XpmColor *colors, unsigned int ncolors, unsigned int cpp)); -LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, +LFUNC(WritePixels, void, (char *dataptr, unsigned int data_size, + unsigned int *used_size, unsigned int width, unsigned int height, unsigned int cpp, unsigned int *pixels, XpmColor *colors)); -LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, +LFUNC(WriteExtensions, void, (char *dataptr, unsigned int data_size, + unsigned int *used_size, XpmExtension *ext, unsigned int num)); -LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); +LFUNC(ExtensionsSize, unsigned int, (XpmExtension *ext, unsigned int num)); LFUNC(CommentsSize, int, (XpmInfo *info)); int @@ -90,10 +95,11 @@ XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes) #undef RETURN #define RETURN(status) \ +do \ { \ ErrorStatus = status; \ goto error; \ -} +}while(0) int XpmCreateBufferFromXpmImage(buffer_return, image, info) @@ -107,7 +113,7 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) unsigned int cmts, extensions, ext_size = 0; unsigned int l, cmt_size = 0; char *ptr = NULL, *p; - unsigned int ptr_size, used_size; + unsigned int ptr_size, used_size, tmp; *buffer_return = NULL; @@ -129,7 +135,13 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) #ifdef VOID_SPRINTF used_size = strlen(buf); #endif - ptr_size = used_size + ext_size + cmt_size + 1; + ptr_size = used_size + ext_size + cmt_size + 1; /* ptr_size can't be 0 */ + if(ptr_size <= used_size || + ptr_size <= ext_size || + ptr_size <= cmt_size) + { + return XpmNoMemory; + } ptr = (char *) XpmMalloc(ptr_size); if (!ptr) return XpmNoMemory; @@ -140,7 +152,7 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) #ifndef VOID_SPRINTF used_size += #endif - sprintf(ptr + used_size, "/*%s*/\n", info->hints_cmt); + snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->hints_cmt); #ifdef VOID_SPRINTF used_size += strlen(info->hints_cmt) + 5; #endif @@ -158,7 +170,7 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) #ifndef VOID_SPRINTF l += #endif - sprintf(buf + l, " %d %d", info->x_hotspot, info->y_hotspot); + snprintf(buf + l, sizeof(buf)-l, " %d %d", info->x_hotspot, info->y_hotspot); #ifdef VOID_SPRINTF l = strlen(buf); #endif @@ -180,6 +192,8 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) l = strlen(buf); #endif ptr_size += l; + if(ptr_size <= l) + RETURN(XpmNoMemory); p = (char *) XpmRealloc(ptr, ptr_size); if (!p) RETURN(XpmNoMemory); @@ -192,7 +206,7 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) #ifndef VOID_SPRINTF used_size += #endif - sprintf(ptr + used_size, "/*%s*/\n", info->colors_cmt); + snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->colors_cmt); #ifdef VOID_SPRINTF used_size += strlen(info->colors_cmt) + 5; #endif @@ -208,7 +222,12 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) * 4 = 1 (for '"') + 3 (for '",\n') * 1 = - 2 (because the last line does not end with ',\n') + 3 (for '};\n') */ - ptr_size += image->height * (image->width * image->cpp + 4) + 1; + if(image->width > UINT_MAX / image->cpp || + (tmp = image->width * image->cpp + 4) <= 4 || + image->height > UINT_MAX / tmp || + (tmp = image->height * tmp + 1) <= 1 || + (ptr_size += tmp) <= tmp) + RETURN(XpmNoMemory); p = (char *) XpmRealloc(ptr, ptr_size); if (!p) @@ -220,17 +239,17 @@ XpmCreateBufferFromXpmImage(buffer_return, image, info) #ifndef VOID_SPRINTF used_size += #endif - sprintf(ptr + used_size, "/*%s*/\n", info->pixels_cmt); + snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->pixels_cmt); #ifdef VOID_SPRINTF used_size += strlen(info->pixels_cmt) + 5; #endif } - WritePixels(ptr + used_size, &used_size, image->width, image->height, + WritePixels(ptr + used_size, ptr_size - used_size, &used_size, image->width, image->height, image->cpp, image->data, image->colorTable); /* print extensions */ if (extensions) - WriteExtensions(ptr + used_size, &used_size, + WriteExtensions(ptr + used_size, ptr_size-used_size, &used_size, info->extensions, info->nextensions); /* close the array */ @@ -247,6 +266,7 @@ error: return (ErrorStatus); } + static int WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) char **dataptr; @@ -256,7 +276,7 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) unsigned int ncolors; unsigned int cpp; { - char buf[BUFSIZ]; + char buf[BUFSIZ] = {0}; unsigned int a, key, l; char *s, *s2; char **defaults; @@ -266,6 +286,8 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) defaults = (char **) colors; s = buf + 1; + if(cpp > (sizeof(buf) - (s-buf))) + return(XpmNoMemory); strncpy(s, *defaults++, cpp); s += cpp; @@ -274,14 +296,24 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) #ifndef VOID_SPRINTF s += #endif - sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); + /* assume C99 compliance */ + snprintf(s, sizeof(buf) - (s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); #ifdef VOID_SPRINTF s += strlen(s); #endif + /* now let's check if s points out-of-bounds */ + if((s-buf) > sizeof(buf)) + return(XpmNoMemory); } } + if(sizeof(buf) - (s-buf) < 4) + return(XpmNoMemory); strcpy(s, "\",\n"); l = s + 3 - buf; + if( *data_size >= UINT_MAX-l || + *data_size + l <= *used_size || + (*data_size + l - *used_size) <= sizeof(buf)) + return(XpmNoMemory); s = (char *) XpmRealloc(*dataptr, *data_size + l); if (!s) return (XpmNoMemory); @@ -294,8 +326,9 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) } static void -WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) +WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors) char *dataptr; + unsigned int data_size; unsigned int *used_size; unsigned int width; unsigned int height; @@ -306,27 +339,36 @@ WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) char *s = dataptr; unsigned int x, y, h; + if(height <= 1) + return; + h = height - 1; for (y = 0; y < h; y++) { *s++ = '"'; for (x = 0; x < width; x++, pixels++) { - strncpy(s, colors[*pixels].string, cpp); + if(cpp >= (data_size - (s-dataptr))) + return; + strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? :-\ */ s += cpp; } + if((data_size - (s-dataptr)) < 4) + return; strcpy(s, "\",\n"); s += 3; } /* duplicate some code to avoid a test in the loop */ *s++ = '"'; for (x = 0; x < width; x++, pixels++) { - strncpy(s, colors[*pixels].string, cpp); + if(cpp >= (data_size - (s-dataptr))) + return; + strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? */ s += cpp; } *s++ = '"'; *used_size += s - dataptr; } -static int +static unsigned int ExtensionsSize(ext, num) XpmExtension *ext; unsigned int num; @@ -335,21 +377,26 @@ ExtensionsSize(ext, num) char **line; size = 0; + if(num == 0) + return(0); /* ok? */ for (x = 0; x < num; x++, ext++) { /* 11 = 10 (for ',\n"XPMEXT ') + 1 (for '"') */ size += strlen(ext->name) + 11; - a = ext->nlines; + a = ext->nlines; /* how can we trust ext->nlines to be not out-of-bounds? */ for (y = 0, line = ext->lines; y < a; y++, line++) /* 4 = 3 (for ',\n"') + 1 (for '"') */ size += strlen(*line) + 4; } /* 13 is for ',\n"XPMENDEXT"' */ + if(size > UINT_MAX - 13) /* unlikely */ + return(0); return size + 13; } static void -WriteExtensions(dataptr, used_size, ext, num) +WriteExtensions(dataptr, data_size, used_size, ext, num) char *dataptr; + unsigned int data_size; unsigned int *used_size; XpmExtension *ext; unsigned int num; @@ -362,7 +409,7 @@ WriteExtensions(dataptr, used_size, ext, num) #ifndef VOID_SPRINTF s += #endif - sprintf(s, ",\n\"XPMEXT %s\"", ext->name); + snprintf(s, data_size - (s-dataptr), ",\n\"XPMEXT %s\"", ext->name); #ifdef VOID_SPRINTF s += strlen(ext->name) + 11; #endif @@ -371,13 +418,13 @@ WriteExtensions(dataptr, used_size, ext, num) #ifndef VOID_SPRINTF s += #endif - sprintf(s, ",\n\"%s\"", *line); + snprintf(s, data_size - (s-dataptr), ",\n\"%s\"", *line); #ifdef VOID_SPRINTF s += strlen(*line) + 4; #endif } } - strcpy(s, ",\n\"XPMENDEXT\""); + strncpy(s, ",\n\"XPMENDEXT\"", data_size - (s-dataptr)-1); *used_size += s - dataptr + 13; } @@ -388,6 +435,7 @@ CommentsSize(info) int size = 0; /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ + /* wrap possible but *very* unlikely */ if (info->hints_cmt) size += 5 + strlen(info->hints_cmt); diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c index 8bec109..37e7f8c 100644 --- a/src/CrDatFrI.c +++ b/src/CrDatFrI.c @@ -33,13 +33,16 @@ \*****************************************************************************/ /* $XFree86$ */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size, XpmColor *colors, unsigned int ncolors, unsigned int cpp)); -LFUNC(CreatePixels, void, (char **dataptr, unsigned int width, +LFUNC(CreatePixels, void, (char **dataptr, unsigned int data_size, + unsigned int width, unsigned int height, unsigned int cpp, unsigned int *pixels, XpmColor *colors)); @@ -47,7 +50,8 @@ LFUNC(CountExtensions, void, (XpmExtension *ext, unsigned int num, unsigned int *ext_size, unsigned int *ext_nlines)); -LFUNC(CreateExtensions, void, (char **dataptr, unsigned int offset, +LFUNC(CreateExtensions, void, (char **dataptr, unsigned int data_size, + unsigned int offset, XpmExtension *ext, unsigned int num, unsigned int ext_nlines)); @@ -88,10 +92,11 @@ XpmCreateDataFromImage(display, data_return, image, shapeimage, attributes) #undef RETURN #define RETURN(status) \ +do \ { \ ErrorStatus = status; \ goto exit; \ -} +} while(0) int XpmCreateDataFromXpmImage(data_return, image, info) @@ -122,11 +127,17 @@ XpmCreateDataFromXpmImage(data_return, image, info) * alloc a temporary array of char pointer for the header section which * is the hints line + the color table lines */ - header_nlines = 1 + image->ncolors; + header_nlines = 1 + image->ncolors; /* this may wrap and/or become 0 */ + + /* 2nd check superfluous if we do not need header_nlines any further */ + if(header_nlines <= image->ncolors || + header_nlines >= UINT_MAX / sizeof(char *)) + return(XpmNoMemory); + header_size = sizeof(char *) * header_nlines; - if (header_size >= SIZE_MAX / sizeof(char *)) + if (header_size >= UINT_MAX / sizeof(char *)) return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); + header = (char **) XpmCalloc(header_size, sizeof(char *)); /* can we trust image->ncolors */ if (!header) return (XpmNoMemory); @@ -170,8 +181,22 @@ XpmCreateDataFromXpmImage(data_return, image, info) /* now we know the size needed, alloc the data and copy the header lines */ offset = image->width * image->cpp + 1; - data_size = header_size + (image->height + ext_nlines) * sizeof(char *) - + image->height * offset + ext_size; + + if(offset <= image->width || offset <= image->cpp) + RETURN(XpmNoMemory); + + if( (image->height + ext_nlines) >= UINT_MAX / sizeof(char *)) + RETURN(XpmNoMemory); + data_size = (image->height + ext_nlines) * sizeof(char *); + + if (image->height > UINT_MAX / offset || + image->height * offset > UINT_MAX - data_size) + RETURN(XpmNoMemory); + data_size += image->height * offset; + + if( (header_size + ext_size) >= (UINT_MAX - data_size) ) + RETURN(XpmNoMemory); + data_size += header_size + ext_size; data = (char **) XpmMalloc(data_size); if (!data) @@ -179,8 +204,10 @@ XpmCreateDataFromXpmImage(data_return, image, info) data_nlines = header_nlines + image->height + ext_nlines; *data = (char *) (data + data_nlines); + + /* can header have less elements then n suggests? */ n = image->ncolors; - for (l = 0, sptr = data, sptr2 = header; l <= n; l++, sptr++, sptr2++) { + for (l = 0, sptr = data, sptr2 = header; l <= n && sptr && sptr2; l++, sptr++, sptr2++) { strcpy(*sptr, *sptr2); *(sptr + 1) = *sptr + strlen(*sptr2) + 1; } @@ -189,12 +216,13 @@ XpmCreateDataFromXpmImage(data_return, image, info) data[header_nlines] = (char *) data + header_size + (image->height + ext_nlines) * sizeof(char *); - CreatePixels(data + header_nlines, image->width, image->height, + CreatePixels(data + header_nlines, data_size-header_nlines, image->width, image->height, image->cpp, image->data, image->colorTable); /* print extensions */ if (extensions) - CreateExtensions(data + header_nlines + image->height - 1, offset, + CreateExtensions(data + header_nlines + image->height - 1, + data_size - header_nlines - image->height + 1, offset, info->extensions, info->nextensions, ext_nlines); @@ -225,23 +253,34 @@ CreateColors(dataptr, data_size, colors, ncolors, cpp) char *s, *s2; char **defaults; + /* can ncolors be trusted here? */ for (a = 0; a < ncolors; a++, colors++, dataptr++) { defaults = (char **) colors; + if(sizeof(buf) <= cpp) + return(XpmNoMemory); strncpy(buf, *defaults++, cpp); s = buf + cpp; + if(sizeof(buf) <= (s-buf)) + return XpmNoMemory; + for (key = 1; key <= NKEYS; key++, defaults++) { if ((s2 = *defaults)) { #ifndef VOID_SPRINTF s += #endif - sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); + /* assume C99 compliance */ + snprintf(s, sizeof(buf)-(s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); #ifdef VOID_SPRINTF s += strlen(s); #endif + /* does s point out-of-bounds? */ + if(sizeof(buf) < (s-buf)) + return XpmNoMemory; } } + /* what about using strdup()? */ l = s - buf + 1; s = (char *) XpmMalloc(l); if (!s) @@ -253,8 +292,9 @@ CreateColors(dataptr, data_size, colors, ncolors, cpp) } static void -CreatePixels(dataptr, width, height, cpp, pixels, colors) +CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors) char **dataptr; + unsigned int data_size; unsigned int width; unsigned int height; unsigned int cpp; @@ -264,21 +304,38 @@ CreatePixels(dataptr, width, height, cpp, pixels, colors) char *s; unsigned int x, y, h, offset; + if(height <= 1) + return; + h = height - 1; + offset = width * cpp + 1; + + if(offset <= width || offset <= cpp) + return; + + /* why trust h? */ for (y = 0; y < h; y++, dataptr++) { s = *dataptr; + /* why trust width? */ for (x = 0; x < width; x++, pixels++) { - strncpy(s, colors[*pixels].string, cpp); + if(cpp > (data_size - (s - *dataptr))) + return; + strncpy(s, colors[*pixels].string, cpp); /* why trust pixel? */ s += cpp; } *s = '\0'; + if(offset > data_size) + return; *(dataptr + 1) = *dataptr + offset; } /* duplicate some code to avoid a test in the loop */ s = *dataptr; + /* why trust width? */ for (x = 0; x < width; x++, pixels++) { - strncpy(s, colors[*pixels].string, cpp); + if(cpp > data_size - (s - *dataptr)) + return; + strncpy(s, colors[*pixels].string, cpp); /* why should we trust *pixel? */ s += cpp; } *s = '\0'; @@ -311,8 +368,9 @@ CountExtensions(ext, num, ext_size, ext_nlines) } static void -CreateExtensions(dataptr, offset, ext, num, ext_nlines) +CreateExtensions(dataptr, data_size, offset, ext, num, ext_nlines) char **dataptr; + unsigned int data_size; unsigned int offset; XpmExtension *ext; unsigned int num; @@ -325,12 +383,12 @@ CreateExtensions(dataptr, offset, ext, num, ext_nlines) dataptr++; a = 0; for (x = 0; x < num; x++, ext++) { - sprintf(*dataptr, "XPMEXT %s", ext->name); + snprintf(*dataptr, data_size, "XPMEXT %s", ext->name); a++; if (a < ext_nlines) *(dataptr + 1) = *dataptr + strlen(ext->name) + 8; dataptr++; - b = ext->nlines; + b = ext->nlines; /* can we trust these values? */ for (y = 0, line = ext->lines; y < b; y++, line++) { strcpy(*dataptr, *line); a++; diff --git a/src/RdFToBuf.c b/src/RdFToBuf.c index 898a9fc..f6ad75d 100644 --- a/src/RdFToBuf.c +++ b/src/RdFToBuf.c @@ -37,6 +37,8 @@ * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #include #if !defined(FOR_MSW) && !defined(WIN32) @@ -58,7 +60,8 @@ XpmReadFileToBuffer(filename, buffer_return) char *filename; char **buffer_return; { - int fd, fcheck, len; + int fd, fcheck; + off_t len; char *ptr; struct stat stats; FILE *fp; @@ -82,7 +85,7 @@ XpmReadFileToBuffer(filename, buffer_return) close(fd); return XpmOpenFailed; } - len = (int) stats.st_size; + len = stats.st_size; ptr = (char *) XpmMalloc(len + 1); if (!ptr) { fclose(fp); diff --git a/src/RdFToI.c b/src/RdFToI.c index d1242c4..3450263 100644 --- a/src/RdFToI.c +++ b/src/RdFToI.c @@ -33,6 +33,8 @@ \*****************************************************************************/ /* $XFree86$ */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #include #if !defined(NO_ZPIPE) && defined(WIN32) @@ -123,6 +125,12 @@ XpmReadFileToXpmImage(filename, image, info) /* * open the given file to be read as an xpmData which is returned. */ +#ifndef NO_ZPIPE + FILE *s_popen(char *cmd, const char *type); +#else +# define s_popen popen +#endif + static int OpenReadFile(filename, mdata) char *filename; @@ -141,17 +149,21 @@ OpenReadFile(filename, mdata) mdata->type = XPMFILE; } else { #ifndef NO_ZPIPE - int len = strlen(filename); + size_t len = strlen(filename); + + if(len == 0 || + filename[len-1] == '/') + return(XpmOpenFailed); if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { mdata->type = XPMPIPE; - sprintf(buf, "uncompress -c \"%s\"", filename); - if (!(mdata->stream.file = popen(buf, "r"))) + snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", filename); + if (!(mdata->stream.file = s_popen(buf, "r"))) return (XpmOpenFailed); } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { mdata->type = XPMPIPE; - sprintf(buf, "gunzip -qc \"%s\"", filename); - if (!(mdata->stream.file = popen(buf, "r"))) + snprintf(buf, sizeof(buf), "gunzip -qc \"%s\"", filename); + if (!(mdata->stream.file = s_popen(buf, "r"))) return (XpmOpenFailed); } else { @@ -159,19 +171,19 @@ OpenReadFile(filename, mdata) if (!(compressfile = (char *) XpmMalloc(len + 4))) return (XpmNoMemory); - sprintf(compressfile, "%s.Z", filename); + snprintf(compressfile, len+4, "%s.Z", filename); if (!stat(compressfile, &status)) { - sprintf(buf, "uncompress -c \"%s\"", compressfile); - if (!(mdata->stream.file = popen(buf, "r"))) { + snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", compressfile); + if (!(mdata->stream.file = s_popen(buf, "r"))) { XpmFree(compressfile); return (XpmOpenFailed); } mdata->type = XPMPIPE; } else { - sprintf(compressfile, "%s.gz", filename); + snprintf(compressfile, len+4, "%s.gz", filename); if (!stat(compressfile, &status)) { - sprintf(buf, "gunzip -c \"%s\"", compressfile); - if (!(mdata->stream.file = popen(buf, "r"))) { + snprintf(buf, sizeof(buf), "gunzip -c \"%s\"", compressfile); + if (!(mdata->stream.file = s_popen(buf, "r"))) { XpmFree(compressfile); return (XpmOpenFailed); } @@ -217,7 +229,7 @@ xpmDataClose(mdata) break; #ifndef NO_ZPIPE case XPMPIPE: - pclose(mdata->stream.file); + fclose(mdata->stream.file); break; #endif } diff --git a/src/WrFFrBuf.c b/src/WrFFrBuf.c index 3ed6685..a206b5c 100644 --- a/src/WrFFrBuf.c +++ b/src/WrFFrBuf.c @@ -32,6 +32,8 @@ * Developed by Arnaud Le Hors * \*****************************************************************************/ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" int @@ -49,7 +51,7 @@ XpmWriteFileFromBuffer(filename, buffer) fcheck = fwrite(buffer, len, 1, fp); fclose(fp); if (fcheck != 1) - return XpmOpenFailed; + return XpmOpenFailed; /* maybe use a better return value */ return XpmSuccess; } diff --git a/src/WrFFrI.c b/src/WrFFrI.c index 5ef5814..e5c9b4b 100644 --- a/src/WrFFrI.c +++ b/src/WrFFrI.c @@ -38,6 +38,8 @@ * Lorens Younes (d93-hyo@nada.kth.se) 4/96 */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #if !defined(NO_ZPIPE) && defined(WIN32) # define popen _popen @@ -98,7 +100,7 @@ XpmWriteFileFromXpmImage(filename, image, info) XpmInfo *info; { xpmData mdata; - char *name, *dot, *s, new_name[BUFSIZ]; + char *name, *dot, *s, new_name[BUFSIZ] = {0}; int ErrorStatus; /* open file to write */ @@ -121,7 +123,8 @@ XpmWriteFileFromXpmImage(filename, image, info) #endif /* let's try to make a valid C syntax name */ if (index(name, '.')) { - strcpy(new_name, name); + strncpy(new_name, name, sizeof(new_name)); + new_name[sizeof(new_name)-1] = 0; /* change '.' to '_' */ name = s = new_name; while ((dot = index(s, '.'))) { @@ -131,7 +134,8 @@ XpmWriteFileFromXpmImage(filename, image, info) } if (index(name, '-')) { if (name != new_name) { - strcpy(new_name, name); + strncpy(new_name, name, sizeof(new_name)); + new_name[sizeof(new_name)-1] = 0; name = new_name; } /* change '-' to '_' */ @@ -248,7 +252,7 @@ WritePixels(file, width, height, cpp, pixels, colors) unsigned int x, y, h; h = height - 1; - if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) + if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) return XpmNoMemory; p = buf = (char *) XpmMalloc(width * cpp + 3); if (!buf) @@ -300,6 +304,11 @@ WriteExtensions(file, ext, num) /* * open the given file to be written as an xpmData which is returned */ +#ifndef NO_ZPIPE + FILE *s_popen(char *cmd, const char *type); +#else +# define s_popen popen +#endif static int OpenWriteFile(filename, mdata) char *filename; @@ -315,16 +324,23 @@ OpenWriteFile(filename, mdata) mdata->type = XPMFILE; } else { #ifndef NO_ZPIPE - int len = strlen(filename); + size_t len = strlen(filename); + + if(len == 0 || + filename[0] == '/' || + strstr(filename, "../") != NULL || + filename[len-1] == '/') + return(XpmOpenFailed); + if (len > 2 && !strcmp(".Z", filename + (len - 2))) { - sprintf(buf, "compress > \"%s\"", filename); - if (!(mdata->stream.file = popen(buf, "w"))) + snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); + if (!(mdata->stream.file = s_popen(buf, "w"))) return (XpmOpenFailed); mdata->type = XPMPIPE; } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { - sprintf(buf, "gzip -q > \"%s\"", filename); - if (!(mdata->stream.file = popen(buf, "w"))) + snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); + if (!(mdata->stream.file = s_popen(buf, "w"))) return (XpmOpenFailed); mdata->type = XPMPIPE; @@ -355,7 +371,7 @@ xpmDataClose(mdata) break; #ifndef NO_ZPIPE case XPMPIPE: - pclose(mdata->stream.file); + fclose(mdata->stream.file); break; #endif } diff --git a/src/XpmI.h b/src/XpmI.h index 5c5b900..70844ac 100644 --- a/src/XpmI.h +++ b/src/XpmI.h @@ -49,8 +49,10 @@ * lets try to solve include files */ +#include #include #include +#include /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ #ifdef sequent extern FILE *popen(); diff --git a/src/create.c b/src/create.c index 8710c18..a1e274d 100644 --- a/src/create.c +++ b/src/create.c @@ -45,6 +45,8 @@ * Lorens Younes (d93-hyo@nada.kth.se) 4/96 */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #include @@ -586,7 +588,7 @@ CreateColors(display, attributes, colors, ncolors, image_pixels, mask_pixels, */ } else { #endif - int i; + unsigned int i; #ifndef AMIGA ncols = visual->map_entries; @@ -746,12 +748,14 @@ FreeColors(display, colormap, pixels, n, closure) /* function call in case of error */ + #undef RETURN #define RETURN(status) \ +do \ { \ ErrorStatus = status; \ goto error; \ -} +} while(0) int XpmCreateImageFromXpmImage(display, image, @@ -817,7 +821,7 @@ XpmCreateImageFromXpmImage(display, image, ErrorStatus = XpmSuccess; - if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) + if (image->ncolors >= UINT_MAX / sizeof(Pixel)) return (XpmNoMemory); /* malloc pixels index tables */ @@ -992,9 +996,13 @@ CreateXImage(display, visual, depth, format, width, height, image_return) return (XpmNoMemory); #if !defined(FOR_MSW) && !defined(AMIGA) - if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) + if (height != 0 && (*image_return)->bytes_per_line >= INT_MAX / height) { + XDestroyImage(*image_return); return XpmNoMemory; + } /* now that bytes_per_line must have been set properly alloc data */ + if((*image_return)->bytes_per_line == 0 || height == 0) + return XpmNoMemory; (*image_return)->data = (char *) XpmMalloc((*image_return)->bytes_per_line * height); @@ -1023,7 +1031,7 @@ CreateXImage(display, visual, depth, format, width, height, image_return) LFUNC(_putbits, void, (register char *src, int dstoffset, register int numbits, register char *dst)); -LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register int nb)); +LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register unsigned int nb)); static unsigned char Const _reverse_byte[0x100] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, @@ -1063,12 +1071,12 @@ static unsigned char Const _reverse_byte[0x100] = { static int _XReverse_Bytes(bpt, nb) register unsigned char *bpt; - register int nb; + register unsigned int nb; { do { *bpt = _reverse_byte[*bpt]; bpt++; - } while (--nb > 0); + } while (--nb > 0); /* is nb user-controled? */ return 0; } @@ -1207,7 +1215,7 @@ PutImagePixels(image, width, height, pixelindex, pixels) register char *src; register char *dst; register unsigned int *iptr; - register int x, y, i; + register unsigned int x, y, i; register char *data; Pixel pixel, px; int nbytes, depth, ibu, ibpp; @@ -1217,8 +1225,8 @@ PutImagePixels(image, width, height, pixelindex, pixels) depth = image->depth; if (depth == 1) { ibu = image->bitmap_unit; - for (y = 0; y < height; y++) - for (x = 0; x < width; x++, iptr++) { + for (y = 0; y < height; y++) /* how can we trust height */ + for (x = 0; x < width; x++, iptr++) { /* how can we trust width */ pixel = pixels[*iptr]; for (i = 0, px = pixel; i < sizeof(unsigned long); i++, px >>= 8) @@ -1293,12 +1301,12 @@ PutImagePixels32(image, width, height, pixelindex, pixels) { unsigned char *data; unsigned int *iptr; - int y; + unsigned int y; Pixel pixel; #ifdef WITHOUT_SPEEDUPS - int x; + unsigned int x; unsigned char *addr; data = (unsigned char *) image->data; @@ -1335,7 +1343,7 @@ PutImagePixels32(image, width, height, pixelindex, pixels) #else /* WITHOUT_SPEEDUPS */ - int bpl = image->bytes_per_line; + unsigned int bpl = image->bytes_per_line; unsigned char *data_ptr, *max_data; data = (unsigned char *) image->data; @@ -1403,11 +1411,11 @@ PutImagePixels16(image, width, height, pixelindex, pixels) { unsigned char *data; unsigned int *iptr; - int y; + unsigned int y; #ifdef WITHOUT_SPEEDUPS - int x; + unsigned int x; unsigned char *addr; data = (unsigned char *) image->data; @@ -1431,7 +1439,7 @@ PutImagePixels16(image, width, height, pixelindex, pixels) Pixel pixel; - int bpl = image->bytes_per_line; + unsigned int bpl = image->bytes_per_line; unsigned char *data_ptr, *max_data; data = (unsigned char *) image->data; @@ -1484,11 +1492,11 @@ PutImagePixels8(image, width, height, pixelindex, pixels) { char *data; unsigned int *iptr; - int y; + unsigned int y; #ifdef WITHOUT_SPEEDUPS - int x; + unsigned int x; data = image->data; iptr = pixelindex; @@ -1498,7 +1506,7 @@ PutImagePixels8(image, width, height, pixelindex, pixels) #else /* WITHOUT_SPEEDUPS */ - int bpl = image->bytes_per_line; + unsigned int bpl = image->bytes_per_line; char *data_ptr, *max_data; data = image->data; @@ -1533,12 +1541,12 @@ PutImagePixels1(image, width, height, pixelindex, pixels) PutImagePixels(image, width, height, pixelindex, pixels); else { unsigned int *iptr; - int y; + unsigned int y; char *data; #ifdef WITHOUT_SPEEDUPS - int x; + unsigned int x; data = image->data; iptr = pixelindex; @@ -1761,6 +1769,9 @@ PutPixel1(ximage, x, y, pixel) Pixel px; int nbytes; + if(x < 0 || y < 0) + return 0; + for (i=0, px=pixel; i>=8) ((unsigned char *)&pixel)[i] = px; src = &ximage->data[XYINDEX(x, y, ximage)]; @@ -1791,7 +1802,10 @@ PutPixel(ximage, x, y, pixel) register char *dst; register int i; Pixel px; - int nbytes, ibpp; + unsigned int nbytes, ibpp; + + if(x < 0 || y < 0) + return 0; ibpp = ximage->bits_per_pixel; if (ximage->depth == 4) @@ -1825,6 +1839,9 @@ PutPixel32(ximage, x, y, pixel) { unsigned char *addr; + if(x < 0 || y < 0) + return 0; + addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; *((unsigned long *)addr) = pixel; return 1; @@ -1840,6 +1857,9 @@ PutPixel32MSB(ximage, x, y, pixel) { unsigned char *addr; + if(x < 0 || y < 0) + return 0; + addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; addr[0] = pixel >> 24; addr[1] = pixel >> 16; @@ -1857,6 +1877,9 @@ PutPixel32LSB(ximage, x, y, pixel) { unsigned char *addr; + if(x < 0 || y < 0) + return 0; + addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; addr[3] = pixel >> 24; addr[2] = pixel >> 16; @@ -1874,6 +1897,9 @@ PutPixel16MSB(ximage, x, y, pixel) { unsigned char *addr; + if(x < 0 || y < 0) + return 0; + addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; addr[0] = pixel >> 8; addr[1] = pixel; @@ -1889,6 +1915,9 @@ PutPixel16LSB(ximage, x, y, pixel) { unsigned char *addr; + if(x < 0 || y < 0) + return 0; + addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; addr[1] = pixel >> 8; addr[0] = pixel; @@ -1902,6 +1931,9 @@ PutPixel8(ximage, x, y, pixel) int y; unsigned long pixel; { + if(x < 0 || y < 0) + return 0; + ximage->data[ZINDEX8(x, y, ximage)] = pixel; return 1; } @@ -1913,6 +1945,9 @@ PutPixel1MSB(ximage, x, y, pixel) int y; unsigned long pixel; { + if(x < 0 || y < 0) + return 0; + if (pixel & 1) ximage->data[ZINDEX1(x, y, ximage)] |= 0x80 >> (x & 7); else @@ -1927,6 +1962,9 @@ PutPixel1LSB(ximage, x, y, pixel) int y; unsigned long pixel; { + if(x < 0 || y < 0) + return 0; + if (pixel & 1) ximage->data[ZINDEX1(x, y, ximage)] |= 1 << (x & 7); else @@ -2061,8 +2099,8 @@ xpmParseDataAndCreate(display, data, image_return, shapeimage_return, xpmGetCmt(data, &colors_cmt); /* malloc pixels index tables */ - if (ncolors >= SIZE_MAX / sizeof(Pixel)) - return XpmNoMemory; + if (ncolors >= UINT_MAX / sizeof(Pixel)) + RETURN(XpmNoMemory); image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); if (!image_pixels) @@ -2174,7 +2212,7 @@ xpmParseDataAndCreate(display, data, image_return, shapeimage_return, * free the hastable */ if (ErrorStatus != XpmSuccess) - RETURN(ErrorStatus) + RETURN(ErrorStatus); else if (USE_HASHTABLE) xpmHashTableFree(&hashtable); @@ -2366,11 +2404,11 @@ if (cidx[f]) XpmFree(cidx[f]);} /* array of pointers malloced by need */ unsigned short *cidx[256]; - int char1; + unsigned int char1; bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ for (a = 0; a < ncolors; a++) { - char1 = colorTable[a].string[0]; + char1 = (unsigned char) colorTable[a].string[0]; if (cidx[char1] == NULL) { /* get new memory */ cidx[char1] = (unsigned short *) XpmCalloc(256, sizeof(unsigned short)); diff --git a/src/data.c b/src/data.c index ccd98ed..cfd1007 100644 --- a/src/data.c +++ b/src/data.c @@ -33,6 +33,8 @@ \*****************************************************************************/ /* $XFree86: xc/extras/Xpm/lib/data.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ +/* October 2004, source code review by Thomas Biege */ + #ifndef CXPMPROG #if 0 /* Official version number */ @@ -262,7 +264,7 @@ xpmNextWord(data, buf, buflen) } Ungetc(data, c, file); } - return (n); + return (n); /* this returns bytes read + 1 */ } /* @@ -375,8 +377,9 @@ xpmGetCmt(data, cmt) { if (!data->type) *cmt = NULL; - else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(data->CommentLength + 1); + else if (data->CommentLength != 0 && data->CommentLength < UINT_MAX - 1) { + if( (*cmt = (char *) XpmMalloc(data->CommentLength + 1)) == NULL) + return XpmNoMemory; strncpy(*cmt, data->Comment, data->CommentLength); (*cmt)[data->CommentLength] = '\0'; data->CommentLength = 0; @@ -400,7 +403,7 @@ int xpmParseHeader(data) xpmData *data; { - char buf[BUFSIZ]; + char buf[BUFSIZ+1] = {0}; int l, n = 0; if (data->type) { diff --git a/src/hashtab.c b/src/hashtab.c index f07cb6d..f5a71dd 100644 --- a/src/hashtab.c +++ b/src/hashtab.c @@ -138,13 +138,13 @@ HashTableGrows(table) unsigned int size = table->size; xpmHashAtom *t, *p; int i; - int oldSize = size; + unsigned int oldSize = size; t = atomTable; HASH_TABLE_GROWS table->size = size; table->limit = size / 3; - if (size >= SIZE_MAX / sizeof(*atomTable)) + if (size >= UINT_MAX / sizeof(*atomTable)) return (XpmNoMemory); atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); if (!atomTable) @@ -206,7 +206,7 @@ xpmHashTableInit(table) table->size = INITIAL_HASH_SIZE; table->limit = table->size / 3; table->used = 0; - if (table->size >= SIZE_MAX / sizeof(*atomTable)) + if (table->size >= UINT_MAX / sizeof(*atomTable)) return (XpmNoMemory); atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); if (!atomTable) diff --git a/src/misc.c b/src/misc.c index 7a9ecb5..ce80d54 100644 --- a/src/misc.c +++ b/src/misc.c @@ -44,7 +44,7 @@ xpmstrdup(s1) char *s1; { char *s2; - int l = strlen(s1) + 1; + size_t l = strlen(s1) + 1; if (s2 = (char *) XpmMalloc(l)) strcpy(s2, s1); diff --git a/src/parse.c b/src/parse.c index d46333b..73ed6b2 100644 --- a/src/parse.c +++ b/src/parse.c @@ -41,26 +41,28 @@ * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #include #include #ifdef HAS_STRLCAT -# define STRLCAT(dst, src, dstsize) { \ +# define STRLCAT(dst, src, dstsize) do { \ if (strlcat(dst, src, dstsize) >= (dstsize)) \ - return (XpmFileInvalid); } -# define STRLCPY(dst, src, dstsize) { \ + return (XpmFileInvalid); } while(0) +# define STRLCPY(dst, src, dstsize) do { \ if (strlcpy(dst, src, dstsize) >= (dstsize)) \ - return (XpmFileInvalid); } + return (XpmFileInvalid); } while(0) #else -# define STRLCAT(dst, src, dstsize) { \ +# define STRLCAT(dst, src, dstsize) do { \ if ((strlen(dst) + strlen(src)) < (dstsize)) \ strcat(dst, src); \ - else return (XpmFileInvalid); } -# define STRLCPY(dst, src, dstsize) { \ + else return (XpmFileInvalid); } while(0) +# define STRLCPY(dst, src, dstsize) do { \ if (strlen(src) < (dstsize)) \ strcpy(dst, src); \ - else return (XpmFileInvalid); } + else return (XpmFileInvalid); } while(0) #endif LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, @@ -205,7 +207,7 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) char **defaults; int ErrorStatus; - if (ncolors >= SIZE_MAX / sizeof(XpmColor)) + if (ncolors >= UINT_MAX / sizeof(XpmColor)) return (XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); if (!colorTable) @@ -218,7 +220,7 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) /* * read pixel value */ - if (cpp >= SIZE_MAX - 1) { + if (cpp >= UINT_MAX - 1) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } @@ -277,9 +279,9 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) return (XpmFileInvalid); } if (!lastwaskey) - STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ + STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ buf[l] = '\0'; - STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ + STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ lastwaskey = 0; } } @@ -287,7 +289,7 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) xpmFreeColorTable(colorTable, ncolors); return (XpmFileInvalid); } - len = strlen(curbuf) + 1; + len = strlen(curbuf) + 1; /* integer overflow just theoretically possible */ s = defaults[curkey] = (char *) XpmMalloc(len); if (!s) { xpmFreeColorTable(colorTable, ncolors); @@ -306,7 +308,7 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) /* * read pixel value */ - if (cpp >= SIZE_MAX - 1) { + if (cpp >= UINT_MAX - 1) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } @@ -351,7 +353,7 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable) memcpy(s, curbuf, len); color->c_color = s; *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) + if (a < ncolors - 1) /* can we trust ncolors -> leave data's bounds */ xpmNextString(data); /* get to the next string */ } } @@ -370,11 +372,11 @@ ParsePixels(data, width, height, ncolors, cpp, colorTable, hashtable, pixels) xpmHashTable *hashtable; unsigned int **pixels; { - unsigned int *iptr, *iptr2; + unsigned int *iptr, *iptr2 = NULL; /* found by Egbert Eich */ unsigned int a, x, y; - if ((height > 0 && width >= SIZE_MAX / height) || - width * height >= SIZE_MAX / sizeof(unsigned int)) + if ((height > 0 && width >= UINT_MAX / height) || + width * height >= UINT_MAX / sizeof(unsigned int)) return XpmNoMemory; #ifndef FOR_MSW iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); @@ -399,8 +401,10 @@ ParsePixels(data, width, height, ncolors, cpp, colorTable, hashtable, pixels) { unsigned short colidx[256]; - if (ncolors > 256) + if (ncolors > 256) { + XpmFree(iptr2); /* found by Egbert Eich */ return (XpmFileInvalid); + } bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) @@ -427,16 +431,20 @@ ParsePixels(data, width, height, ncolors, cpp, colorTable, hashtable, pixels) { /* free all allocated pointers at all exits */ -#define FREE_CIDX {int f; for (f = 0; f < 256; f++) \ -if (cidx[f]) XpmFree(cidx[f]);} +#define FREE_CIDX \ +do \ +{ \ + int f; for (f = 0; f < 256; f++) \ + if (cidx[f]) XpmFree(cidx[f]); \ +} while(0) /* array of pointers malloced by need */ unsigned short *cidx[256]; - int char1; + unsigned int char1; bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ for (a = 0; a < ncolors; a++) { - char1 = colorTable[a].string[0]; + char1 = (unsigned char) colorTable[a].string[0]; if (cidx[char1] == NULL) { /* get new memory */ cidx[char1] = (unsigned short *) XpmCalloc(256, sizeof(unsigned short)); @@ -480,8 +488,10 @@ if (cidx[f]) XpmFree(cidx[f]);} char *s; char buf[BUFSIZ]; - if (cpp >= sizeof(buf)) + if (cpp >= sizeof(buf)) { + XpmFree(iptr2); /* found by Egbert Eich */ return (XpmFileInvalid); + } buf[cpp] = '\0'; if (USE_HASHTABLE) { @@ -491,7 +501,7 @@ if (cidx[f]) XpmFree(cidx[f]);} xpmNextString(data); for (x = 0; x < width; x++, iptr++) { for (a = 0, s = buf; a < cpp; a++, s++) - *s = xpmGetC(data); + *s = xpmGetC(data); /* int assigned to char, not a problem here */ slot = xpmHashSlot(hashtable, buf); if (!*slot) { /* no color matches */ XpmFree(iptr2); @@ -505,7 +515,7 @@ if (cidx[f]) XpmFree(cidx[f]);} xpmNextString(data); for (x = 0; x < width; x++, iptr++) { for (a = 0, s = buf; a < cpp; a++, s++) - *s = xpmGetC(data); + *s = xpmGetC(data); /* int assigned to char, not a problem here */ for (a = 0; a < ncolors; a++) if (!strcmp(colorTable[a].string, buf)) break; @@ -560,7 +570,7 @@ xpmParseExtensions(data, extensions, nextensions) while (!notstart && notend) { /* there starts an extension */ ext = (XpmExtension *) - XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); + XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); /* can the loop be forced to iterate often enough to make "(num + 1) * sizeof(XpmExtension)" wrapping? */ if (!ext) { XpmFree(string); XpmFreeExtensions(exts, num); @@ -597,7 +607,7 @@ xpmParseExtensions(data, extensions, nextensions) while ((notstart = strncmp("XPMEXT", string, 6)) && (notend = strncmp("XPMENDEXT", string, 9))) { sp = (char **) - XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); + XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); /* can we iterate enough for a wrapping? */ if (!sp) { XpmFree(string); ext->nlines = nlines; @@ -637,9 +647,9 @@ xpmParseExtensions(data, extensions, nextensions) /* function call in case of error */ #undef RETURN #define RETURN(status) \ -{ \ +do { \ goto error; \ -} +} while(0) /* * This function parses an Xpm file or data and store the found informations diff --git a/src/scan.c b/src/scan.c index 230c7e6..69c987b 100644 --- a/src/scan.c +++ b/src/scan.c @@ -43,6 +43,8 @@ * Lorens Younes (d93-hyo@nada.kth.se) 4/96 */ +/* October 2004, source code review by Thomas Biege */ + #include "XpmI.h" #define MAXPRINTABLE 92 /* number of printable ascii chars @@ -172,10 +174,10 @@ storeMaskPixel(pixel, pmap, index_return) /* function call in case of error */ #undef RETURN #define RETURN(status) \ -{ \ +do { \ ErrorStatus = status; \ goto error; \ -} +} while(0) /* * This function scans the given image and stores the found informations in @@ -233,15 +235,15 @@ XpmCreateXpmImageFromImage(display, image, shapeimage, else cpp = 0; - if ((height > 0 && width >= SIZE_MAX / height) || - width * height >= SIZE_MAX / sizeof(unsigned int)) + if ((height > 0 && width >= UINT_MAX / height) || + width * height >= UINT_MAX / sizeof(unsigned int)) RETURN(XpmNoMemory); pmap.pixelindex = (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); if (!pmap.pixelindex) RETURN(XpmNoMemory); - if (pmap.size >= SIZE_MAX / sizeof(Pixel)) + if (pmap.size >= UINT_MAX / sizeof(Pixel)) RETURN(XpmNoMemory); pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); @@ -308,7 +310,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage, * get rgb values and a string of char, and possibly a name for each * color */ - if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) + if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor)) RETURN(XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); if (!colorTable) @@ -368,7 +370,7 @@ ScanTransparentColor(color, cpp, attributes) /* first get a character string */ a = 0; - if (cpp >= SIZE_MAX - 1) + if (cpp >= UINT_MAX - 1) return (XpmNoMemory); if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) return (XpmNoMemory); @@ -461,7 +463,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) } /* first get character strings and rgb values */ - if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) + if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) return (XpmNoMemory); xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); if (!xcolors) @@ -619,7 +621,7 @@ GetImagePixels(image, width, height, pmap) char *dst; unsigned int *iptr; char *data; - int x, y, i; + unsigned int x, y, i; int bits, depth, ibu, ibpp, offset; unsigned long lbt; Pixel pixel, px; @@ -721,7 +723,7 @@ GetImagePixels32(image, width, height, pmap) unsigned char *addr; unsigned char *data; unsigned int *iptr; - int x, y; + unsigned int x, y; unsigned long lbt; Pixel pixel; int depth; @@ -786,7 +788,7 @@ GetImagePixels16(image, width, height, pmap) unsigned char *addr; unsigned char *data; unsigned int *iptr; - int x, y; + unsigned int x, y; unsigned long lbt; Pixel pixel; int depth; @@ -831,7 +833,7 @@ GetImagePixels8(image, width, height, pmap) { unsigned int *iptr; unsigned char *data; - int x, y; + unsigned int x, y; unsigned long lbt; Pixel pixel; int depth; @@ -864,7 +866,7 @@ GetImagePixels1(image, width, height, pmap, storeFunc) storeFuncPtr storeFunc; { unsigned int *iptr; - int x, y; + unsigned int x, y; char *data; Pixel pixel; int xoff, yoff, offset, bpl; @@ -900,11 +902,11 @@ GetImagePixels1(image, width, height, pmap, storeFunc) # else /* AMIGA */ #define CLEAN_UP(status) \ -{\ +do {\ if (pixels) XpmFree (pixels);\ if (tmp_img) FreeXImage (tmp_img);\ return (status);\ -} +} while(0) static int AGetImagePixels ( @@ -925,7 +927,7 @@ AGetImagePixels ( tmp_img = AllocXImage ((((width+15)>>4)<<4), 1, image->rp->BitMap->Depth); if (tmp_img == NULL) - CLEAN_UP (XpmNoMemory) + CLEAN_UP (XpmNoMemory); iptr = pmap->pixelindex; for (y = 0; y < height; ++y) @@ -934,11 +936,11 @@ AGetImagePixels ( for (x = 0; x < width; ++x, ++iptr) { if ((*storeFunc) (pixels[x], pmap, iptr)) - CLEAN_UP (XpmNoMemory) + CLEAN_UP (XpmNoMemory); } } - CLEAN_UP (XpmSuccess) + CLEAN_UP (XpmSuccess); } #undef CLEAN_UP -- cgit v1.2.3