diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2001-02-07 20:33:48 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2001-02-07 20:33:48 +0000 |
| commit | d8f67662daab00ff6f32f356ba7330836d1f8261 (patch) | |
| tree | 0cb4f4147cbec768c0e14dffee3d89b472e5810b /graphics/dc20ctrl/files/patch-ad | |
| parent | Fix a core dump when doing 'tosha -i'. (Maintainer timeout after about two (diff) | |
Fix overflows and bump PORTREVISION.
Reviewed by: jedgar
Diffstat (limited to 'graphics/dc20ctrl/files/patch-ad')
| -rw-r--r-- | graphics/dc20ctrl/files/patch-ad | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/graphics/dc20ctrl/files/patch-ad b/graphics/dc20ctrl/files/patch-ad new file mode 100644 index 000000000000..982285d0386a --- /dev/null +++ b/graphics/dc20ctrl/files/patch-ad @@ -0,0 +1,43 @@ +diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c +--- work/dc20ctrl-0.4/pixmaps.c Tue Feb 17 09:19:47 1998 ++++ pixmaps.c Mon Feb 5 18:42:18 2001 +@@ -504,26 +504,32 @@ + * Build the image name + */ + +- strcpy(fname, name); +- strcat(fname, "."); ++ if (strlcpy(fname, name, sizeof(fname)) >= sizeof(fname)) ++ return -1; ++ if (strlcat(fname, ".", sizeof(fname)) >= sizeof(fname)) ++ return -1; + switch (format & SAVE_FORMATS) { + #ifdef USE_JPEG + case SAVE_JPEG: +- strcat(fname, JPEG_EXT); ++ if (strlcat(fname, JPEG_EXT, sizeof(fname)) >= sizeof(fname)) ++ return -1; + break; + #endif /* USE_JPEG */ + #ifdef USE_TIFF + case SAVE_TIFF: +- strcat(fname, TIFF_EXT); ++ if (strlcat(fname, TIFF_EXT, sizeof(fname)) >= sizeof(fname)) ++ return -1; + break; + #endif /* USE_TIFF */ + #ifdef USE_PNG + case SAVE_PNG: +- strcat(fname, PNG_EXT); ++ if (strlcat(fname, PNG_EXT, sizeof(fname)) >= sizeof(fname)) ++ return -1; + break; + #endif /* USE_PNG */ + default: +- strcat(fname, (to_be_saved->components == 3) ? PPM_EXT : PGM_EXT ); ++ if (strlcat(fname, (to_be_saved->components == 3) ? PPM_EXT : PGM_EXT, sizeof(fname)) >= sizeof(fname)) ++ return -1; + break; + } + +Only in dc20ctrl-0.4/: rep |