Changeset 916 for trunk/server/source3/smbd/nttrans.c

Timestamp:

Jun 6, 2016, 8:53:52 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to version 3.6.25, fix some more crlf issues

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/nttrans.c (modified) (3 diffs)

trunk/server/source3/smbd/nttrans.c

@@ -2304 +2304 @@
                         *out_len = 16;
                 } else {
-                        *out_len = 12 + labels_data_count + 4;
+                        *out_len = 12 + labels_data_count;
                 }
 
@@ -2314 +2314 @@
                 }
 
-                cur_pdata = talloc_array(ctx, char, *out_len);
+                cur_pdata = talloc_zero_array(ctx, char, *out_len);
                 if (cur_pdata == NULL) {
                         TALLOC_FREE(shadow_data);
@@ -2331 +2331 @@
 
                 /* needed_data_count 4 bytes */
-                SIVAL(cur_pdata, 8, labels_data_count + 4);
+                SIVAL(cur_pdata, 8, labels_data_count);
 
                 cur_pdata += 12;