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

Fixed a possible crash if an editing process is canceled while the edited recording is being replayed (new solution)

Browse Source
This commit is contained in:
Klaus Schmidinger 2023-02-15 14:59:25 +01:00
parent e0d87da768
commit 14b907b01c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -9846,3 +9846,5 @@ Video Disk Recorder Revision History
- Reverted 'Fixed a possible crash if an editing process is canceled while the edited - Reverted 'Fixed a possible crash if an editing process is canceled while the edited
recording is being replayed' (introduced in version 2.6.2), because it caused a recording is being replayed' (introduced in version 2.6.2), because it caused a
deadlock when moving recordings between volumes. deadlock when moving recordings between volumes.
- Fixed a possible crash if an editing process is canceled while the edited recording
is being replayed (new solution).

24
recording.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: recording.c 5.21 2023/02/15 14:01:20 kls Exp $ * $Id: recording.c 5.22 2023/02/15 14:59:25 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -312,24 +312,32 @@ bool cResumeFile::Save(int Index)
if (safe_write(f, &Index, sizeof(Index)) < 0) if (safe_write(f, &Index, sizeof(Index)) < 0)
LOG_ERROR_STR(fileName); LOG_ERROR_STR(fileName);
close(f); close(f);
LOCK_RECORDINGS_WRITE;
Recordings->ResetResume(fileName);
return true;
} }
else
return false;
} }
else { else {
FILE *f = fopen(fileName, "w"); FILE *f = fopen(fileName, "w");
if (f) { if (f) {
fprintf(f, "I %d\n", Index); fprintf(f, "I %d\n", Index);
fclose(f); fclose(f);
LOCK_RECORDINGS_WRITE;
Recordings->ResetResume(fileName);
} }
else else {
LOG_ERROR_STR(fileName); LOG_ERROR_STR(fileName);
return true; return false;
} }
} }
// Not using LOCK_RECORDINGS_WRITE here, because we might already hold a lock in cRecordingsHandler::Action()
// and end up here if an editing process is canceled while the edited recording is being replayed. The worst
// that can happen if we don't get this lock here is that the resume info in the Recordings list is not updated,
// but that doesn't matter because the recording is deleted, anyway.
cStateKey StateKey;
if (cRecordings *Recordings = cRecordings::GetRecordingsWrite(StateKey, 1)) {
Recordings->ResetResume(fileName);
StateKey.Remove();
}
return true;
}
return false; return false;
} }