frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added a check against MAXOSDAREAS in cOsd::CanHandleAreas()

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-10-02 08:49:36 +02:00
parent 4b8ff61901
commit ba24e93d82
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1288,6 +1288,7 @@ Udo Richter <udo_richter@gmx.de>
for reporting an unused MAINMENUENTRY in svdrpdemo.c for reporting an unused MAINMENUENTRY in svdrpdemo.c
for reporting a bug in opening recording folders in case the last replayed recording for reporting a bug in opening recording folders in case the last replayed recording
no longer exists no longer exists
for reporting a missing check against MAXOSDAREAS in cOsd::CanHandleAreas()
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

4
HISTORY
View File

@ -3850,7 +3850,7 @@ Video Disk Recorder Revision History
Alexander Rieger). Alexander Rieger).
- Made the function ExchangeChars() public (suggested by Lucian Muresan). - Made the function ExchangeChars() public (suggested by Lucian Muresan).
2005-10-01: Version 1.3.34 2005-10-02: Version 1.3.34
- Fixed a leftover 'summary.vdr' in vdr.5 (thanks to Peter Bieringer for reporting - Fixed a leftover 'summary.vdr' in vdr.5 (thanks to Peter Bieringer for reporting
this one). this one).
@ -3864,3 +3864,5 @@ Video Disk Recorder Revision History
Volkenandt). Volkenandt).
- Fixed the FATALERRNO macro to check for a non-zero errno value (reported by Marco - Fixed the FATALERRNO macro to check for a non-zero errno value (reported by Marco
Schlüßler). Schlüßler).
- Added a check against MAXOSDAREAS in cOsd::CanHandleAreas() (reported by Udo
Richter).

4
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osd.c 1.62 2005/06/19 10:43:04 kls Exp $ * $Id: osd.c 1.63 2005/10/02 08:47:13 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -618,6 +618,8 @@ cBitmap *cOsd::GetBitmap(int Area)
eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas) eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
{ {
if (NumAreas > MAXOSDAREAS)
return oeTooManyAreas;
eOsdError Result = oeOk; eOsdError Result = oeOk;
for (int i = 0; i < NumAreas; i++) { for (int i = 0; i < NumAreas; i++) {
if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0) if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)