frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that doesn't exist

This commit is contained in:
Klaus Schmidinger 2013-02-15 14:27:26 +01:00
parent 441ee74ff1
commit 92888b3e57
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -3069,3 +3069,7 @@ Marc Perrudin <vdr@ekass.net>
Bernard Jaulin <bernard.jaulin@gmail.com> Bernard Jaulin <bernard.jaulin@gmail.com>
for translating OSD texts to the French language for translating OSD texts to the French language
Mikael Hübsch <mikael.hubsch@gmail.com>
for reporting a crash in cMenuEditChanItem::Set() when entering a channel number that
doesn't exist

4
HISTORY
View File

@ -7585,7 +7585,7 @@ Video Disk Recorder Revision History
- Fixed formatting and removed some superfluous break statements in vdr.c's command - Fixed formatting and removed some superfluous break statements in vdr.c's command
line option switch. line option switch.
2013-02-14: Version 1.7.38 2013-02-15: Version 1.7.38
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
@ -7620,3 +7620,5 @@ Video Disk Recorder Revision History
config.h and using them to initialize Setup.NameInstantRecord (avoids having the same config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
information in two places). information in two places).
- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider. - Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
doesn't exist (reported by Mikael Hübsch).

4
menuitems.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: menuitems.c 2.15 2012/12/23 13:44:05 kls Exp $ * $Id: menuitems.c 2.16 2013/02/15 14:20:29 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -759,7 +759,7 @@ void cMenuEditChanItem::Set(void)
snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : ""); snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
SetValue(buf); SetValue(buf);
if (channelID) if (channelID)
*channelID = channel->GetChannelID().ToString(); *channelID = channel ? channel->GetChannelID().ToString() : "";
} }
else if (noneString) { else if (noneString) {
SetValue(noneString); SetValue(noneString);