summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--config.h4
-rw-r--r--ringbuffer.c6
4 files changed, 11 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fad747b9..ae550b81 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -161,6 +161,7 @@ Stefan Huelswitt <huels@iname.com>
for fixing handling 'Transfer Mode' on single device systems when recording an
encrypted channel
for reporting a problem with timers when channel IDs have a 'source' that is 0
+ for reporting a new/delete malloc/free mismatch in ringbuffer.c
Ulrich Röder <roeder@efr-net.de>
for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 90859361..db954d44 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1941,3 +1941,8 @@ Video Disk Recorder Revision History
- Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
Kirchgatterer and Robert Schiele).
- Fixed skipping unavailable channels in the EPG scanner.
+
+2003-01-26: Version 1.1.23
+
+- Fixed a new/delete malloc/free mismatch in ringbuffer.c (thanks to Stefan
+ Huelswitt for reporting this one).
diff --git a/config.h b/config.h
index 83045ae3..8bf33f62 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.146 2003/01/12 09:44:28 kls Exp $
+ * $Id: config.h 1.147 2003/01/26 19:50:19 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "device.h"
#include "tools.h"
-#define VDRVERSION "1.1.22"
+#define VDRVERSION "1.1.23"
#define MAXPRIORITY 99
#define MAXLIFETIME 99
diff --git a/ringbuffer.c b/ringbuffer.c
index 0734c28d..48622f0c 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
* Parts of this file were inspired by the 'ringbuffy.c' from the
* LinuxDVB driver (see linuxtv.org).
*
- * $Id: ringbuffer.c 1.12 2003/01/26 09:39:24 kls Exp $
+ * $Id: ringbuffer.c 1.13 2003/01/26 19:47:10 kls Exp $
*/
#include "ringbuffer.h"
@@ -188,7 +188,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
if (Count < 0)
data = (uchar *)Data;
else {
- data = new uchar[count];
+ data = MALLOC(uchar, count);
if (data)
memcpy(data, Data, count);
else
@@ -199,7 +199,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
cFrame::~cFrame()
{
- delete data;
+ free(data);
}
// --- cRingBufferFrame ------------------------------------------------------