From c6d7e6ad08a94709264d05b9cc8f266f07bc6851 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 27 Oct 2010 14:17:46 -0700 Subject: Fix for bug 7755 - SMBC_getdents_ctx() ignores struct alignment rules Based on a fix from Sven Neumann . Autobuild-User: Jeremy Allison Autobuild-Date: Wed Oct 27 22:02:11 UTC 2010 on sn-devel-104 --- source3/libsmb/libsmb_dir.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 7661ecf2f8..9398f92612 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -1050,6 +1050,7 @@ SMBC_getdents_ctx(SMBCCTX *context, while ((dirlist = dir->dir_next)) { struct smbc_dirent *dirent; + struct smbc_dirent *currentEntry = (struct smbc_dirent *)ndir; if (!dirlist->dirent) { @@ -1086,17 +1087,23 @@ SMBC_getdents_ctx(SMBCCTX *context, } - memcpy(ndir, dirent, reqd); /* Copy the data in ... */ + memcpy(currentEntry, dirent, reqd); /* Copy the data in ... */ - ((struct smbc_dirent *)ndir)->comment = - (char *)(&((struct smbc_dirent *)ndir)->name + - dirent->namelen + - 1); + currentEntry->comment = ¤tEntry->name[0] + + dirent->namelen + 1; ndir += reqd; - rem -= reqd; + /* Try and align the struct for the next entry + on a valid pointer boundary by appending zeros */ + while((rem > 0) && ((unsigned long long)ndir & (sizeof(void*) - 1))) { + *ndir = '\0'; + rem--; + ndir++; + currentEntry->dirlen++; + } + dir->dir_next = dirlist = dirlist -> next; } -- cgit