gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 17:32:29 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: add check for image validity in 'loadRImage' (Coverity #50221, #50081)

Browse Source 
As pointed by Coverity, the function blindly trust the data read from the
file, but in case of problem (corrupted file, not enough memory) it could
behave badly.

This patch adds a check for the depth, counts on RCreateImage to check the
width and height, and in any case it now includes a message for the user in
case he would like to understand what's wrong.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Christophe CURIS
2014-11-15 19:41:00 +01:00
committed by Carlos R. Mafra
parent d1e1521a88
commit 3a15750ad5
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WPrefs.app/Appearance.c
View File

@@ -1310,10 +1310,22 @@ static Pixmap loadRImage(WMScreen * scr, const char *path)
cnt = fscanf(f, "%02x%02x%1x", &w, &h, &d); cnt = fscanf(f, "%02x%02x%1x", &w, &h, &d);
if (cnt != 3) { if (cnt != 3) {
wwarning(_("could not read size of image from '%s', ignoring"), path);
fclose(f);
return None;
}
if (d < 3 || d > 4) {
wwarning(_("image \"%s\" has an invalid depth of %d, ignoring"), path, d);
fclose(f); fclose(f);
return None; return None;
} }
image = RCreateImage(w, h, d == 4); image = RCreateImage(w, h, d == 4);
if (image == NULL) {
wwarning(_("could not create RImage for \"%s\": %s"),
path, RMessageForError(RErrorCode));
fclose(f);
return None;
}
read_size = w * h * d; read_size = w * h * d;
if (fread(image->data, 1, read_size, f) == read_size) if (fread(image->data, 1, read_size, f) == read_size)
RConvertImage(WMScreenRContext(scr), image, &pixmap); RConvertImage(WMScreenRContext(scr), image, &pixmap);