|
 |
61ad25 |
From b78ede45a294b567d27d7198ff3354df86a5b7f1 Mon Sep 17 00:00:00 2001
|
|
|
61ad25 |
From: Lumir Balhar <lbalhar@redhat.com>
|
|
|
61ad25 |
Date: Tue, 11 Sep 2018 15:58:31 +0200
|
|
|
61ad25 |
Subject: [PATCH 1/2] Fix potential un-terminated buffer problem (CWE-120)
|
|
|
61ad25 |
|
|
|
61ad25 |
---
|
|
|
61ad25 |
src/libImaging/Histo.c | 4 +++-
|
|
|
61ad25 |
src/libImaging/Palette.c | 3 ++-
|
|
|
61ad25 |
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
61ad25 |
|
|
|
61ad25 |
diff --git a/src/libImaging/Histo.c b/src/libImaging/Histo.c
|
|
|
61ad25 |
index 0bfc8dfe..2b35873e 100644
|
|
|
61ad25 |
--- a/src/libImaging/Histo.c
|
|
|
61ad25 |
+++ b/src/libImaging/Histo.c
|
|
|
61ad25 |
@@ -41,7 +41,9 @@ ImagingHistogramNew(Imaging im)
|
|
|
61ad25 |
|
|
|
61ad25 |
/* Create histogram descriptor */
|
|
|
61ad25 |
h = calloc(1, sizeof(struct ImagingHistogramInstance));
|
|
|
61ad25 |
- strncpy(h->mode, im->mode, IMAGING_MODE_LENGTH);
|
|
|
61ad25 |
+ strncpy(h->mode, im->mode, IMAGING_MODE_LENGTH-1);
|
|
|
61ad25 |
+ h->mode[IMAGING_MODE_LENGTH-1] = 0;
|
|
|
61ad25 |
+
|
|
|
61ad25 |
h->bands = im->bands;
|
|
|
61ad25 |
h->histogram = calloc(im->pixelsize, 256 * sizeof(long));
|
|
|
61ad25 |
|
|
|
61ad25 |
diff --git a/src/libImaging/Palette.c b/src/libImaging/Palette.c
|
|
|
61ad25 |
index 31c2c024..7aee6e8e 100644
|
|
|
61ad25 |
--- a/src/libImaging/Palette.c
|
|
|
61ad25 |
+++ b/src/libImaging/Palette.c
|
|
|
61ad25 |
@@ -37,7 +37,8 @@ ImagingPaletteNew(const char* mode)
|
|
|
61ad25 |
if (!palette)
|
|
|
61ad25 |
return (ImagingPalette) ImagingError_MemoryError();
|
|
|
61ad25 |
|
|
|
61ad25 |
- strncpy(palette->mode, mode, IMAGING_MODE_LENGTH);
|
|
|
61ad25 |
+ strncpy(palette->mode, mode, IMAGING_MODE_LENGTH-1);
|
|
|
61ad25 |
+ palette->mode[IMAGING_MODE_LENGTH-1] = 0;
|
|
|
61ad25 |
|
|
|
61ad25 |
/* Initialize to ramp */
|
|
|
61ad25 |
for (i = 0; i < 256; i++) {
|
|
|
61ad25 |
--
|
|
|
61ad25 |
2.17.1
|
|
|
61ad25 |
|