frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a new/delete malloc/free mismatch

Browse Source
This commit is contained in:
Klaus Schmidinger
2003-01-26 19:50:19 +01:00
parent 829c834d30
commit 5693873b9b
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@@ -161,6 +161,7 @@ Stefan Huelswitt <huels@iname.com>
for fixing handling 'Transfer Mode' on single device systems when recording an for fixing handling 'Transfer Mode' on single device systems when recording an
encrypted channel encrypted channel
for reporting a problem with timers when channel IDs have a 'source' that is 0 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> Ulrich R<>der <roeder@efr-net.de>
for pointing out that there are channels that have a symbol rate higher than for pointing out that there are channels that have a symbol rate higher than

5
HISTORY
View File

@@ -1941,3 +1941,8 @@ Video Disk Recorder Revision History
- Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens - Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
Kirchgatterer and Robert Schiele). Kirchgatterer and Robert Schiele).
- Fixed skipping unavailable channels in the EPG scanner. - 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).

4
config.h
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: 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 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.1.22" #define VDRVERSION "1.1.23"
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

6
ringbuffer.c
View File

@@ -7,7 +7,7 @@
* Parts of this file were inspired by the 'ringbuffy.c' from the * Parts of this file were inspired by the 'ringbuffy.c' from the
* LinuxDVB driver (see linuxtv.org). * 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" #include "ringbuffer.h"
@@ -188,7 +188,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
if (Count < 0) if (Count < 0)
data = (uchar *)Data; data = (uchar *)Data;
else { else {
data = new uchar[count]; data = MALLOC(uchar, count);
if (data) if (data)
memcpy(data, Data, count); memcpy(data, Data, count);
else else
@@ -199,7 +199,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
cFrame::~cFrame() cFrame::~cFrame()
{ {
delete data; free(data);
} }
// --- cRingBufferFrame ------------------------------------------------------ // --- cRingBufferFrame ------------------------------------------------------