summaryrefslogtreecommitdiff
path: root/backend/snmp-supplies.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-09-24 23:50:39 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-09-24 23:50:39 +0000
commit18ecb4282108afe096df4958d992c80bb5f2b570 (patch)
treed41d1b895293498ec62aa785616eb291919db0cf /backend/snmp-supplies.c
parent7a0cbd5e5715d715c3fddfaace2f800ef820d328 (diff)
Merge changes from CUPS 1.5svn-r8829.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1695 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/snmp-supplies.c')
-rw-r--r--backend/snmp-supplies.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 684ff54b5..6be80ee14 100644
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -229,8 +229,11 @@ backendSNMPSupplies(
packet.object_type != CUPS_ASN1_OCTET_STRING)
return (-1);
- new_state = (packet.object_value.string.bytes[0] << 8) |
- packet.object_value.string.bytes[1];
+ if (packet.object_value.string.num_bytes == 2)
+ new_state = (packet.object_value.string.bytes[0] << 8) |
+ packet.object_value.string.bytes[1];
+ else
+ new_state = 0;
if (current_state < 0)
change_state = 0xffff;