diff --git a/source/java/org/alfresco/filesys/smb/SMBStatus.java b/source/java/org/alfresco/filesys/smb/SMBStatus.java
index ffaba0c907..b7f3f9530c 100644
--- a/source/java/org/alfresco/filesys/smb/SMBStatus.java
+++ b/source/java/org/alfresco/filesys/smb/SMBStatus.java
@@ -68,209 +68,210 @@ public final class SMBStatus
 
     // Error classes
 
-    public static final int Success = 0x00;
-    public static final int ErrDos = 0x01;
-    public static final int ErrSrv = 0x02;
-    public static final int ErrHrd = 0x03;
-    public static final int NetErr = 0x04;
-    public static final int JLANErr = 0x05;
-    public static final int NTErr = 0x06;
-    public static final int DCERPCErr = 0x07;
-    public static final int Win32Err = 0x08;
+    public static final int Success 	= 0x00;
+    public static final int ErrDos 		= 0x01;
+    public static final int ErrSrv 		= 0x02;
+    public static final int ErrHrd 		= 0x03;
+    public static final int NetErr 		= 0x04;
+    public static final int JLANErr 	= 0x05;
+    public static final int NTErr 		= 0x06;
+    public static final int DCERPCErr 	= 0x07;
+    public static final int Win32Err 	= 0x08;
 
-    public static final int ErrCmd = 0xFF;
+    public static final int ErrCmd 		= 0xFF;
 
     // Mask for NT severity
 
-    public static final int NT_SEVERITY_MASK = 0xF0000000;
-    public static final int NT_ERROR_MASK = 0x0FFFFFFF;
+    public static final int NT_SEVERITY_MASK 	= 0xF0000000;
+    public static final int NT_ERROR_MASK 		= 0x0FFFFFFF;
 
     // DOS error codes.
 
-    public static final int DOSInvalidFunc = 1;
-    public static final int DOSFileNotFound = 2;
-    public static final int DOSDirectoryInvalid = 3;
-    public static final int DOSTooManyOpenFiles = 4;
-    public static final int DOSAccessDenied = 5;
-    public static final int DOSInvalidHandle = 6;
-    public static final int DOSMemCtrlBlkDestoyed = 7;
-    public static final int DOSInsufficientMem = 8;
-    public static final int DOSInvalidAddress = 9;
-    public static final int DOSInvalidEnv = 10;
-    public static final int DOSInvalidFormat = 11;
-    public static final int DOSInvalidOpenMode = 12;
-    public static final int DOSInvalidData = 13;
-    public static final int DOSInvalidDrive = 15;
-    public static final int DOSDeleteSrvDir = 16;
-    public static final int DOSNotSameDevice = 17;
-    public static final int DOSNoMoreFiles = 18;
-    public static final int DOSFileSharingConflict = 32;
-    public static final int DOSLockConflict = 33;
-    public static final int DOSFileAlreadyExists = 80;
-    public static final int DOSUnknownInfoLevel = 124;
-    public static final int DOSDirectoryNotEmpty = 145;
-    public static final int DOSNotLocked = 158;
+    public static final int DOSInvalidFunc 				= 1;
+    public static final int DOSFileNotFound 			= 2;
+    public static final int DOSDirectoryInvalid 		= 3;
+    public static final int DOSTooManyOpenFiles 		= 4;
+    public static final int DOSAccessDenied 			= 5;
+    public static final int DOSInvalidHandle 			= 6;
+    public static final int DOSMemCtrlBlkDestoyed 		= 7;
+    public static final int DOSInsufficientMem 			= 8;
+    public static final int DOSInvalidAddress 			= 9;
+    public static final int DOSInvalidEnv 				= 10;
+    public static final int DOSInvalidFormat 			= 11;
+    public static final int DOSInvalidOpenMode 			= 12;
+    public static final int DOSInvalidData 				= 13;
+    public static final int DOSInvalidDrive 			= 15;
+    public static final int DOSDeleteSrvDir 			= 16;
+    public static final int DOSNotSameDevice 			= 17;
+    public static final int DOSNoMoreFiles 				= 18;
+    public static final int DOSFileSharingConflict 		= 32;
+    public static final int DOSLockConflict 			= 33;
+    public static final int DOSFileAlreadyExists 		= 80;
+    public static final int DOSUnknownInfoLevel 		= 124;
+    public static final int DOSDirectoryNotEmpty 		= 145;
+    public static final int DOSNotLocked 				= 158;
 
     // Server error codes
 
