DEVEL15-windows-ioctl-prefix-data-20080726

LICENSE MIT

The ioctl-prefix-data can be accessed either via a char_t or a wchar_t.
Copy the data buffer with memcpy() and not strcpy() because we need to
copy the entire string if it happens to be Unicode.

(cherry picked from commit eb1ff11bf14cfc64b4e224ef574d62e6e3757bc1)

diff --git a/src/WINNT/afsd/smb_ioctl.c b/src/WINNT/afsd/smb_ioctl.c
index 17f1ff85494f3d313c3f0ba2cd9977fdab64f7b5..adc463a5250af7e479e6c04125447a1ee1c50891 100644 (file)
--- a/src/WINNT/afsd/smb_ioctl.c
+++ b/src/WINNT/afsd/smb_ioctl.c
@@ -108,7 +108,7 @@ smb_SetupIoctlFid(smb_fid_t *fidp, cm_space_t *prefix)
     }
     if (prefix) {
         copyPrefix = cm_GetSpace();
-        StringCbCopy(copyPrefix->data, CM_UTILS_SPACESIZE, prefix->data);
+        memcpy(copyPrefix->data, prefix->data, CM_UTILS_SPACESIZE);
         fidp->ioctlp->prefix = copyPrefix;
     }
     lock_ReleaseMutex(&fidp->mx);
@@ -1116,7 +1116,6 @@ smb_IoctlSetACL(smb_ioctl_t *ioctlp, cm_user_t *userp)
     cm_scache_t *scp;
     afs_int32 code;
     cm_req_t req;
-    cm_ioctlQueryOptions_t *optionsp;
     afs_uint32 flags = 0;
 
     smb_InitReq(&req);