libndr: fix ndr_size_* calculation with relative reverse buffers
authorStefan Metzmacher <metze@samba.org>
Thu, 18 Feb 2010 14:13:20 +0000 (15:13 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 19 Feb 2010 11:30:24 +0000 (12:30 +0100)
metze
(cherry picked from commit 8310f02414efd3b792857ed20c636c4c114e1ba2)

librpc/ndr/ndr.c

index f1ff5971afcabdf6b02967ad6b908930aab479ef..ab4168a0f9447bfd8bcec216fd742d5cd7d383e8 100644 (file)
@@ -1111,6 +1111,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons
                return NDR_ERR_SUCCESS;
        }
 
+       if (ndr->flags & LIBNDR_FLAG_NO_NDR_SIZE) {
+               /* better say more than calculation a too small buffer */
+               NDR_PUSH_ALIGN(ndr, 8);
+               return NDR_ERR_SUCCESS;
+       }
+
        if (ndr->relative_end_offset < ndr->offset) {
                return ndr_push_error(ndr, NDR_ERR_RELATIVE,
                                      "ndr_push_relative_ptr2_end:"