From c13ec5fbad1bbdc5a40a70b3d0b4ca86c01708fb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 13 Jan 2011 23:49:18 +0200 Subject: Fix buffer size problem that broke MSI installer localization (cherry picked from commit 5b7719a49fd57a9f446201fabc02bf1787dbbeee) Signed-off-by: Thorsten Behrens --- desktop/win32/source/setup/setup.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'desktop/win32/source/setup/setup.cpp') diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp index 8bebaa22de..17466960b6 100644 --- a/desktop/win32/source/setup/setup.cpp +++ b/desktop/win32/source/setup/setup.cpp @@ -265,22 +265,21 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection, { if ( !rSize || !*pRetBuf ) { - rSize = 512; + rSize = 10000; *pRetBuf = new TCHAR[ rSize ]; } DWORD nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName ); - if ( nRet && ( nRet + 2 > rSize ) ) // buffer was too small, retry with bigger one + while ( nRet && ( nRet + 2 == rSize ) ) // buffer was too small, retry until big enough { - if ( nRet < 32767 - 2 ) - { - delete [] (*pRetBuf); - rSize = nRet + 2; - *pRetBuf = new TCHAR[ rSize ]; + if (rSize > 1000000) + break; + delete [] (*pRetBuf); + rSize = rSize * 2; + *pRetBuf = new TCHAR[ rSize ]; - nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName ); - } + nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName ); } if ( !nRet ) @@ -292,7 +291,7 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection, Log( sBuf ); return false; } - else if ( nRet + 2 > rSize ) + else if ( nRet + 2 == rSize ) { SetError( ERROR_OUTOFMEMORY ); Log( TEXT( "ERROR: GetPrivateProfileSection() out of memory\r\n" ) ); -- cgit v1.2.3