summaryrefslogtreecommitdiff
path: root/ringbuffer.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2003-02-02 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2003-02-02 18:00:00 +0100
commit8c5d735d3279230f6471e474a946a5733054df43 (patch)
tree34f72e8bcb3a8fc93a9e6cc752fc19f6d95ce7e7 /ringbuffer.c
parenta3942b4d17a3a7e1af82b1950c39db1f9c7ce250 (diff)
downloadvdr-patch-lnbsharing-8c5d735d3279230f6471e474a946a5733054df43.tar.gz
vdr-patch-lnbsharing-8c5d735d3279230f6471e474a946a5733054df43.tar.bz2
Version 1.1.23vdr-1.1.23
- Fixed a new/delete malloc/free mismatch in ringbuffer.c (thanks to Stefan Huelswitt for reporting this one). - Improved CAM handling.
Diffstat (limited to 'ringbuffer.c')
-rw-r--r--ringbuffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ringbuffer.c b/ringbuffer.c
index 0734c28..48622f0 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 ------------------------------------------------------