extensions/source/scanner/scanwin.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 63869fbbf1e092cc1f3deab21b7c0d8cab40abca
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Jun 12 14:13:36 2016 +0100
Resolves: tdf#92478 avoid crash on using scanner on windows x64
which appears to correspond to backtrace
http://crashreport.libreoffice.org/stats/crash_details/ad46ef89-6b98-44f9-b060-ccb25015269d
(prevents the crash only, does not enable scanning on x64)
Change-Id: Ic5a4b66028db6ba4aea08baf5bf4a672f71745a0
Reviewed-on: https://gerrit.libreoffice.org/26197
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit 7c983445656e1f1942cf2d7398a77342004ed168)
Reviewed-on: https://gerrit.libreoffice.org/26247
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index dfa4b84..fb4fc15 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -323,7 +323,10 @@ bool ImpTwain::ImplHandleMsg( void* pMsg )
PTWAINMSG pMess = (PTWAINMSG) pMsg;
TW_EVENT aEvt = { pMess, MSG_NULL };
- nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT,
MSG_PROCESSEVENT, &aEvt );
+ if (pDSM)
+ nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT,
MSG_PROCESSEVENT, &aEvt );
+ else
+ nRet = TWRC_NOTDSEVENT;
if( aEvt.TWMessage != MSG_NULL )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
