Fixed calling iconv_close() only with a valid iconv_t value

This commit is contained in:
Klaus Schmidinger 2012-12-03 09:34:12 +01:00
parent 441bf30032
commit e2796948b2
3 changed files with 6 additions and 3 deletions

View File

@ -2835,6 +2835,7 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
for reporting a problem with EPG scan on systems with only a single DVB device that
use software output
for fixing calling iconv_close() only with a valid iconv_t value
Sergiu Dotenco <sergiu.dotenco@googlemail.com>
for reporting a missing initialization in sDvbSpuRect

View File

@ -7339,7 +7339,7 @@ Video Disk Recorder Revision History
- Modified editing marks are now written to disk whenever the replay progress display
gets hidden (thanks to Christoph Haubrich).
2012-12-02: Version 1.7.33
2012-12-03: Version 1.7.33
- In order to be able to play TS recordings from other sources, in which there is
more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
@ -7358,3 +7358,4 @@ Video Disk Recorder Revision History
- Fixed a typo in skins.h (thanks to Lars Hanisch).
- Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow
handling of PCR values (thanks to Sören Moch).
- Fixed calling iconv_close() only with a valid iconv_t value (thanks to Juergen Lock).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: tools.c 2.26 2012/09/30 13:04:14 kls Exp $
* $Id: tools.c 2.27 2012/12/03 09:31:32 kls Exp $
*/
#include "tools.h"
@ -842,7 +842,8 @@ cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode)
cCharSetConv::~cCharSetConv()
{
free(result);
iconv_close(cd);
if (cd != (iconv_t)-1)
iconv_close(cd);
}
void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)