-    public static final int SRVNonSpecificError = 1;
-    public static final int SRVBadPassword = 2;
-    public static final int SRVNoAccessRights = 4;
-    public static final int SRVInvalidTID = 5;
-    public static final int SRVInvalidNetworkName = 6;
-    public static final int SRVInvalidDevice = 7;
-    public static final int SRVPrintQueueFullFiles = 49;
-    public static final int SRVPrintQueueFullSpace = 50;
-    public static final int SRVEOFOnPrintQueueDump = 51;
-    public static final int SRVInvalidPrintFID = 52;
-    public static final int SRVUnrecognizedCommand = 64;
-    public static final int SRVInternalServerError = 65;
-    public static final int SRVFIDAndPathInvalid = 67;
-    public static final int SRVInvalidAccessPerm = 69;
-    public static final int SRVInvalidAttributeMode = 70;
-    public static final int SRVServerPaused = 81;
-    public static final int SRVNotReceivingMessages = 82;
-    public static final int SRVNoBuffers = 83;
-    public static final int SRVTooManyRemoteNames = 87;
-    public static final int SRVTimedOut = 88;
-    public static final int SRVNoResourcesAvailable = 89;
-    public static final int SRVTooManyUIDs = 90;
-    public static final int SRVInvalidUID = 91;
-    public static final int SRVNoRAWUseMPX = 250;
-    public static final int SRVNoRAWUseStdReadWrite = 251;
-    public static final int SRVContinueInMPXMode = 252;
-    public static final int SRVNotSupported = 65535;
+    public static final int SRVNonSpecificError 		= 1;
+    public static final int SRVBadPassword 				= 2;
+    public static final int SRVNoAccessRights 			= 4;
+    public static final int SRVInvalidTID 				= 5;
+    public static final int SRVInvalidNetworkName 		= 6;
+    public static final int SRVInvalidDevice 			= 7;
+    public static final int SRVPrintQueueFullFiles 		= 49;
+    public static final int SRVPrintQueueFullSpace 		= 50;
+    public static final int SRVEOFOnPrintQueueDump 		= 51;
+    public static final int SRVInvalidPrintFID 			= 52;
+    public static final int SRVUnrecognizedCommand 		= 64;
+    public static final int SRVInternalServerError 		= 65;
+    public static final int SRVFIDAndPathInvalid 		= 67;
+    public static final int SRVInvalidAccessPerm 		= 69;
+    public static final int SRVInvalidAttributeMode 	= 70;
+    public static final int SRVServerPaused 			= 81;
+    public static final int SRVNotReceivingMessages 	= 82;
+    public static final int SRVNoBuffers 				= 83;
+    public static final int SRVTooManyRemoteNames 		= 87;
+    public static final int SRVTimedOut 				= 88;
+    public static final int SRVNoResourcesAvailable 	= 89;
+    public static final int SRVTooManyUIDs 				= 90;
+    public static final int SRVInvalidUID 				= 91;
+    public static final int SRVNoRAWUseMPX 				= 250;
+    public static final int SRVNoRAWUseStdReadWrite 	= 251;
+    public static final int SRVContinueInMPXMode 		= 252;
+    public static final int SRVNotSupported 			= 65535;
 
     // Hardware error codes.
 
