Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-15 18:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup: remove commented out broken long symbol table header description

Browse Source 
FIX: Prevent buffer overflow in CmdSymbolsInfo()
This commit is contained in:
michaelangel007
2014-11-30 17:51:11 -08:00
parent d5a58ef206
commit ac56455f61
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/Debugger/Debugger_Symbols.cpp
View File

@@ -285,24 +285,7 @@ void _CmdSymbolsInfoHeader( int iTable, char * pText, int nDisplaySize /* = 0 */
bool bActive = (g_bDisplaySymbolTables & (1 << iTable)) ? true : false; bool bActive = (g_bDisplaySymbolTables & (1 << iTable)) ? true : false;
int nSymbols = nDisplaySize ? nDisplaySize : g_aSymbols[ iTable ].size(); int nSymbols = nDisplaySize ? nDisplaySize : g_aSymbols[ iTable ].size();
// Long Desc: `MAIN`: `1000 `symbols`, `on`
// full
#if 0
sprintf( pText, " %s%s%s: %s# %s%d %ssymbols%s, (%s%s%s)%s"
// , CHC_SYMBOL, g_aSymbolTableNames[ iTable ]
, CHC_STRING, g_aSymbolTableNames[ iTable ]
, CHC_ARG_SEP
CHC_DEFAULT
, CHC_NUM_DEC, nSymbols
, CHC_DEFAULT, CHC_ARG_SEP,
, CHC_STRING,
, CHC_ARG_SEP, CHC_DEFAULT
);
#endif
// sprintf( pText, " %s: %s%d%s"
// Short Desc: `MAIN`: `1000` // Short Desc: `MAIN`: `1000`
// // 2.6.2.19 Color for name of symbol table: _CmdPrintSymbol() "SYM HOME" _CmdSymbolsInfoHeader "SYM" // // 2.6.2.19 Color for name of symbol table: _CmdPrintSymbol() "SYM HOME" _CmdSymbolsInfoHeader "SYM"
// CHC_STRING and CHC_NUM_DEC are both cyan, using CHC_USAGE instead of CHC_STRING // CHC_STRING and CHC_NUM_DEC are both cyan, using CHC_USAGE instead of CHC_STRING
sprintf( pText, "%s%s%s:%s%d " // %s" sprintf( pText, "%s%s%s:%s%d " // %s"
@@ -316,11 +299,14 @@ void _CmdSymbolsInfoHeader( int iTable, char * pText, int nDisplaySize /* = 0 */
//=========================================================================== //===========================================================================
Update_t CmdSymbolsInfo (int nArgs) Update_t CmdSymbolsInfo (int nArgs)
{ {
const char sIndent[] = " ";
char sText[ CONSOLE_WIDTH * 4 ] = ""; char sText[ CONSOLE_WIDTH * 4 ] = "";
char sTemp[ CONSOLE_WIDTH * 2 ] = ""; char sTemp[ CONSOLE_WIDTH * 2 ] = "";
int bDisplaySymbolTables = 0; int bDisplaySymbolTables = 0;
strcpy( sText, sIndent ); // Indent new line
if (! nArgs) if (! nArgs)
{ {
// default to all tables // default to all tables
@@ -342,9 +328,20 @@ Update_t CmdSymbolsInfo (int nArgs)
int bTable = 1; int bTable = 1;
int iTable = 0; int iTable = 0;
for( ; bTable <= bDisplaySymbolTables; iTable++, bTable <<= 1 ) { for( ; bTable <= bDisplaySymbolTables; iTable++, bTable <<= 1 )
if( bDisplaySymbolTables & bTable ) { {
if( bDisplaySymbolTables & bTable )
{
_CmdSymbolsInfoHeader( iTable, sTemp ); // 15 chars per table _CmdSymbolsInfoHeader( iTable, sTemp ); // 15 chars per table
// 2.8.0.4 BUGFIX: Check for buffer overflow and wrap text
int nLen = ConsoleColor_StringLength( sTemp );
int nDst = ConsoleColor_StringLength( sText );
if((nDst + nLen) > CONSOLE_WIDTH )
{
ConsolePrint( sText );
strcpy( sText, sIndent ); // Indent new line
}
strcat( sText, sTemp ); strcat( sText, sTemp );
} }
} }