Merge final 1.4.0 (r8761) changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1629 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 10 insertions, 3 deletions

diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index dfb9c9c70..46499db45 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -196,12 +196,19 @@ backendGetDeviceID(
       * and then limit the length to the size of our buffer...
       */
 
-      if (length > (device_id_size - 2))
+      if (length > device_id_size)
 	length = (((unsigned)device_id[1] & 255) << 8) +
 		 ((unsigned)device_id[0] & 255);
 
-      if (length > (device_id_size - 2))
-	length = device_id_size - 2;
+      if (length > device_id_size)
+	length = device_id_size;
+
+     /*
+      * The length field counts the number of bytes in the string
+      * including the length field itself (2 bytes).
+      */
+
+      length -= 2;
 
      /*
       * Copy the device ID text to the beginning of the buffer and