From f0ab92c318b292c6c2ddd595d488b5ac432c62b2 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Dec 08 2009 11:16:47 +0000
Subject: - Use upstream patch to handle negative SNMP string lengths (rev 8896).


---

diff --git a/cups-negative-snmp-string-length.patch b/cups-negative-snmp-string-length.patch
index 053f246..5d94fbb 100644
--- a/cups-negative-snmp-string-length.patch
+++ b/cups-negative-snmp-string-length.patch
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
 --- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
-+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
++++ cups-1.4.2/backend/network.c	2009-12-08 11:14:45.010363459 +0000
 @@ -170,9 +170,13 @@ backendNetworkSideCB(
  
  	        case CUPS_ASN1_BIT_STRING :
@@ -17,3 +17,15 @@ diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/bac
  
  		    memcpy(dataptr, packet.object_value.string.bytes, i);
  
+diff -up cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length cups-1.4.2/backend/snmp-supplies.c
+--- cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length	2009-08-31 17:34:06.000000000 +0100
++++ cups-1.4.2/backend/snmp-supplies.c	2009-12-08 11:15:05.505362685 +0000
+@@ -232,6 +232,8 @@ backendSNMPSupplies(
+     if (packet.object_value.string.num_bytes == 2)
+       new_state = (packet.object_value.string.bytes[0] << 8) |
+ 		  packet.object_value.string.bytes[1];
++    else if (packet.object_value.string.num_bytes == 1)
++      new_state = (packet.object_value.string.bytes[0] << 8);
+     else
+       new_state = 0;
+