diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-12 14:13:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-14 15:04:53 +0000 |
| commit | 63869fbbf1e092cc1f3deab21b7c0d8cab40abca (patch) | |
| tree | 4ae707fc48258b0c1df4139cdd781f15f044f2c4 /extensions | |
| parent | fcd459234f0256742530698509e4529b2633547e (diff) | |
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 <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 7c983445656e1f1942cf2d7398a77342004ed168)
Reviewed-on: https://gerrit.libreoffice.org/26247
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index dfa4b84fa541..fb4fc1592579 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 ) { |