From 75861a97bce2baf43f63feb551505d187cd55bbd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 8 Mar 2011 15:38:58 +0100
Subject: [PATCH] Removed checking for minimum line length of 21 characters in
 the LIRC receiver code

---
 CONTRIBUTORS | 4 ++++
 HISTORY      | 4 +++-
 lirc.c       | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e0bc748e..a3c98c1e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2665,3 +2665,7 @@ Milan Cvijanovic <elcom_cvijo@hotmail.com>
 
 Frank Neumann <frank.neumann@hp.com>
  for suggesting to reduce the thread and I/O priority cCuttingThread::Action()
+
+Gerald Dachs <vdr@dachsweb.de>
+ for reporting a problem with checking for minimum line length of 21 characters in
+ the LIRC receiver code
diff --git a/HISTORY b/HISTORY
index 9530aee6..2f4a87cb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6481,7 +6481,7 @@ Video Disk Recorder Revision History
   from Osama Alrawab). See INSTALL for information on how to turn this on.
 - Added Arabian language texts (thanks to Osama Alrawab).
 
-2011-03-06: Version 1.7.17
+2011-03-08: Version 1.7.17
 
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
@@ -6549,3 +6549,5 @@ Video Disk Recorder Revision History
   patch from Manuel Reimer).
 - Now reducing the thread and I/O priority cCuttingThread::Action() to make the
   foreground process more responsive (suggested by Frank Neumann).
+- Removed checking for minimum line length of 21 characters in the LIRC receiver code
+  (reported by Gerald Dachs).
diff --git a/lirc.c b/lirc.c
index c4838b16..e3b68db9 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.15 2006/05/28 08:48:13 kls Exp $
+ * $Id: lirc.c 2.1 2011/03/08 15:35:13 kls Exp $
  */
 
 #include "lirc.h"
@@ -86,7 +86,8 @@ void cLircRemote::Action(void)
                  }
            }
 
-        if (ready && ret > 21) {
+        if (ready && ret > 0) {
+           buf[ret - 1] = 0;
            int count;
            char KeyName[LIRC_KEY_BUF];
            if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { // '29' in '%29s' is LIRC_KEY_BUF-1!