rpms/cups/F-11 cups-negative-snmp-string-length.patch, NONE, 1.1 cups.spec, 1.546, 1.547

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added 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 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-negative-snmp-string-length.patch ---
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
@@ -170,9 +170,13 @@ backendNetworkSideCB(
 
 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    i = (int)(sizeof(data) - (dataptr - data));
-		    if (packet.object_value.string.num_bytes < i)
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));
 
 		    memcpy(dataptr, packet.object_value.string.bytes, i);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -p -r1.546 -r1.547
--- cups.spec	8 Dec 2009 10:56:17 -0000	1.546
+++ cups.spec	8 Dec 2009 11:04:57 -0000	1.547
@@ -65,6 +65,7 @@ Patch51: cups-str3413.patch
 Patch52: cups-str3439.patch
 Patch53: cups-str3440.patch
 Patch54: cups-str3442.patch
+Patch55: cups-negative-snmp-string-length.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -234,6 +235,7 @@ module. 
 %patch52 -p1 -b .str3439
 %patch53 -p1 -b .str3440
 %patch54 -p1 -b .str3442
+%patch55 -p1 -b .negative-snmp-string-length
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,6 +528,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * 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).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).