Changeset 988 for vendor/current/lib/tdr

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/lib/tdr

Files:

• tdr.c (modified) (8 diffs)
• testsuite.c (modified) (1 diff)

vendor/current/lib/tdr/tdr.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
@@ -6 +6 @@
 
    Copyright (C) Jelmer Vernooij 2005
-   
+
    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/>.
@@ -163 +163 @@
 
         TDR_PULL_NEED_BYTES(tdr, el_size*length);
-        
-        if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
+
+        if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret)) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -175 +175 @@
 NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
 {
-        size_t ret, required;
+        size_t required, size = 0;
+        bool ret;
 
         if (length == -1) {
@@ -184 +185 @@
         TDR_PUSH_NEED_BYTES(tdr, required);
 
-        ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, false);
-        if (ret == -1) {
+        ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, &size);
+        if (ret == false) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
 
         /* Make sure the remaining part of the string is filled with zeroes */
-        if (ret < required) {
-                memset(tdr->data.data+tdr->data.length+ret, 0, required-ret);
-        }
-        
+        if (size < required) {
+                memset(tdr->data.data+tdr->data.length+size, 0, required-size);
+        }
+
         tdr->data.length += required;
-                                                 
+
         return NT_STATUS_OK;
 }
@@ -297 +298 @@
 
 /*
-  push a DATA_BLOB onto the wire. 
+  push a DATA_BLOB onto the wire.
 */
 NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob)
@@ -310 +311 @@
 
         TDR_PUSH_NEED_BYTES(tdr, blob->length);
-        
+
         memcpy(tdr->data.data+tdr->data.length, blob->data, blob->length);
         return NT_STATUS_OK;
@@ -316 +317 @@
 
 /*
-  pull a DATA_BLOB from the wire. 
+  pull a DATA_BLOB from the wire.
 */
 NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob)

vendor/current/lib/tdr/testsuite.c

@@ -21 +21 @@
 #include "includes.h"
 #include "torture/torture.h"
+#include "torture/local/proto.h"
 #include "lib/tdr/tdr.h"