[tkreuzer] 50864: [NOTEPAD] Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string. By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns. See issue #...

Author: tkreuzer
Date: Tue Feb 22 09:59:49 2011
New Revision: 50864

URL: http://svn.reactos.org/svn/reactos?rev=50864&view=rev
Log:
[NOTEPAD]
Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string.
By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns.

See issue #5871 for more details.

Modified:
    trunk/reactos/base/applications/notepad/dialog.c
    trunk/reactos/base/applications/notepad/notepad.h

Modified: trunk/reactos/base/applications/notepad/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Tue Feb 22 09:59:49
2011
@@ -112,31 +112,27 @@
 
 /**
  * Sets the caption of the main window according to Globals.szFileTitle:
- *    Notepad - (untitled)      if no file is open
- *    Notepad - [filename]      if a file is given
+ *    (untitled) - Notepad      if no file is open
+ *    [filename] - Notepad      if a file is given
  */
 static void UpdateWindowCaption(void)
 {
   TCHAR szCaption[MAX_STRING_LEN];
-  TCHAR szUntitled[MAX_STRING_LEN];
-
-  LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, SIZEOF(szCaption));
-
-  if (Globals.szFileTitle[0] != '\0') {
-      static const TCHAR bracket_l[] = _T(" - [");
-      static const TCHAR bracket_r[] = _T("]");
-      _tcscat(szCaption, bracket_l);
-      _tcscat(szCaption, Globals.szFileTitle);
-      _tcscat(szCaption, bracket_r);
+  TCHAR szNotepad[MAX_STRING_LEN];
+
+  LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));
+
+  if (Globals.szFileTitle[0] != '\0')
+  {
+      StringCchCat(szCaption, MAX_STRING_LEN, Globals.szFileTitle);
   }
   else
   {
-      static const TCHAR hyphen[] = _T(" - ");
-      LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled));
-      _tcscat(szCaption, hyphen);
-      _tcscat(szCaption, szUntitled);
+      LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption));
   }
-
+  
+  StringCchCat(szCaption, MAX_STRING_LEN, _T(" - "));
+  StringCchCat(szCaption, MAX_STRING_LEN, szNotepad);
   SetWindowText(Globals.hMainWnd, szCaption);
 }
 
@@ -684,7 +680,7 @@
     _tcscat(szText, _T(" "));
     GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate,
MAX_STRING_LEN);
     _tcscat(szText, szDate);
-    SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate);
+    SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szText);
 }
 
 VOID DoCreateStatusBar(VOID)
@@ -766,7 +762,7 @@
 {
     DWORD  dwStyle;
     int    iSize;
-    LPTSTR pTemp;
+    LPTSTR pTemp = NULL;
 
     iSize = 0;
 

Modified: trunk/reactos/base/applications/notepad/notepad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] Tue Feb 22 09:59:49
2011
@@ -6,6 +6,7 @@
 #include <tchar.h>
 #include <richedit.h>
 #include <malloc.h>
+#include <strsafe.h>
 
 #include "main.h"
 #include "dialog.h"