and the winner of "i should have just written it in assembly

is..."

don't use pstrcpy() when you are not dealing with pstrings.
(This used to be commit 7d547f50f914747291acc71fd3544ad92ce91f0e)

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 2a5f7ffd71afdef458105af491e2d23bf2120765..10241e88d95cb9c175ca6190e0ee8d166d50e180 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1028,9 +1028,9 @@ void DirCacheAdd( const char *path, char *name, char *dname, int snum )
                return;             /* so just return as if nothing happened. */
 
        /* Set pointers correctly and load values. */
-       entry->path  = pstrcpy( (char *)&entry[1], path);
-       entry->name  = pstrcpy( &(entry->path[pathlen]), name);
-       entry->dname = pstrcpy( &(entry->name[namelen]), dname);
+       entry->path  = memcpy( (char *)&entry[1], path, strlen(path) );
+       entry->name  = memcpy( &(entry->path[pathlen]), name, strlen(name) );
+       entry->dname = memcpy( &(entry->name[namelen]), dname, strlen(dname) );
        entry->snum  = snum;
 
        /* Add the new entry to the linked list. */