From f4b78c3eb12afc70d5ff3021313d3f868cb9f661 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 16 May 2013 06:47:13 -0400 Subject: [PATCH] Windows: remove unused and leaked uniRootFileNameClone In AFSCommonCreate remove the allocated but never used but leaked 'uniRootFileNameClone' Unicode string. Change-Id: I02a4a1a2383c5a85f2a939b4d18e38def4cf2687 Reviewed-on: http://gerrit.openafs.org/9920 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- .../afsrdr/common/AFSRedirCommonDefines.h | 2 +- src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h b/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h index bdd174061..dc66eb01a 100644 --- a/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h +++ b/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h @@ -91,7 +91,7 @@ #define AFS_NAME_BUFFER_EIGHT_TAG '8NFA' #define AFS_NAME_BUFFER_NINE_TAG '9NFA' #define AFS_NAME_BUFFER_TEN_TAG 'ANFA' -#define AFS_NAME_BUFFER_ELEVEN_TAG 'BNFA' +#define AFS_NAME_BUFFER_ELEVEN_TAG 'BNFA' // Unused #define AFS_SUBST_BUFFER_TAG 'SBFA' #define AFS_FILE_CREATE_BUFFER_TAG 'CFFA' #define AFS_RENAME_REQUEST_TAG 'RFFA' diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp index f12cc0c60..648ad2948 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp @@ -629,7 +629,6 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, else { AFSNameArrayHdr *pNameArrayClone = NULL; - UNICODE_STRING uniRootFileNameClone; // // The FILE_OPEN_REPARSE_POINT flag has been specified and a ReparsePointPolicy @@ -681,29 +680,6 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, try_return( ntStatus); } - uniRootFileNameClone = uniRootFileName; - - uniRootFileNameClone.Buffer = (WCHAR *)AFSExAllocatePoolWithTag( PagedPool, - uniRootFileNameClone.MaximumLength, - AFS_NAME_BUFFER_ELEVEN_TAG); - - if( uniRootFileNameClone.Buffer == NULL) - { - - AFSFreeNameArray( pNameArrayClone); - - AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, - AFS_TRACE_LEVEL_ERROR, - "AFSCommonCreate (%p) Failed to allocate uniRootFileNameClone\n", - Irp)); - - try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); - } - - RtlCopyMemory( uniRootFileNameClone.Buffer, - uniRootFileName.Buffer, - uniRootFileNameClone.Length); - // // Now that the data is saved perform the lookup to determine // what the target resolves to. @@ -749,12 +725,6 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, pNameArrayClone = NULL; - AFSExFreePoolWithTag( uniRootFileNameClone.Buffer, - AFS_NAME_BUFFER_ELEVEN_TAG); - - RtlZeroMemory( &uniRootFileNameClone, - sizeof( UNICODE_STRING)); - ClearFlag( ulOptions, FILE_OPEN_REPARSE_POINT); } else -- 2.39.5