-    public static final int HRDWriteProtected = 19;
-    public static final int HRDUnknownUnit = 20;
-    public static final int HRDDriveNotReady = 21;
-    public static final int HRDUnknownCommand = 22;
-    public static final int HRDDataError = 23;
-    public static final int HRDBadRequestLength = 24;
-    public static final int HRDSeekError = 25;
-    public static final int HRDUnknownMediaType = 26;
-    public static final int HRDSectorNotFound = 27;
-    public static final int HRDPrinterOutOfPaper = 28;
-    public static final int HRDWriteFault = 29;
-    public static final int HRDReadFault = 30;
-    public static final int HRDGeneralFailure = 31;
-    public static final int HRDOpenConflict = 32;
-    public static final int HRDLockConflict = 33;
-    public static final int HRDWrongDiskInDrive = 34;
-    public static final int HRDNoFCBsAvailable = 35;
-    public static final int HRDSharingBufferOverrun = 36;
+    public static final int HRDWriteProtected 			= 19;
+    public static final int HRDUnknownUnit 				= 20;
+    public static final int HRDDriveNotReady 			= 21;
+    public static final int HRDUnknownCommand 			= 22;
+    public static final int HRDDataError 				= 23;
+    public static final int HRDBadRequestLength 		= 24;
+    public static final int HRDSeekError 				= 25;
+    public static final int HRDUnknownMediaType 		= 26;
+    public static final int HRDSectorNotFound 			= 27;
+    public static final int HRDPrinterOutOfPaper 		= 28;
+    public static final int HRDWriteFault 				= 29;
+    public static final int HRDReadFault 				= 30;
+    public static final int HRDGeneralFailure 			= 31;
+    public static final int HRDOpenConflict 			= 32;
+    public static final int HRDLockConflict 			= 33;
+    public static final int HRDWrongDiskInDrive 		= 34;
+    public static final int HRDNoFCBsAvailable 			= 35;
+    public static final int HRDSharingBufferOverrun 	= 36;
 
     // Network error codes
 
