// Strip off any trailing slashes
//
- if( uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
+ if( uniRemoteName.Length >= sizeof( WCHAR)
+ && uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
{
uniRemoteName.Length -= sizeof( WCHAR);
// Strip off any trailing slashes
//
- if( uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
+ if( uniRemoteName.Length >= sizeof( WCHAR)
+ && uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
{
uniRemoteName.Length -= sizeof( WCHAR);
ConnectCB->RemoteName,
uniRemoteName.Length);
- if( uniRemoteName.Buffer[ 0] == L'\\' &&
- uniRemoteName.Buffer[ 1] == L'\\')
+ if( uniRemoteName.Length >= 2 * sizeof( WCHAR)
+ && uniRemoteName.Buffer[ 0] == L'\\'
+ && uniRemoteName.Buffer[ 1] == L'\\')
{
uniRemoteName.Buffer = &uniRemoteName.Buffer[ 1];
uniRemoteName.Length -= sizeof( WCHAR);
}
- if( uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
+ if( uniRemoteName.Length >= sizeof( WCHAR)
+ && uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
{
uniRemoteName.Length -= sizeof( WCHAR);
uniName = Connection->RemoteName;
//
- // Strip of the double leading slash if there is one
+ // Strip off the double leading slash if there is one
//
- if( uniName.Buffer[ 0] == L'\\' &&
- uniName.Buffer[ 1] == L'\\')
+ if( uniName.Length >= 2 * sizeof( WCHAR)
+ && uniName.Buffer[ 0] == L'\\'
+ && uniName.Buffer[ 1] == L'\\')
{
uniName.Buffer = &uniName.Buffer[ 1];
uniFullName = uniRemoteName;
- if( uniRemoteName.Buffer[ 0] == L'\\' &&
- uniRemoteName.Buffer[ 1] == L'\\')
+ if( uniRemoteName.Length >= 2 * sizeof( WCHAR)
+ && uniRemoteName.Buffer[ 0] == L'\\'
+ && uniRemoteName.Buffer[ 1] == L'\\')
{
uniRemoteName.Buffer = &uniRemoteName.Buffer[ 1];
uniRemoteName.Length -= sizeof( WCHAR);
}
- if( uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
+ if( uniRemoteName.Length >= sizeof( WCHAR)
+ && uniRemoteName.Buffer[ (uniRemoteName.Length/sizeof( WCHAR)) - 1] == L'\\')
{
uniRemoteName.Length -= sizeof( WCHAR);