- fix issue in callback handling for hwndFrom

chcg · chcg · commit ee0f267f07a0 · 2019-10-19T23:21:38.000+02:00
bruderstein#127 SCINTILLANOTIFICATION.CHARADDED: arg key ch is always 0 and bruderstein#121 Consider using hwndFrom within scintilla notification - fix memory leak issue
diff --git a/PythonScript/src/HelpController.cpp b/PythonScript/src/HelpController.cpp
@@ -139,6 +139,8 @@ std::wstring HelpController::getTopicUrl()
 			url.append(buffer + dotPosition + 1);
 		}
 	}
-	
+
+	delete[] buffer;
+
 	return WcharMbcsConverter::char2tchar(url.c_str()).get();
 }
diff --git a/PythonScript/src/ScintillaWrapper.cpp b/PythonScript/src/ScintillaWrapper.cpp
@@ -89,6 +89,8 @@ void ScintillaWrapper::notify(SCNotification *notifyCode)
 
 			// Create the parameters for the callback
 			params["code"] = notifyCode->nmhdr.code;
+			params["idFrom"] = notifyCode->nmhdr.idFrom;
+			params["hwndFrom"] = reinterpret_cast<intptr_t>(notifyCode->nmhdr.hwndFrom);
 
 
 			switch(notifyCode->nmhdr.code)
@@ -236,8 +238,6 @@ void ScintillaWrapper::notify(SCNotification *notifyCode)
 
 			default:
 				// Unknown notification, so just fill in all the parameters.
-				params["idFrom"] = notifyCode->nmhdr.idFrom;
-				params["hwndFrom"] = notifyCode->nmhdr.hwndFrom;
 				params["position"] = notifyCode->position;
 				params["modificationType"] = notifyCode->modificationType;
 				if (notifyCode->text) 

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ std::wstring HelpController::getTopicUrl()`
`139`	`139`	`url.append(buffer + dotPosition + 1);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-`
	`142`	`+`
	`143`	`+ delete[] buffer;`
	`144`	`+`
`143`	`145`	`return WcharMbcsConverter::char2tchar(url.c_str()).get();`
`144`	`146`	`}`