-    public static final int NETAccessDenied = 5;
-    public static final int NETInvalidHandle = 6;
-    public static final int NETUnsupported = 50;
-    public static final int NETNetAccessDenied = 65;
-    public static final int NETBadDeviceType = 66;
-    public static final int NETBadNetworkName = 67;
-    public static final int NETAlreadyAssigned = 85;
-    public static final int NETInvalidPassword = 86;
-    public static final int NETInvParameter = 87;
-    public static final int NETContinued = 234;
-    public static final int NETNoMoreItems = 259;
-    public static final int NETInvalidAddress = 487;
-    public static final int NETServiceDoesNotExist = 1060;
-    public static final int NETBadDevice = 1200;
-    public static final int NETNoNetOrBadPath = 1203;
-    public static final int NETExtendedError = 1208;
-    public static final int NETNoNetwork = 1222;
-    public static final int NETCancelled = 1223;
-    public static final int NETSrvNotRunning = 2114;
-    public static final int NETBufferTooSmall = 2123;
-    public static final int NETNoTransactions = 2141;
-    public static final int NETInvQueueName = 2150;
-    public static final int NETNoSuchPrintJob = 2151;
-    public static final int NETNotResponding = 2160;
-    public static final int NETSpoolerNotStarted = 2161;
-    public static final int NETCannotPerformOp = 2164;
-    public static final int NETErrLoadLogonScript = 2212;
-    public static final int NETLogonNotValidated = 2214;
-    public static final int NETLogonSrvOldSoftware = 2217;
-    public static final int NETUserNameNotFound = 2221;
-    public static final int NETUserLgnWkNotAllowed = 2240;
-    public static final int NETUserLgnTimeNotAllowed = 2241;
-    public static final int NETUserPasswordExpired = 2242;
-    public static final int NETPasswordCannotChange = 2243;
-    public static final int NETPasswordTooShort = 2246;
+    public static final int NETAccessDenied 			= 5;
+    public static final int NETInvalidHandle 			= 6;
+    public static final int NETUnsupported 				= 50;
+    public static final int NETNetAccessDenied 			= 65;
+    public static final int NETBadDeviceType 			= 66;
+    public static final int NETBadNetworkName 			= 67;
+    public static final int NETAlreadyAssigned 			= 85;
+    public static final int NETInvalidPassword 			= 86;
+    public static final int NETInvParameter 			= 87;
+    public static final int NETContinued 				= 234;
+    public static final int NETNoMoreItems 				= 259;
+    public static final int NETInvalidAddress 			= 487;
+    public static final int NETServiceDoesNotExist 		= 1060;
+    public static final int NETBadDevice 				= 1200;
+    public static final int NETNoNetOrBadPath 			= 1203;
+    public static final int NETExtendedError 			= 1208;
+    public static final int NETNoNetwork 				= 1222;
+    public static final int NETCancelled 				= 1223;
+    public static final int NETSrvNotRunning 			= 2114;
+    public static final int NETBufferTooSmall 			= 2123;
+    public static final int NETNoTransactions 			= 2141;
+    public static final int NETInvQueueName 			= 2150;
+    public static final int NETNoSuchPrintJob 			= 2151;
+    public static final int NETNotResponding 			= 2160;
+    public static final int NETSpoolerNotStarted 		= 2161;
+    public static final int NETCannotPerformOp 			= 2164;
+    public static final int NETErrLoadLogonScript 		= 2212;
+    public static final int NETLogonNotValidated 		= 2214;
+    public static final int NETLogonSrvOldSoftware 		= 2217;
+    public static final int NETUserNameNotFound 		= 2221;
+    public static final int NETUserLgnWkNotAllowed 		= 2240;
+    public static final int NETUserLgnTimeNotAllowed 	= 2241;
+    public static final int NETUserPasswordExpired 		= 2242;
+    public static final int NETPasswordCannotChange 	= 2243;
+    public static final int NETPasswordTooShort 		= 2246;
 
     // JLAN error codes
 
-    public static final int JLANUnsupportedDevice = 1;
-    public static final int JLANNoMoreSessions = 2;
-    public static final int JLANSessionNotActive = 3;
-    public static final int JLANInvalidSMBReceived = 4;
-    public static final int JLANLargeFilesNotSupported = 5;
-    public static final int JLANInvalidFileInfo = 6;
-    public static final int JLANDceRpcNotSupported = 7;
+    public static final int JLANUnsupportedDevice 		= 1;
+    public static final int JLANNoMoreSessions 			= 2;
+    public static final int JLANSessionNotActive 		= 3;
+    public static final int JLANInvalidSMBReceived 		= 4;
+    public static final int JLANLargeFilesNotSupported 	= 5;
+    public static final int JLANInvalidFileInfo 		= 6;
+    public static final int JLANDceRpcNotSupported 		= 7;
 
     // NT 32-bit status code
 
     public static final int NTSuccess = 0;
 
