From 7dab2ed86b4950b45b84c0c09623cdd7cbf2abda Mon Sep 17 00:00:00 2001
From: "m. allan noah" <kitno455@gmail.com>
Date: Tue, 26 May 2009 08:53:02 -0400
Subject: [PATCH] clamp film type to allowed range (bug #311685)

---
 ChangeLog       | 3 +++
 backend/canon.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6ba58d44c..d25333dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-05-26 m. allan noah <kitno455 at gmail dot com>
+	* backend/canon.c: clamp film type to allowed range (bug #311685)
+
 2009-05-25 m. allan noah <kitno455 at gmail dot com>
 	* backend/fujitsu.[ch]: backend v94
 	- add side option to show which duplex image is being transferred
diff --git a/backend/canon.c b/backend/canon.c
index 22ffcdd07..c8bf9ca0f 100644
--- a/backend/canon.c
+++ b/backend/canon.c
@@ -253,6 +253,8 @@ get_tpu_stat (int fd, CANON_Device * dev)
   dev->tpu.Transparency = tbuf[4 + 4 + 5] * 256 + tbuf[5 + 4 + 5];
   dev->tpu.PosNeg = tbuf[6 + 4 + 5] & 0x01;
   dev->tpu.FilmType = tbuf[7 + 4 + 5];
+  if(dev->tpu.FilmType > 4)
+    dev->tpu.FilmType = 0;
 
   DBG (11, "TPU Status: %d\n", dev->tpu.Status);
   DBG (11, "TPU ControlMode: %d\n", dev->tpu.ControlMode);