Skip to content

bugfix(imagepacker): Skip folders whose path does not fit in the add folder buffer #3558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bobtista wants to merge 5 commits into
base: main
Choose a base branch
from
+49 −49
Draft

bugfix(imagepacker): Skip folders whose path does not fit in the add folder buffer #3558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a89303
refactor(pathutil): Add appendPathSeparator for character buffers
bobtista Oct 8, 2026
192fbaa
refactor(generals): Add appendPathSeparator for character buffers
bobtista Oct 8, 2026
9abcce4
fix(w3dview): Guard Delimit_Path against an empty CString
bobtista Oct 12, 2026
791f588
bugfix(imagepacker): Skip folders whose path does not fit in the add …
bobtista Oct 19, 2026
a9a7d50
bugfix(imagepacker): Bound the duplicate folder message
bobtista Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Core/Libraries/Source/Lib/Include/Lib/PathUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,22 @@ inline char* getFileName(char* path)
return lastSeparator ? lastSeparator + 1 : path;
}

inline bool appendPathSeparator(char* path, size_t size)
{
const size_t len = strlen(path);
if (len == 0 || isPathSeparator(path[len - 1]))
{
return true;
}
if (len + 1 >= size)
{
return false;
}
path[len] = getNativePathSeparator();
path[len + 1] = '\0';
return true;
}