-    public static final int NTNotImplemented = 0xC0000002;
-    public static final int NTInvalidInfoClass = 0xC0000003;
-    public static final int NTInvalidParameter = 0xC000000D;
-    public static final int NTNoSuchFile = 0xC000000F;
-    public static final int NTInvalidDeviceRequest = 0xC0000010;
-    public static final int NTMoreProcessingRequired = 0xC0000016;
-    public static final int NTAccessDenied = 0xC0000022;
-    public static final int NTBufferTooSmall = 0xC0000023;
-    public static final int NTObjectNameInvalid = 0xC0000033;
-    public static final int NTObjectNotFound = 0xC0000034;
-    public static final int NTObjectNameCollision = 0xC0000035;
-    public static final int NTObjectPathNotFound = 0xC000003A;
-    public static final int NTSharingViolation = 0xC0000043;
-    public static final int NTLockConflict = 0xC0000054;
-    public static final int NTLockNotGranted = 0xC0000055;
-    public static final int NTLogonFailure = 0xC000006D;
-    public static final int NTAccountDisabled = 0xC0000072;
-    public static final int NTNoneMapped = 0xC0000073;
-    public static final int NTInvalidSecDescriptor = 0xC0000079;
-    public static final int NTRangeNotLocked = 0xC000007E;
-    public static final int NTDiskFull = 0xC000007F;
-    public static final int NTPipeBusy = 0xC00000AE;
-    public static final int NTNotSupported = 0xC00000BB;
-    public static final int NTBadDeviceType = 0xC00000CB;
-    public static final int NTBadNetName = 0xC00000CC;
-    public static final int NTRequestNotAccepted = 0xC00000D0;
-    public static final int NTNoSuchDomain = 0xC00000DF;
-    public static final int NTTooManyOpenFiles = 0xC000011F;
-    public static final int NTCancelled = 0xC0000120;
-    public static final int NTFileOffline = 0xC0000267;
+    public static final int NTNotImplemented 			= 0xC0000002;
+    public static final int NTInvalidInfoClass 			= 0xC0000003;
+    public static final int NTInvalidParameter 			= 0xC000000D;
+    public static final int NTNoSuchFile 				= 0xC000000F;
+    public static final int NTInvalidDeviceRequest 		= 0xC0000010;
+    public static final int NTMoreProcessingRequired 	= 0xC0000016;
+    public static final int NTAccessDenied 				= 0xC0000022;
+    public static final int NTBufferTooSmall 			= 0xC0000023;
+    public static final int NTObjectNameInvalid 		= 0xC0000033;
+    public static final int NTObjectNotFound 			= 0xC0000034;
+    public static final int NTObjectNameCollision 		= 0xC0000035;
+    public static final int NTObjectPathNotFound 		= 0xC000003A;
+    public static final int NTObjectPathSyntaxBad		= 0xC000003B;
+    public static final int NTSharingViolation 			= 0xC0000043;
+    public static final int NTLockConflict 				= 0xC0000054;
+    public static final int NTLockNotGranted 			= 0xC0000055;
+    public static final int NTLogonFailure 				= 0xC000006D;
+    public static final int NTAccountDisabled 			= 0xC0000072;
+    public static final int NTNoneMapped 				= 0xC0000073;
+    public static final int NTInvalidSecDescriptor 		= 0xC0000079;
+    public static final int NTRangeNotLocked 			= 0xC000007E;
+    public static final int NTDiskFull 					= 0xC000007F;
+    public static final int NTPipeBusy 					= 0xC00000AE;
+    public static final int NTNotSupported 				= 0xC00000BB;
+    public static final int NTBadDeviceType 			= 0xC00000CB;
+    public static final int NTBadNetName 				= 0xC00000CC;
+    public static final int NTRequestNotAccepted 		= 0xC00000D0;
+    public static final int NTNoSuchDomain 				= 0xC00000DF;
+    public static final int NTTooManyOpenFiles 			= 0xC000011F;
+    public static final int NTCancelled 				= 0xC0000120;
+    public static final int NTFileOffline 				= 0xC0000267;
 
