summaryrefslogtreecommitdiff
path: root/sal/systools
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-01-28 12:55:54 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-01-28 12:55:54 +0000
commit45e7094e78957c4719366d688406b3da18fb01a8 (patch)
treee2c0c598743a4fd852bc055b6725be5c59de49fb /sal/systools
parente42d7c728f154c9f57b8078ecbc2e5d345cf2669 (diff)
INTEGRATION: CWS hro26_SRC680 (1.5.38); FILE MERGED
2008/01/14 16:33:29 hro 1.5.38.1: #144435# SEC handling of bug in wininet.dll that causes InternetGetConnectedStateEx to crash
Diffstat (limited to 'sal/systools')
-rw-r--r--sal/systools/win32/onlineupdate/onlinecheck.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/sal/systools/win32/onlineupdate/onlinecheck.cxx
index edb5d79f6da2..2607feb75991 100644
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ b/sal/systools/win32/onlineupdate/onlinecheck.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: onlinecheck.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2007-10-26 11:29:27 $
+ * last change: $Author: vg $ $Date: 2008-01-28 13:55:54 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -58,6 +58,7 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
DWORD dwFlags;
TCHAR szConnectionName[1024];
+ __try {
BOOL fIsConnected = InternetGetConnectedStateEx(
&dwFlags,
szConnectionName,
@@ -65,4 +66,8 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
0 );
return fIsConnected ? sal_True : sal_False;
+
+ } __except( EXCEPTION_EXECUTE_HANDLER ) {
+ return sal_False;
+ }
}