Merged fix for #179

3 files changed, 3 insertions, 10 deletions

diff --git a/HISTORY b/HISTORY
index c61e0e6..2a1a911 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ VDR Plugin 'osdteletext' Revision History
 20xx-xx-xx: version x.x.x
 - Updated Italian translation provided by Diego Pierotto (Closes #151)
 - Fix valid page number check in TeletextBrowser::ExecuteAction (Closes #154)
+- Fixed possible segfault (Closes #179) - (Thx to Manuel Reimer)
 
 2009-06-02: version 0.8.3
 - Updated Ukrainian translation provided by Yarema P. aka Knedlyk (Closes #133)
diff --git a/txtrecv.c b/txtrecv.c
index 19bec60..1d4c66a 100644
--- a/txtrecv.c
+++ b/txtrecv.c
@@ -583,15 +583,8 @@ void cTxtReceiver::Activate(bool On)
 
 void cTxtReceiver::Receive(uchar *Data, int Length)
 {
-   int len = Length+60;
-
-   if (!buffer.Check(len)) {
-      // Buffer overrun
-      buffer.Signal();
-      return;
-   }
-   cFrame *frame=new cFrame(Data, len);
-   if (frame && !buffer.Put(frame)) {
+   cFrame *frame=new cFrame(Data, Length);
+   if (!buffer.Put(frame)) {
       // Buffer overrun
       delete frame;
       buffer.Signal();
diff --git a/txtrecv.h b/txtrecv.h
index ec274ea..cebf375 100644
--- a/txtrecv.h
+++ b/txtrecv.h
@@ -157,7 +157,6 @@ class cRingTxtFrames : public cRingBufferFrame {
   ~cRingTxtFrames() { Clear(); };
   void Wait(void) { WaitForGet(); };
   void Signal(void) { EnableGet(); };
-  bool Check(int Size) { return (Free() >= Size); };
 };
 
 class cTxtReceiver : public cReceiver, public cThread {