summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-04-26 10:28:39 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-04-26 10:28:39 +0200
commitb5ddaedfb3c12bcafe08b6b61268de2e286fb8ea (patch)
treee5753dab5875ba4aadbfc44414ef6e6aa98a9a11
parentfb3e5ca4ee9590219e9e2c4d0cf5ea232a78bab1 (diff)
downloadvdr-b5ddaedfb3c12bcafe08b6b61268de2e286fb8ea.tar.gz
vdr-b5ddaedfb3c12bcafe08b6b61268de2e286fb8ea.tar.bz2
Fixed cDevice::StillPicture(), making sure it doesn't call the derived class's function if no buffer has been allocated
-rw-r--r--HISTORY4
-rw-r--r--device.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index dd96da11..63c9041b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
Schmirler).
-2012-04-24: Version 1.7.28
+2012-04-26: Version 1.7.28
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
- Fixed getting the maximum short channel name length in case there are no short names
@@ -7085,3 +7085,5 @@ Video Disk Recorder Revision History
to have them react immediately in case any change to a plugin's setup parameter
has an effect on the OSD.
- The Timers list is now marked as modified whenever a recording starts or ends.
+- Fixed cDevice::StillPicture(), making sure it doesn't call the derived class's
+ function if no buffer has been allocated.
diff --git a/device.c b/device.c
index cb5cd830..9c382a11 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 2.59 2012/04/04 09:48:00 kls Exp $
+ * $Id: device.c 2.60 2012/04/26 09:40:36 kls Exp $
*/
#include "device.h"
@@ -1181,8 +1181,10 @@ void cDevice::StillPicture(const uchar *Data, int Length)
return;
}
}
- StillPicture(buf, Size);
- free(buf);
+ if (buf) {
+ StillPicture(buf, Size);
+ free(buf);
+ }
}
}