diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 16:45:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 16:45:57 +0000 |
| commit | 3bd11eee00f013455239584711f45c69768edcdb (patch) | |
| tree | 9cc47d3c87fa1652da686a306bca5d703411dffe /remotebridges | |
| parent | 4370dc40b31957837e9c9cbd76253a782a27aa76 (diff) | |
INTEGRATION: CWS geordi2q11 (1.2.78); FILE MERGED
2003/12/16 14:35:57 hr 1.2.78.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'remotebridges')
| -rw-r--r-- | remotebridges/source/bridge/bridge_connection.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/remotebridges/source/bridge/bridge_connection.cxx b/remotebridges/source/bridge/bridge_connection.cxx index 7f12efa6731c..c331a78976d2 100644 --- a/remotebridges/source/bridge/bridge_connection.cxx +++ b/remotebridges/source/bridge/bridge_connection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bridge_connection.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jbu $ $Date: 2001-06-22 16:39:16 $ + * last change: $Author: vg $ $Date: 2003-12-17 17:45:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,6 +109,13 @@ namespace remotebridges_bridge { // TODO possible optimization : give ::rtl::ByteSequence seq( nSize , ::rtl::BYTESEQ_NODEFAULT ); + + // #i20906#: Handle out-of-memory condition. + // Clean solution will be supplied with #i22343# (ByteSequence + // ctor will throw ::std::bad_alloc()) + if ( seq.getHandle() == 0 ) + return 0; + sal_Int32 nRead = m->m_r->read( *(Sequence<sal_Int8>*)&seq , nSize ); memcpy( pDest , seq.getConstArray() , nRead ); return nRead; |