Changeset 988 for vendor/current/librpc/ndr/ndr.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/librpc/ndr/ndr.c (modified) (6 diffs)

vendor/current/librpc/ndr/ndr.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
@@ -5 +5 @@
 
    Copyright (C) Andrew Tridgell 2003
-   
+   Copyright (C) Jelmer Vernooij 2005-2008
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -30 +31 @@
 #include "librpc/ndr/libndr.h"
 #include "../lib/util/dlinklist.h"
-#if _SAMBA_BUILD_ == 4
-#include "param/param.h"
-#endif
 
 #define NDR_BASE_MARSHALL_SIZE 1024
 
 /* this guid indicates NDR encoding in a protocol tower */
-const struct ndr_syntax_id ndr_transfer_syntax = {
+const struct ndr_syntax_id ndr_transfer_syntax_ndr = {
   { 0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8}, {0x08,0x00,0x2b,0x10,0x48,0x60} },
   2
 };
 
-const struct ndr_syntax_id ndr64_transfer_syntax = {
+const struct ndr_syntax_id ndr_transfer_syntax_ndr64 = {
   { 0x71710533, 0xbeba, 0x4937, {0x83, 0x19}, {0xb5,0xdb,0xef,0x9c,0xcc,0x36} },
   1
 };
 
-const struct ndr_syntax_id null_ndr_syntax_id = {
+const struct ndr_syntax_id ndr_syntax_id_null = {
   { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } },
   0
@@ -225 +223 @@
         ndr->data = talloc_array(ndr, uint8_t, ndr->alloc_size);
         if (!ndr->data) {
+                talloc_free(ndr);
                 return NULL;
         }
@@ -638 +637 @@
                 NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &content_size));
                 if (size_is >= 0 && size_is != content_size) {
-                        return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) size_is(%d) mismatch content_size %d", 
-                                                (int)size_is, (int)content_size);
+                        return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) size_is(%d) (0x%04x) mismatch content_size %d (0x%04x)",
+                                                (int)size_is, (int)size_is,
+                                                (int)content_size,
+                                                (int)content_size);
                 }
                 r_content_size = content_size;
@@ -649 +650 @@
                 NDR_CHECK(ndr_pull_uint3264(ndr, NDR_SCALARS, &content_size));
                 if (size_is >= 0 && size_is != content_size) {
-                        return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) size_is(%d) mismatch content_size %d", 
-                                                (int)size_is, (int)content_size);
+                        return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) size_is(%d) (0x%08x) mismatch content_size %d (0x%08x)",
+                                                (int)size_is, (int)size_is,
+                                                (int)content_size,
+                                                (int)content_size);
                 }
                 r_content_size = content_size;