From 323a6f6137ae8581df67af689f0888141c6dcbea Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Sat, 5 Dec 2009 17:35:54 +0000 Subject: [PATCH] Fix a potential buffer owerflow. Noticed by Martin Ettl with cppcheck. Bug #4987. svn path=/trunk/; revision=44413 --- .../base/applications/network/telnet/src/tnmisc.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/network/telnet/src/tnmisc.cpp b/reactos/base/applications/network/telnet/src/tnmisc.cpp index e3fa27ede1e..25e319a81aa 100644 --- a/reactos/base/applications/network/telnet/src/tnmisc.cpp +++ b/reactos/base/applications/network/telnet/src/tnmisc.cpp @@ -1,6 +1,5 @@ #include -#include -#include +#include #include "tnmisc.h" @@ -139,10 +138,9 @@ bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldS // (Paul Brannan 12/17/98) #ifndef __BORLANDC__ // Ioannou Dec. 8, 1998 if(!hIcon) { - char filename[128]; // load from telnet.ico - strncpy(filename, icondir, sizeof(filename)); - strncat(filename, "telnet.ico", sizeof(filename)); - filename[sizeof(filename) - 1] = 0; + char filename[MAX_PATH]; // load from telnet.ico + _snprintf(filename, MAX_PATH - 1, "%s%s", icondir, "telnet.ico"); + filename[MAX_PATH - 1] = '\0'; // Note: loading the icon from a file doesn't work on NT // There is no LoadImage in Borland headers - only LoadIcon -- 2.17.1