Sync up to trunk head before merging.

svn path=/branches/ntvdm/; revision=63176
reactos · May 6, 2014 · 8eb1b03 · 8eb1b03
1 parent 6015e6b
commit 8eb1b03
Show file tree

Hide file tree

Showing 52 changed files with 2,699 additions and 2,602 deletions.
diff --git a/base/applications/network/ftp/cmds.c b/base/applications/network/ftp/cmds.c
@@ -1303,13 +1303,13 @@ void shell(int argc, const char *argv[])
 
     if (argc > 1)
     {
-        strncat(CmdLine, " /C", MAX_PATH);
+        strncat(CmdLine, " /C", MAX_PATH - strlen(CmdLine) - 1);
     }
 
     for (i=1; i<argc; i++)
     {
-        strncat(CmdLine, " ", MAX_PATH);
-        strncat(CmdLine, argv[i], MAX_PATH);
+        strncat(CmdLine, " ", MAX_PATH - strlen(CmdLine) - 1);
+        strncat(CmdLine, argv[i], MAX_PATH - strlen(CmdLine) - 1); 
     }
 
     StartupInfo.cb          = sizeof( StartupInfo );

diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c
@@ -333,8 +333,8 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass)
                                (PBYTE)lpKeyClass,
                                &dwDataSize) != ERROR_SUCCESS)
             {
-                lpKeyClass = NULL;
                 HeapFree(ProcessHeap, 0, lpKeyClass);
+                lpKeyClass = NULL;
                 continue;
             }
         }

diff --git a/base/applications/network/telnet/src/ansiprsr.cpp b/base/applications/network/telnet/src/ansiprsr.cpp
@@ -709,7 +709,7 @@ char* TANSIParser::ParseEscapeANSI(char* pszBuffer, char* pszBufferEnd)
 		case 'n':
 			if (iCurrentParam == 1 && iParam[0]==5) {
 				// report the cursor position
-				Network.WriteString("\x1B[0n", 6);
+				Network.WriteString("\x1B[0n", 4);
 				break;
 			}
 			if (iCurrentParam == 1 && iParam[0]==6){