Changeset 232 for branches/samba-3.2.x/source/smbd/trans2.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/smbd/trans2.c (modified) (9 diffs)

branches/samba-3.2.x/source/smbd/trans2.c

@@ -3675 +3675 @@
         unsigned int ofs = 0;
 
-        for (i=0; i<num_streams; i++) {
+        for (i = 0; i < num_streams && ofs <= max_data_bytes; i++) {
                 unsigned int next_offset;
                 size_t namelen;
@@ -3693 +3693 @@
 
                 namelen -= 2;
-
-                if (ofs + 24 + namelen > max_data_bytes) {
-                        TALLOC_FREE(namebuf);
-                        return NT_STATUS_BUFFER_TOO_SMALL;
-                }
 
                 SIVAL(data, ofs+4, namelen);
@@ -3712 +3707 @@
                 else {
                         unsigned int align = ndr_align_size(next_offset, 8);
-
-                        if (next_offset + align > max_data_bytes) {
-                                return NT_STATUS_BUFFER_TOO_SMALL;
-                        }
 
                         memset(data+next_offset, 0, align);
@@ -5353 +5344 @@
         char *base_name = NULL;
         bool dest_has_wcard = False;
+        SMB_STRUCT_STAT sbuf;
+        char *newname_last_component = NULL;
         NTSTATUS status = NT_STATUS_OK;
         char *p;
@@ -5360 +5353 @@
                 return NT_STATUS_INVALID_PARAMETER;
         }
+
+        ZERO_STRUCT(sbuf);
 
         overwrite = (CVAL(pdata,0) ? True : False);
@@ -5394 +5389 @@
 
         if (fsp && fsp->base_fsp) {
+                /* newname must be a stream name. */
                 if (newname[0] != ':') {
                         return NT_STATUS_NOT_SUPPORTED;
@@ -5404 +5400 @@
                 }
         } else {
+                /* newname must *not* be a stream name. */
                 if (is_ntfs_stream_name(newname)) {
                         return NT_STATUS_NOT_SUPPORTED;
@@ -5429 +5426 @@
                         return NT_STATUS_NO_MEMORY;
                 }
-        }
-
-        if (fsp) {
-                SMB_STRUCT_STAT sbuf;
-                char *newname_last_component = NULL;
-
-                ZERO_STRUCT(sbuf);
 
                 status = unix_convert(ctx, conn, newname, False,
-                                        &newname,
-                                        &newname_last_component,
-                                        &sbuf);
+                                &newname,
+                                &newname_last_component,
+                                &sbuf);
 
                 /* If an error we expect this to be
@@ -5450 +5440 @@
                         return status;
                 }
-
+        }
+
+        if (fsp) {
                 DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
                         fsp->fnum, fsp->fsp_name, base_name ));