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.

diff --git a/source/smbd/mangle_hash2.c b/source/smbd/mangle_hash2.c
index 9cd0438d5134425bc7db64cc0656a0ec5f264c3c..e0efb3e41bc9a686cb188dbf7c4c2057f77cb471 100644 (file)
--- a/source/smbd/mangle_hash2.c
+++ b/source/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;
                        }