summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-09-15 21:22:15 +0000
committerJeremy Allison <jra@samba.org>2003-09-15 21:22:15 +0000
commitf208ab8ac24efd1cf34d01d6718cf2d9aa065b13 (patch)
treee28deb84f870c300226f9eccf42fed62cb1ed7fe
parent4fd86794ecf4249ce04a3fbb57d3524fdfaa058d (diff)
downloadsamba-f208ab8ac24efd1cf34d01d6718cf2d9aa065b13.tar.gz
samba-f208ab8ac24efd1cf34d01d6718cf2d9aa065b13.tar.bz2
samba-f208ab8ac24efd1cf34d01d6718cf2d9aa065b13.zip
Ensure HEAD is also up to date.
Fix OOPS when dealing with mangled names reported by several users. This was my bug when removing a redundant strlen. Jeremy. (This used to be commit 3b3e19f66f783016ca3bc2d9e76328732ed4a84b)
-rw-r--r--source3/smbd/mangle_hash2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index 9cd0438d51..e0efb3e41b 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -53,7 +53,7 @@
#include "includes.h"
-#if 0
+#if 1
#define M_DEBUG(level, x) DEBUG(level, x)
#else
#define M_DEBUG(level, x)
@@ -219,7 +219,7 @@ static BOOL is_mangled_component(const char *name, size_t len)
if (len > 8) {
if (name[8] != '.')
return False;
- for (i=9; name[i]; i++) {
+ for (i=9; name[i] && i < len; i++) {
if (! FLAG_CHECK(name[i], FLAG_ASCII)) {
return False;
}