rpms/cups/F-12 cups-negative-snmp-string-length.patch,1.1,1.2

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22872

Modified Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c       |    8 ++++++--
 snmp-supplies.c |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: cups-negative-snmp-string-length.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-negative-snmp-string-length.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-negative-snmp-string-length.patch	8 Dec 2009 11:05:54 -0000	1.1
+++ cups-negative-snmp-string-length.patch	8 Dec 2009 11:16:32 -0000	1.2
@@ -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.ne
  
  		    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;
+