Changeset 22 for trunk/samba/source/librpc/ndr/ndr.c

Timestamp:

Mar 25, 2007, 5:18:51 PM (19 years ago)

Author:

Yuri Dario

Message:

Source code upgrade to 3.0.25pre2.

File:

• trunk/samba/source/librpc/ndr/ndr.c (modified) (1 diff)

trunk/samba/source/librpc/ndr/ndr.c

@@ -161 +161 @@
 
 /*
-  expand the available space in the buffer to 'size'
-*/
-NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t size)
-{
+  expand the available space in the buffer to ndr->offset + extra_size
+*/
+NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size)
+{
+        uint32_t size = extra_size + ndr->offset;
+
+        if (size < ndr->offset) {
+                /* extra_size overflowed the offset */
+                return ndr_push_error(ndr, NDR_ERR_BUFSIZE, "Overflow in push_expand to %u",
+                                        size);
+        }
+
         if (ndr->alloc_size > size) {
                 return NT_STATUS_OK;