Merge changes from CUPS 1.5svn-r8916.

[thirdparty/cups.git] / backend / network.c

diff --git a/backend/network.c b/backend/network.c
index e5cb16d1a68f62dd47800b328b5da063be816640..0a4908a77e03da8ffac70d70b0d569627d8e221d 100644 (file)
--- a/backend/network.c
+++ b/backend/network.c
@@ -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);