Author: dgorbachev
Date: Sat Dec 5 18:35:54 2009
New Revision: 44413
URL: http://svn.reactos.org/svn/reactos?rev=44413&view=rev
Log:
Fix a potential buffer owerflow. Noticed by Martin Ettl with cppcheck. Bug
#4987.
Modified:
trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp
Modified: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp?rev=44413&r1=44412&r2=44413&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1]
Sat Dec 5 18:35:54 2009
@@ -1,6 +1,5 @@
#include <windows.h>
-#include <stdlib.h>
-#include <memory.h>
+#include <stdio.h>
#include "tnmisc.h"
@@ -139,10 +138,9 @@
// (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