-    public static final int Win32FileNotFound = 2;
-    public static final int Win32PathNotFound = 3;
-    public static final int Win32AccessDenied = 5;
-    public static final int Win32InvalidHandle = 6;
-    public static final int Win32BadDeviceType = 66;
-    public static final int Win32BadNetworkName = 67;
-    public static final int Win32AlreadyAssigned = 85;
-    public static final int Win32InvalidPassword = 86;
-    public static final int Win32MoreData = 234;
-    public static final int Win32NoMoreItems = 259;
-    public static final int Win32MoreEntries = 261;
-    public static final int Win32InvalidAddress = 487;
-    public static final int Win32ServiceDoesNotExist = 1060;
+    public static final int Win32FileNotFound 			= 2;
+    public static final int Win32PathNotFound 			= 3;
+    public static final int Win32AccessDenied 			= 5;
+    public static final int Win32InvalidHandle 			= 6;
+    public static final int Win32BadDeviceType 			= 66;
+    public static final int Win32BadNetworkName 		= 67;
+    public static final int Win32AlreadyAssigned 		= 85;
+    public static final int Win32InvalidPassword 		= 86;
+    public static final int Win32MoreData 				= 234;
+    public static final int Win32NoMoreItems 			= 259;
+    public static final int Win32MoreEntries 			= 261;
+    public static final int Win32InvalidAddress 		= 487;
+    public static final int Win32ServiceDoesNotExist 	= 1060;
     public static final int Win32ServiceMarkedForDelete = 1072;
-    public static final int Win32ServiceExists = 1073;
-    public static final int Win32ServiceDuplicateName = 1077;
-    public static final int Win32BadDevice = 1200;
-    public static final int Win32NoNetOrBadPath = 1203;
-    public static final int Win32ExtendedError = 1208;
-    public static final int Win32NoNetwork = 1222;
+    public static final int Win32ServiceExists 			= 1073;
+    public static final int Win32ServiceDuplicateName 	= 1077;
+    public static final int Win32BadDevice 				= 1200;
+    public static final int Win32NoNetOrBadPath 		= 1203;
+    public static final int Win32ExtendedError 			= 1208;
+    public static final int Win32NoNetwork 				= 1222;
 
-    public static final int NTBufferOverflow = 0x80000005;
-    public static final int NTNoMoreFiles = 0x80000006;
-    public static final int NTNotifyEnumDir = 0x0000010C;
+    public static final int NTBufferOverflow 			= 0x80000005;
+    public static final int NTNoMoreFiles 				= 0x80000006;
+    public static final int NTNotifyEnumDir 			= 0x0000010C;
 
     // DEC/RPC status codes
 
-    public static final int DCERPC_Fault = 0;
+    public static final int DCERPC_Fault 				= 0;
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/filesys/smb/server/CoreProtocolHandler.java b/source/java/org/alfresco/filesys/smb/server/CoreProtocolHandler.java
index 355a2a990b..ec66f76245 100644
--- a/source/java/org/alfresco/filesys/smb/server/CoreProtocolHandler.java
+++ b/source/java/org/alfresco/filesys/smb/server/CoreProtocolHandler.java
@@ -77,6 +77,11 @@ class CoreProtocolHandler extends ProtocolHandler
 
     private static final int MaxWordValue = 0x0000FFFF;
 
+    // Invalid file name characters
+    
+    private static final String InvalidFileNameChars 		= "\"/[]:+|<>=;,*?";
+    private static final String InvalidFileNameCharsSearch	= "\"/[]:+|<>=;,";
+    
     // SMB packet class
 
     protected SMBSrvPacket m_smbPkt;
@@ -118,6 +123,48 @@ class CoreProtocolHandler extends ProtocolHandler
 
     }
 
