- added [[fallthrough]] annotation

- changed spaces -> tabs
- added nullpointer check
- init pointers

Author: chcg

PythonScript/src/ConfigFile.cpp

@@ -64,7 +64,7 @@ void ConfigFile::readConfig()
 	{
 		tstring scriptFullPath = _T("");
 		startupFile.getline(buffer, 500);
-		char *context;
+		char *context = nullptr;
 		char *element = strtok_s(buffer, "/", &context);
 		if (element)
 		{

PythonScript/src/DebugTrace.cpp

@@ -10,66 +10,66 @@
 #include <Windows.h>
 #include <DbgHelp.h>
 
-// stati volatile long s_debugLineCount;
+// static volatile long s_debugLineCount;
 
 
 
 volatile long *allocateLineCount()
 {
-    static volatile long *lineCount;
+	static volatile long *lineCount;
 
-    lineCount = (long*)_aligned_malloc(sizeof(long), 32);
-    *lineCount = 0;
-    return lineCount;
+	lineCount = (long*)_aligned_malloc(sizeof(long), 32);
+	*lineCount = 0;
+	return lineCount;
 }
 
 void printStack()
 {
-     unsigned int   i;
-     void         * stack[ 100 ];
-     unsigned short frames;
-     SYMBOL_INFO  * symbol;
-     HANDLE         process;
-     char buffer[500]{};
-     int bufferRemaining = 500;
-     int usedBuffer;
-     char *output = buffer;
-
-     process = GetCurrentProcess();
-
-     SymInitialize( process, NULL, TRUE );
-
-     frames               = CaptureStackBackTrace( 1, 15, stack, NULL );
-     symbol               = ( SYMBOL_INFO * )calloc( sizeof( SYMBOL_INFO ) + 256 * sizeof( char ), 1 );
-     symbol->MaxNameLen   = 255;
-     symbol->SizeOfStruct = sizeof( SYMBOL_INFO );
-
-     
-     for( i = 0; i < frames; i++ )
-     {
-         SymFromAddr( process, ( DWORD64 )( stack[ i ] ), 0, symbol );
-
-         usedBuffer = _snprintf_s(output, bufferRemaining, bufferRemaining, "%i: %s - 0x%I64X\n", frames - i - 1, symbol->Name, symbol->Address );
-         bufferRemaining -= usedBuffer;
-         output += usedBuffer;
-     }
-
-     debugTraceVars("STACK %s", buffer);
-
-     free( symbol );
+	unsigned int   i;
+	void         * stack[ 100 ];
+	unsigned short frames;
+	SYMBOL_INFO  * symbol;
+	HANDLE         process;
+	char buffer[500]{};
+	int bufferRemaining = 500;
+	int usedBuffer;
+	char *output = buffer;
+
+	process = GetCurrentProcess();
+
+	SymInitialize( process, NULL, TRUE );
+
+	frames               = CaptureStackBackTrace( 1, 15, stack, NULL );
+	symbol               = ( SYMBOL_INFO * )calloc( sizeof( SYMBOL_INFO ) + 256 * sizeof( char ), 1 );
+	symbol->MaxNameLen   = 255;
+	symbol->SizeOfStruct = sizeof( SYMBOL_INFO );
+
+	
+	for( i = 0; i < frames; i++ )
+	{
+		SymFromAddr( process, ( DWORD64 )( stack[ i ] ), 0, symbol );
+
+		usedBuffer = _snprintf_s(output, bufferRemaining, bufferRemaining, "%i: %s - 0x%I64X\n", frames - i - 1, symbol->Name, symbol->Address );
+		bufferRemaining -= usedBuffer;
+		output += usedBuffer;
+	}
+
+	debugTraceVars("STACK %s", buffer);
+
+	free( symbol );
 }
 
 void debugTraceStr(const std::wstringstream& item)
 {
-    static volatile long *lineCount = allocateLineCount(); 
-    FILETIME timestamp;
-    GetSystemTimeAsFileTime(&timestamp);
+	static volatile long *lineCount = allocateLineCount(); 
+	FILETIME timestamp;
+	GetSystemTimeAsFileTime(&timestamp);
 
-    
-    long currentLine = InterlockedIncrement(lineCount);
-    std::wstringstream debug;
+	
+	long currentLine = InterlockedIncrement(lineCount);
+	std::wstringstream debug;
 	debug << L"PY>" << std::setfill(L'0') << std::setw(5) << ::GetCurrentThreadId() 
-		        << L" " << std::setw(5) << std::setfill(L' ') << currentLine 
+				<< L" " << std::setw(5) << std::setfill(L' ') << currentLine 
 				<< L" " << std::setw(8) << std::setfill(L' ') << timestamp.dwLowDateTime 
 				<< L" " << item.str();
 
@@ -78,13 +78,13 @@ void debugTraceStr(const std::wstringstream& item)
 
 void debugTraceVars(const char *format, ...)
 {
-    va_list args;
-    va_start( args, format );
-    char buffer[500];
-    vsprintf_s<500>(buffer, format, args); 
-    std::wstringstream result;
+	va_list args;
+	va_start( args, format );
+	char buffer[500];
+	vsprintf_s<500>(buffer, format, args); 
+	std::wstringstream result;
 	result << buffer;
-    debugTraceStr(result);
+	debugTraceStr(result);
 }
 
 

PythonScript/src/PythonScript.cpp

@@ -147,9 +147,12 @@ extern "C" __declspec(dllexport) FuncItem * getFuncsArray(int *nbF)
 	{
 		MessageBox(NULL, _T("A fatal error has occurred. Notepad++ has incorrectly called getFuncsArray() before setInfo().  No menu items will be available for PythonScript."), PLUGIN_NAME, 0);
 		funcItem = (FuncItem*) malloc(sizeof(FuncItem));
-		memset(funcItem, 0, sizeof(FuncItem));
-		_tcscpy_s(funcItem[0]._itemName, 64, _T("About - Python Script Disabled"));
-		funcItem[0]._pFunc = doAbout;
+		if(funcItem)
+		{
+			memset(funcItem, 0, sizeof(FuncItem));
+			_tcscpy_s(funcItem[0]._itemName, 64, _T("About - Python Script Disabled"));
+			funcItem[0]._pFunc = doAbout;
+		}
 		*nbF = 1;
 	}