From 6a89b41bfff53bb78d3ef8019389990af9c6cf61 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Fri, 22 Apr 2011 21:29:30 +0000 Subject: [PATCH] [ipconfig] Respect the size parameter in the LoadStringAndOem helper function, fixes "ipconfig /?" See issue #6146 for more details. svn path=/trunk/; revision=51434 --- .../applications/network/ipconfig/ipconfig.c | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/network/ipconfig/ipconfig.c b/reactos/base/applications/network/ipconfig/ipconfig.c index 26576144190..2561b3601a9 100644 --- a/reactos/base/applications/network/ipconfig/ipconfig.c +++ b/reactos/base/applications/network/ipconfig/ipconfig.c @@ -28,13 +28,21 @@ HANDLE ProcessHeap; int LoadStringAndOem(HINSTANCE hInst, UINT uID, LPTSTR szNode, - int Siz -) + int byteSize +) { - TCHAR szTmp[25]; - int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); + TCHAR *szTmp; + int res; + + szTmp = (LPTSTR)HeapAlloc(ProcessHeap, 0, byteSize); + if (szTmp == NULL) + { + return 0; + } + res = LoadString(hInst, uID, szTmp, byteSize); CharToOem(szTmp, szNode); - return(res); + HeapFree(ProcessHeap, 0, szTmp); + return res; } LPTSTR GetNodeTypeName(UINT NodeType) @@ -702,7 +710,7 @@ VOID Usage(VOID) Size)) { _tprintf(_T("%s"), lpUsage); - } + } } }