summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-08-24 17:14:45 +0200
committerMichael Stahl <mstahl@redhat.com>2017-08-24 21:26:03 +0200
commit41fb6822cbc2f82333ea54db816f60616f827e49 (patch)
treee58e528ee24bb0731242efe2a2db0ff7aed2bab2 /vcl
parent80d8cbb8e1444ff89dd61b270b43995623e95662 (diff)
vcl: fix double-free of ErrorInfo
The only value that ErrorHandler::GetErrorString() adds over ErrorStringFactory::CreateString() is that it will delete the pInfo a 2nd time, because the ErrorInfo::GetErrorInfo() returns the same object twice. This may fix it, but it's generally hard to tell what this brain damaged error handling code will do. (regression from 1167df7df59e37fddef0c40c4d27cb2e82e10922) Change-Id: I22f446bee669cae8c5288bcc2f1e1d0299f5b384
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/errinf.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 0eb4c0160e8c..40849ca916e1 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -148,7 +148,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId, DialogMask nFlags)
}
OUString aErr;
- if (ErrorHandler::GetErrorString(nErrCodeId, aErr))
+ if (ErrorStringFactory::CreateString(pInfo, aErr))
{
if(!rData.pDsp)
{