+    /**
+     * Check if a path contains any illegal characters, for file/create open/create/rename/get info
+     * 
+     * @param path String
+     * @return boolean
+     */
+    protected boolean isValidPath(String path)
+    {
+    	// Scan the path for invalid path characters
+    	
+    	for ( int i = 0; i < InvalidFileNameChars.length(); i++)
+    	{
+    		if ( path.indexOf( InvalidFileNameChars.charAt( i)) != -1)
+    			return false;
+    	}
+    	
+    	// Path looks valid
+    	
+    	return true;
+    }
+    
+    /**
+     * Check if a path contains any illegal characters, for a folder search
+     * 
+     * @param path String
+     * @return boolean
+     */
+    protected boolean isValidSearchPath(String path)
+    {
+    	// Scan the path for invalid path characters
+    	
+    	for ( int i = 0; i < InvalidFileNameCharsSearch.length(); i++)
+    	{
+    		if ( path.indexOf( InvalidFileNameCharsSearch.charAt( i)) != -1)
+    			return false;
+    	}
+    	
+    	// Path looks valid
+    	
+    	return true;
+    }
+    
     /**
      * Pack file information for a search into the specified buffer.
      * 
@@ -231,6 +278,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( dirName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
@@ -450,6 +505,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( dirName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
@@ -573,6 +636,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( fileName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Get the required file attributes for the new file
 
         int attr = m_smbPkt.getParameter(0);
@@ -719,6 +790,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( dirName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
@@ -836,6 +915,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( fileName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
@@ -1216,6 +1303,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( fileName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
@@ -1343,7 +1438,7 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
-        // Debug
+       // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
             logger.debug("Get File Information 2 [" + netFile.getFileId() + "]");
@@ -2081,6 +2176,14 @@ class CoreProtocolHandler extends ProtocolHandler
             return;
         }
 
+        // Check if the search path is valid
+        
+        if ( isValidSearchPath( srchPath) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Update the received data position
 
         dataPos += srchPath.length() + 2;
diff --git a/source/java/org/alfresco/filesys/smb/server/NTProtocolHandler.java b/source/java/org/alfresco/filesys/smb/server/NTProtocolHandler.java
index 96d9e01a3e..fb12c96817 100644
--- a/source/java/org/alfresco/filesys/smb/server/NTProtocolHandler.java
+++ b/source/java/org/alfresco/filesys/smb/server/NTProtocolHandler.java
@@ -2275,6 +2275,14 @@ public class NTProtocolHandler extends CoreProtocolHandler
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
             logger.debug("File Open AndX [" + m_smbPkt.getTreeId() + "] params=" + params);
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( params.getPath()) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Access the disk interface and open the requested file
 
         int fid;
@@ -2709,6 +2717,20 @@ public class NTProtocolHandler extends CoreProtocolHandler
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
             logger.debug("File Rename [" + m_smbPkt.getTreeId() + "] old name=" + oldName + ", new name=" + newName);
 
+        // Check if the from/to paths are
+        
+        if ( isValidPath( oldName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
+        if ( isValidPath( newName) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+
         // Access the disk interface and rename the requested file
 
         try
@@ -3117,6 +3139,14 @@ public class NTProtocolHandler extends CoreProtocolHandler
             return;
         }
 
+        // Check if the search path is valid
+        
+        if ( isValidSearchPath( srchPath) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Access the shared device disk interface
 
         SearchContext ctx = null;
@@ -3967,6 +3997,14 @@ public class NTProtocolHandler extends CoreProtocolHandler
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_INFO))
             logger.debug("Query Path - level = 0x" + Integer.toHexString(infoLevl) + ", path = " + path);
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( path) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Access the shared device disk interface
 
         try
@@ -4813,6 +4851,14 @@ public class NTProtocolHandler extends CoreProtocolHandler
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_INFO))
             logger.debug("Set Path - path=" + path + ", level=0x" + Integer.toHexString(infoLevl));
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( path) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Access the shared device disk interface
 
         try
@@ -5358,11 +5404,20 @@ public class NTProtocolHandler extends CoreProtocolHandler
 
         FileOpenParams params = new FileOpenParams(fileName, createDisp, accessMask, attrib, shrAccess, allocSize,
                 createOptn, rootFID, impersonLev, secFlags);
+        
         // Debug
 
         if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_FILE))
             logger.debug("NT Create AndX [" + m_smbPkt.getTreeId() + "] params=" + params);
 
+        // Check if the file name is valid
+        
+        if ( isValidPath( params.getPath()) == false)
+        {
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNameInvalid, SMBStatus.DOSInvalidData, SMBStatus.ErrDos);
+            return;
+        }
+        
         // Access the disk interface and open the requested file
 
         int fid;