mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a possible crash when loading an invalid XPM file
This commit is contained in:
parent
f3bc8d1988
commit
cc385f5292
@ -1696,6 +1696,7 @@ Henrik Niehaus <henrik.niehaus@gmx.de>
|
||||
Martin Wache <M.Wache@gmx.net>
|
||||
for adding a sleep in cDvbPlayer::Action() in case there is no data to send to the
|
||||
device, which avoids a busy loop on very fast machines
|
||||
for fixing a possible crash when loading an invalid XPM file
|
||||
|
||||
Matthias Lenk <matthias.lenk@amd.com>
|
||||
for reporting an out-of-bounds memory access with audio language ids
|
||||
|
3
HISTORY
3
HISTORY
@ -5091,9 +5091,10 @@ Video Disk Recorder Revision History
|
||||
with open file handles when starting background commands (thanks to Reinhard
|
||||
Nissl).
|
||||
|
||||
2007-02-03: Version 1.4.5-2
|
||||
2007-02-17: Version 1.4.5-2
|
||||
|
||||
- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
|
||||
- Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache).
|
||||
|
||||
2007-02-03: Version 1.5.1
|
||||
|
||||
|
10
osd.c
10
osd.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: osd.c 1.67 2006/02/26 14:31:31 kls Exp $
|
||||
* $Id: osd.c 1.68 2007/02/17 16:05:52 kls Exp $
|
||||
*/
|
||||
|
||||
#include "osd.h"
|
||||
@ -218,14 +218,17 @@ bool cBitmap::LoadXpm(const char *FileName)
|
||||
int w, h, n, c;
|
||||
if (4 != sscanf(s, "%d %d %d %d", &w, &h, &n, &c)) {
|
||||
esyslog("ERROR: faulty 'values' line in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
lines = h + n + 1;
|
||||
Xpm = MALLOC(char *, lines);
|
||||
memset(Xpm, 0, lines * sizeof(char*));
|
||||
}
|
||||
char *q = strchr(s, '"');
|
||||
if (!q) {
|
||||
esyslog("ERROR: missing quotes in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
*q = 0;
|
||||
@ -233,16 +236,21 @@ bool cBitmap::LoadXpm(const char *FileName)
|
||||
Xpm[index++] = strdup(s);
|
||||
else {
|
||||
esyslog("ERROR: too many lines in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isXpm) {
|
||||
if (index == lines)
|
||||
Result = SetXpm(Xpm);
|
||||
else
|
||||
esyslog("ERROR: too few lines in XPM file '%s'", FileName);
|
||||
}
|
||||
if (Xpm) {
|
||||
for (int i = 0; i < index; i++)
|
||||
free(Xpm[i]);
|
||||
}
|
||||
free(Xpm);
|
||||
fclose(f);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user