r1414 - in vdr/vdr/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-11-02 16:37:22 +0000 (Wed, 02 Nov 2005)
New Revision: 1414

Added:
   vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr: Added 16_recordings.c-fix.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-11-02 16:29:01 UTC (rev 1413)
+++ vdr/vdr/trunk/debian/changelog	2005-11-02 16:37:22 UTC (rev 1414)
@@ -7,6 +7,7 @@
       + Removed 16_avoidTrashing.dpatch
       + Removed 18_vdr-1.3.33-recordingsmenu.dpatch
       + Removed 19_vdr-1.3.33-recordingsupdate.dpatch
+      + Added 16_recordings.c-fix.dpatch
     - Corrected FSF Address in debian/copyright
     - Call dh_installman in binary-indep target in debian/rules, to 
       (re-)include 2 missing manpages

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-11-02 16:29:01 UTC (rev 1413)
+++ vdr/vdr/trunk/debian/patches/00list	2005-11-02 16:37:22 UTC (rev 1414)
@@ -12,6 +12,7 @@
 12_osdbase-maxitems
 13_epgfix
 15_dvbplayer
+16_recordings.c-fix
 17_replay
 22_vdr-playerepg
 

Added: vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch	2005-11-02 16:29:01 UTC (rev 1413)
+++ vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch	2005-11-02 16:37:22 UTC (rev 1414)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 16_recordings.c-fix.dpatch by Joachim Wilke <joachim.wilke at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes segfault which occured when reaching the end of a replay
+
+ at DPATCH@
+diff -urNad vdr-1.3.35/recording.c /tmp/dpep.eegJOQ/vdr-1.3.35/recording.c
+--- vdr-1.3.35/recording.c	2005-10-31 13:27:58.000000000 +0100
++++ /tmp/dpep.eegJOQ/vdr-1.3.35/recording.c	2005-11-02 17:31:31.299956520 +0100
+@@ -1342,7 +1342,7 @@
+         // found a non existing file suffix
+         }
+      if (Open() >= 0) {
+-        if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
++        if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
+            LOG_ERROR_STR(fileName);
+            return NULL;
+            }


Property changes on: vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *