summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-06-08 14:08:51 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-06-08 14:11:52 +0100
commitd376d6649bbdca6a5d36c8ef2a43ce3890c01d89 (patch)
treed23578e7b6a5674917ce9d5e6adfecc433e61842 /sal
parent11a54814be785766d797cc83cfdacd2368ea642c (diff)
targetted reversion of minor cppcheck fix
Change-Id: If67666bccbde6d2104295c5480c3eceb95b6ce35
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/w32/security.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index d2e0ef7665a3..82fd8335e4c4 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -338,17 +338,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
pInfoBuffer, nInfoBuffer, &nInfoBuffer))
{
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
- {
- UCHAR* pTmp = realloc(pInfoBuffer, nInfoBuffer);
- if (pTmp)
- pInfoBuffer = pTmp;
- else
- {
- free(pInfoBuffer);
- pInfoBuffer = NULL;
- break;
- }
- }
+ pInfoBuffer = realloc(pInfoBuffer, nInfoBuffer);
else
{
free(pInfoBuffer);
@@ -875,17 +865,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
pInfoBuffer, nInfoBuffer, &nInfoBuffer))
{
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
- {
- UCHAR* pTmp = realloc(pInfoBuffer, nInfoBuffer);
- if (pTmp)
- pInfoBuffer = pTmp;
- else
- {
- free(pInfoBuffer);
- pInfoBuffer = NULL;
- break;
- }
- }
+ pInfoBuffer = realloc(pInfoBuffer, nInfoBuffer);
else
{
free(pInfoBuffer);