diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2005-03-07 15:10:20 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2005-03-07 15:10:20 +0000 |
| commit | a9beb3d4b2f29adec4a42008e4e278ba2e93efea (patch) | |
| tree | c02cb169c1c9b300fda90357240606ca54cf965c /graphics/imlib2/files/patch-security-1 | |
| parent | - Update to 0.4.4. (diff) | |
1: Upgrade imlib2 to 1.2.0
2: chase shared library version to 3.
PR: ports/78347
Submitted by: Russell Jackson <raj at cserv62.csub.edu>
Somepart by: me
Notes
Notes:
svn path=/head/; revision=130537
Diffstat (limited to 'graphics/imlib2/files/patch-security-1')
| -rw-r--r-- | graphics/imlib2/files/patch-security-1 | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/graphics/imlib2/files/patch-security-1 b/graphics/imlib2/files/patch-security-1 deleted file mode 100644 index 520160f14fed..000000000000 --- a/graphics/imlib2/files/patch-security-1 +++ /dev/null @@ -1,90 +0,0 @@ -=================================================================== -RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -r1.2 -r1.3 ---- enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c 2004/12/14 03:50:46 1.2 -+++ loaders/loader_xpm.c 2005/01/04 03:34:03 1.3 -@@ -192,37 +192,37 @@ - { - /* Header */ - sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if ((ncolors > 32766) || (ncolors < 1)) - { - fprintf(stderr, -- "IMLIB ERROR: XPM files with colors > 32766 not supported\n"); -+ "IMLIB ERROR: XPM files with colors > 32766 or < 1 not supported\n"); - free(line); - fclose(f); - xpm_parse_done(); - return 0; - } -- if (cpp > 5) -+ if ((cpp > 5) || (cpp < 1)) - { - fprintf(stderr, -- "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); -+ "IMLIB ERROR: XPM files with characters per pixel > 5 or < 1not supported\n"); - free(line); - fclose(f); - xpm_parse_done(); - return 0; - } -- if (w > 32767) -+ if ((w > 32767) || (w < 1)) - { - fprintf(stderr, -- "IMLIB ERROR: Image width > 32767 pixels for file\n"); -+ "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n"); - free(line); - fclose(f); - xpm_parse_done(); - return 0; - } -- if (h > 32767) -+ if ((h > 32767) || (h < 1)) - { - fprintf(stderr, -- "IMLIB ERROR: Image height > 32767 pixels for file\n"); -+ "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n"); - free(line); - fclose(f); - xpm_parse_done(); -@@ -284,9 +284,14 @@ - if (k >= len) - { - if (col[0]) -- strcat(col, " "); -+ { -+ if (strlen(col) < ( sizeof(col) - 2)) -+ strcat(col, " "); -+ else -+ done = 1; -+ } - if (strlen(col) + strlen(s) < -- sizeof(col)) -+ (sizeof(col) - 1)) - strcat(col, s); - } - if (col[0]) -@@ -322,9 +327,16 @@ - } - else - { -- if (col[0]) -- strcat(col, " "); -- strcat(col, s); -+ if (col[0]) -+ { -+ if (strlen(col) < ( sizeof(col) - 2)) -+ strcat(col, " "); -+ else -+ done = 1; -+ } -+ if (strlen(col) + strlen(s) < -+ (sizeof(col) - 1)) -+ strcat(col, s); - } - } - } |