inline const char* getExtension(const char* path)
{
const char* lastDot = strrchr(path, '.');
Expand Down
5 changes: 2 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,8 @@ AggregateDefClass::Load_Assets (const char *passet_name)
char path[MAX_PATH];
::GetCurrentDirectory (sizeof (path), path);

// Ensure the path is directory delimited
if (!isPathSeparator(path[::lstrlen(path)-1])) {
::lstrcat (path, "\\");
if (!appendPathSeparator (path, ARRAY_SIZE (path))) {
return false;
}

// Assume the filename is simply the "asset name" + the w3d extension
Expand Down
14 changes: 4 additions & 10 deletions Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,8 @@ void SimpleFileFactoryClass::Prepend_Sub_Directory( const char * sub_directory )
// Ensure sub_directory ends with a slash, and append a semicolon
char temp_sub_dir[1024];
strlcpy(temp_sub_dir, sub_directory, ARRAY_SIZE(temp_sub_dir));
if (!isPathSeparator(temp_sub_dir[sub_len - 1])) {
temp_sub_dir[sub_len] = '\\';
temp_sub_dir[sub_len + 1] = 0;
sub_len++;
}
appendPathSeparator(temp_sub_dir, ARRAY_SIZE(temp_sub_dir));
sub_len = strlen(temp_sub_dir);
temp_sub_dir[sub_len] = ';';
temp_sub_dir[sub_len + 1] = 0;

Expand Down Expand Up @@ -182,11 +179,8 @@ void SimpleFileFactoryClass::Append_Sub_Directory( const char * sub_directory )
// Ensure sub_directory ends with a slash
char temp_sub_dir[1024];
strlcpy(temp_sub_dir, sub_directory, ARRAY_SIZE(temp_sub_dir));
if (!isPathSeparator(temp_sub_dir[sub_len - 1])) {
temp_sub_dir[sub_len] = '\\';
temp_sub_dir[sub_len + 1] = 0;
sub_len++;
}
appendPathSeparator(temp_sub_dir, ARRAY_SIZE(temp_sub_dir));
sub_len = strlen(temp_sub_dir);

// BEGIN SERIALIZATION

Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/Wnd_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ void Delete_Msg_File ()
//----------------------------------------------------------------------
// strcat( strcpy( DebugFile, ".\\" ), DEBUG_FILE );
GetWindowsDirectory( DebugFile, MAX_PATH );
if ( !isPathSeparator( DebugFile[ strlen( DebugFile )-1 ] ) ) {
strcat( DebugFile, "\\" );
if ( !appendPathSeparator( DebugFile, ARRAY_SIZE( DebugFile ) ) ) {
return;
}
strcat( DebugFile, DEBUG_FILE );

Expand Down
23 changes: 15 additions & 8 deletions Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,

// set the current directory in the top label
GetCurrentDirectory( _MAX_PATH, buffer );
if( !isPathSeparator( buffer[ strlen( buffer ) - 1 ] ) )
strlcat(buffer, "\\", ARRAY_SIZE(buffer));
appendPathSeparator( buffer, ARRAY_SIZE( buffer ) );
SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );

// load the drive box
Expand Down Expand Up @@ -189,7 +188,17 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
// construct directory to add, make sure we have a '\' on the
// end cause we assume that in the image file name code
//
sprintf( toAdd, "%s%s\\", buffer, text );
// TheSuperHackers @bugfix bobtista 18/10/2026 Skip folders whose path does not fit instead of overflowing toAdd.
const Int toAddLen = snprintf( toAdd, ARRAY_SIZE( toAdd ), "%s%s\\", buffer, text );
if( toAddLen < 0 || toAddLen >= (Int)ARRAY_SIZE( toAdd ) )
{
char message[ _MAX_PATH + 32 ];

snprintf( message, ARRAY_SIZE( message ), "Ignoring folder '%s', path is too long.", text );
MessageBox( nullptr, message, "Folder Path Too Long",
MB_OK | MB_ICONINFORMATION );
continue;
}

// do not add directory if it's already in the listbox
if( SendDlgItemMessage( TheImagePacker->getWindowHandle(),
Expand All @@ -198,7 +207,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
{
char message[ _MAX_PATH + 32 ];

sprintf( message, "Ignoring folder '%s', already in list.", toAdd );
snprintf( message, ARRAY_SIZE( message ), "Ignoring folder '%s', already in list.", toAdd );
MessageBox( nullptr, message, "Folder Already In List",
MB_OK | MB_ICONINFORMATION );
continue;
Expand Down Expand Up @@ -261,8 +270,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,

// construct new direcotry name and update status text
GetCurrentDirectory( _MAX_PATH, buffer );
if( !isPathSeparator( buffer[ strlen( buffer ) - 1 ] ) )
strlcat(buffer, "\\", ARRAY_SIZE(buffer));
appendPathSeparator( buffer, ARRAY_SIZE( buffer ) );
SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );
EnableWindow( GetDlgItem( hWndDialog, BUTTON_ADD ), FALSE );

Expand Down Expand Up @@ -352,8 +360,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,

// construct new direcotry name and update status text
GetCurrentDirectory( _MAX_PATH, buffer );
Comment thread
bobtista marked this conversation as resolved.
Resolved
if( !isPathSeparator( buffer[ strlen( buffer ) - 1 ] ) )
strlcat(buffer, "\\", ARRAY_SIZE(buffer));
appendPathSeparator( buffer, ARRAY_SIZE( buffer ) );
SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );
EnableWindow( GetDlgItem( hWndDialog, BUTTON_ADD ), FALSE );

Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/Utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ __inline void Delimit_Path (LPTSTR path)

__inline void Delimit_Path (CString &path)
{
if (!isPathSeparator (path[::lstrlen (path) - 1])) {
if (::lstrlen (path) > 0 && !isPathSeparator (path[::lstrlen (path) - 1])) {
path += CString ("\\");
}
}
Expand Down
6 changes: 1 addition & 5 deletions Core/Tools/W3DView/W3DViewDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,11 +1446,7 @@ CW3DViewDoc::SaveSettings
TCHAR szPath[MAX_PATH] = { 0 };
::GetCurrentDirectory (sizeof (szPath), szPath);

if (!isPathSeparator (szPath[::lstrlen (szPath)-1]))
{
// Ensure the path is directory delimited
strlcat(szPath, "\\", ARRAY_SIZE(szPath));
}
appendPathSeparator (szPath, ARRAY_SIZE (szPath));

// Prepend the filename with its new path
stringCompleteFilename = CString (szPath) + stringCompleteFilename;
Expand Down
7 changes: 2 additions & 5 deletions Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,8 @@ void SaveMap::populateMapListbox( Bool systemMaps )
strcpy(dirBuf, ".\\Maps\\");
else
snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
int len = strlen(dirBuf);

if (len > 0 && !isPathSeparator(dirBuf[len - 1])) {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
if (!appendPathSeparator(dirBuf, ARRAY_SIZE(dirBuf))) {
return;
}
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
if (pList == nullptr) return;
Expand Down
7 changes: 2 additions & 5 deletions Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,8 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
char fileBuf[_MAX_PATH];

strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
int len = strlen(dirBuf);

if (len > 0 && !isPathSeparator(dirBuf[len - 1])) {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
if (!appendPathSeparator(dirBuf, ARRAY_SIZE(dirBuf))) {
return;
}

FilenameList filenameList;
Expand Down
7 changes: 2 additions & 5 deletions GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,8 @@ void SaveMap::populateMapListbox( Bool systemMaps )
strcpy(dirBuf, ".\\Maps\\");
else
snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
int len = strlen(dirBuf);

if (len > 0 && !isPathSeparator(dirBuf[len - 1])) {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
if (!appendPathSeparator(dirBuf, ARRAY_SIZE(dirBuf))) {
return;
}
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
if (pList == nullptr) return;
Expand Down
7 changes: 2 additions & 5 deletions GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,8 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
char fileBuf[_MAX_PATH];

strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
int len = strlen(dirBuf);

if (len > 0 && !isPathSeparator(dirBuf[len - 1])) {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
if (!appendPathSeparator(dirBuf, ARRAY_SIZE(dirBuf))) {
return;
}

FilenameList filenameList;
Expand Down
Loading