3.2.196

ANSSI-FR · Sep 25, 2023 · 45bf061 · 45bf061
1 parent 7276b41
commit 45bf061
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/ORADAD.rc b/ORADAD.rc
diff --git a/ORADAD.vcxproj b/ORADAD.vcxproj
@@ -96,6 +96,7 @@
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)$(TargetName)-x86$(TargetExt)</OutputFile>
       <GenerateMapFile>true</GenerateMapFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName)-x86.pdb</ProgramDatabaseFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -133,6 +134,7 @@
       <OutputFile>$(OutDir)$(TargetName)-x86$(TargetExt)</OutputFile>
       <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
       <GenerateMapFile>true</GenerateMapFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName)-x86.pdb</ProgramDatabaseFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/Sysvol.cpp b/Sysvol.cpp
@@ -526,7 +526,7 @@ pProcessSysvolFile (
       DWORD dwIdx = 0;
       DWORD dwOutSize;
       LPWSTR szNewFilePath;
-      LPWSTR szGuid;
+      LPWSTR szGuidPosition;
       LPWSTR szShortFileName;
       LARGE_INTEGER largeInt;
       BOOL bCopyFile = FALSE;
@@ -551,7 +551,7 @@ pProcessSysvolFile (
          }
       }
 
-      pSysvolCrackName(szFileName, (LPWSTR)szDomainName, &szNewFilePath, &szGuid, &szShortFileName);
+      pSysvolCrackName(szFileName, (LPWSTR)szDomainName, &szNewFilePath, &szGuidPosition, &szShortFileName);
 
       //
       // Write sysvol.tsv
@@ -567,7 +567,7 @@ pProcessSysvolFile (
       BufferWriteTab(pBuffer);
 
       // Column 'guid'
-      _CallWriteAndGetMax(BufferWrite(pBuffer, szGuid), g_dwSysvolMaxLength[dwIdx]);
+      _CallWriteAndGetMax(BufferWriteStringWithLimit(pBuffer, szGuidPosition, GUID_STR_SIZE), g_dwSysvolMaxLength[dwIdx]);
       ++dwIdx;
       BufferWriteTab(pBuffer);
 
@@ -673,7 +673,7 @@ pProcessSysvolFile (
             WCHAR szOutPath[MAX_PATH];
             BUFFER_DATA Buffer;
 
-            if (szGuid != NULL)
+            if (szGuidPosition != NULL)
             {
                if (pGlobalConfig->bOutputFiles == TRUE)
                {
@@ -683,19 +683,19 @@ pProcessSysvolFile (
                   bResult = FormatNameAndCreateDirectory(
                      szOutPath, MAX_PATH,
                      L"%s\\%s\\%.*s",
-                     pGlobalConfig->szFileSysvolOutDirectory, szDomainName, GUID_STR_SIZE, szGuid
+                     pGlobalConfig->szFileSysvolOutDirectory, szDomainName, GUID_STR_SIZE, szGuidPosition
                   );
                   if (bResult == FALSE)
                      return FALSE;
                }
 
                if (szShortFileName != NULL)
                {
-                  swprintf_s(szOutPath, MAX_PATH, L"%s\\%.*s\\%llu_%s", szDomainName, GUID_STR_SIZE, szGuid, hArchiveName, szShortFileName);
+                  swprintf_s(szOutPath, MAX_PATH, L"%s\\%.*s\\%llu_%s", szDomainName, GUID_STR_SIZE, szGuidPosition, hArchiveName, szShortFileName);
                }
                else
                {
-                  swprintf_s(szOutPath, MAX_PATH, L"%s\\%.*s\\%llu", szDomainName, GUID_STR_SIZE, szGuid, hArchiveName);
+                  swprintf_s(szOutPath, MAX_PATH, L"%s\\%.*s\\%llu", szDomainName, GUID_STR_SIZE, szGuidPosition, hArchiveName);
                }
             }
             else