sot/source/sdstor/stgelem.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 135a37bd7b5a1a50e3da9cc666402adbd348d025 Author: Markus Mohrhard <[email protected]> Date: Mon Feb 10 23:38:32 2014 +0100 fix crash during xls import, related fdo#36580 Looks like a possibly invalid xls file but let us just do the right thing and not crash. Change-Id: Id96db06798cd19d96938ca84956046e5a5e5b529 Reviewed-on: https://gerrit.libreoffice.org/7985 Reviewed-by: Kohei Yoshida <[email protected]> Tested-by: Kohei Yoshida <[email protected]> diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 4299994..4d2d154 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -299,7 +299,7 @@ bool StgEntry::SetName( const OUString& rName ) } int i; - for( i = 0; i < aName.getLength() && i < 32; i++ ) + for( i = 0; i < rName.getLength() && i < 32; i++ ) { nName[ i ] = rName[ i ]; } @@ -307,7 +307,7 @@ bool StgEntry::SetName( const OUString& rName ) { nName[ i++ ] = 0; } - nNameLen = ( aName.getLength() + 1 ) << 1; + nNameLen = ( rName.getLength() + 1 ) << 1; return true; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
