From e392051752aa8bdc9334ec5d546355907a503a7a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 13 Jun 2009 12:25:22 +0200 Subject: [PATCH] Fixed index types in cIndexFile::GetNextIFrame() --- CONTRIBUTORS | 1 + HISTORY | 2 ++ recording.c | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c2755790..5fd6f7c5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1640,6 +1640,7 @@ Udo Richter for reporting a problem with handling the maximum video file size for suggesting to add a note to the INSTALL file about using subdirectories to split a large disk into separate areas for VDR's video data and other stuff + for reporting wrong index types in cIndexFile::GetNextIFrame() Sven Kreiensen for his help in keeping 'channels.conf.terr' up to date diff --git a/HISTORY b/HISTORY index 176ed0f7..36f06272 100644 --- a/HISTORY +++ b/HISTORY @@ -6134,3 +6134,5 @@ Video Disk Recorder Revision History - Added a plausibility check for the OSD percentage parameters to avoid problems in case the values are stored in the setup.conf file in a wrong way. +- Fixed index types in cIndexFile::GetNextIFrame() (reported by + Udo Richter). diff --git a/recording.c b/recording.c index 28a93a6a..5ba577f6 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.14 2009/06/06 13:39:40 kls Exp $ + * $Id: recording.c 2.15 2009/06/13 12:23:25 kls Exp $ */ #include "recording.h" @@ -1560,8 +1560,8 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off *FileOffset = index[Index].offset; if (Length) { // all recordings end with a non-independent frame, so the following should be safe: - int fn = index[Index + 1].number; - int fo = index[Index + 1].offset; + uint16_t fn = index[Index + 1].number; + off_t fo = index[Index + 1].offset; if (fn == *FileNumber) *Length = fo - *FileOffset; else {