[Libreoffice-commits] core.git: package/qa package/source

2023-03-09 Thread Caolán McNamara (via logerrit)
 package/qa/cppunit/data/pass/ofz56826-1.zip |binary
 package/source/zipapi/MemoryByteGrabber.hxx |   10 ++
 package/source/zipapi/ZipFile.cxx   |4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 59b0f676758dd752457c84fb4159f6446d74e8a4
Author: Caolán McNamara 
AuthorDate: Thu Mar 9 09:25:32 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 9 10:18:42 2023 +

ofz#56826 Heap-use-after-free

since:

commit abda72eeac19b18c22f57d5443c3955a463605d7
Date:   Mon Feb 20 00:32:22 2023 +0100

tdf#82984 tdf#94915 zip64 support (import + export)

Change-Id: Iffc1c54b3ccc5464e217d7f94ecc34b57ec1afb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/package/qa/cppunit/data/pass/ofz56826-1.zip 
b/package/qa/cppunit/data/pass/ofz56826-1.zip
new file mode 100644
index ..b9acfe34da14
Binary files /dev/null and b/package/qa/cppunit/data/pass/ofz56826-1.zip differ
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx 
b/package/source/zipapi/MemoryByteGrabber.hxx
index a4d9f0b1ba49..de59756d2187 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -58,6 +58,16 @@ public:
 nInt16 |= ( mpBuffer[mnCurrent++] & 0xFF ) << 8;
 return nInt16;
 }
+
+sal_Int16 ReadUInt16()
+{
+if (mnCurrent + 2 > mnEnd )
+return 0;
+sal_uInt16 nInt16  =  mpBuffer[mnCurrent++] & 0xFF;
+nInt16 |= ( mpBuffer[mnCurrent++] & 0xFF ) << 8;
+return nInt16;
+}
+
 sal_Int32 ReadInt32()
 {
 if (mnCurrent + 4 > mnEnd )
diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 41325f47e38f..78d746ac1b70 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -1002,12 +1002,12 @@ void ZipFile::readExtraFields(MemoryByteGrabber& 
aMemGrabber, sal_Int16 nExtraLe
 while (nExtraLen > 0) // Extensible data fields
 {
 sal_Int16 nheaderID = aMemGrabber.ReadInt16();
-sal_Int16 dataSize = aMemGrabber.ReadInt16();
+sal_uInt16 dataSize = aMemGrabber.ReadUInt16();
 if (nheaderID == 1) // Load Zip64 Extended Information Extra Field
 {
 // Datasize should be 28byte but some files have less (maybe non 
standard?)
 nSize = aMemGrabber.ReadUInt64();
-sal_Int16 nReadSize = 8;
+sal_uInt16 nReadSize = 8;
 if (dataSize >= 16)
 {
 nCompressedSize = aMemGrabber.ReadUInt64();


[Libreoffice-commits] core.git: package/qa

2021-05-16 Thread Noel Grandin (via logerrit)
 package/qa/cppunit/test_package.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1070cd26d80399036ae11d81ddb62c0c5601b315
Author: Noel Grandin 
AuthorDate: Sat May 15 18:16:21 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun May 16 20:46:09 2021 +0200

speed up package test

Change-Id: I9e0e2520a9851923d2910a2e487dab589b23eafd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115672
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/package/qa/cppunit/test_package.cxx 
b/package/qa/cppunit/test_package.cxx
index 62c718421c7c..6f767295618c 100644
--- a/package/qa/cppunit/test_package.cxx
+++ b/package/qa/cppunit/test_package.cxx
@@ -106,7 +106,8 @@ namespace
 const std::vector& rBuf = *itBuf;
 CPPUNIT_ASSERT_EQUAL(size_t(1048576), rBuf.size()); // 1 MB 
each.
 for (char check : rBuf)
-CPPUNIT_ASSERT_EQUAL(c, check);
+if (c != check)
+CPPUNIT_ASSERT_MESSAGE("stream does not contain 
expected data", false);
 }
 }
 
@@ -174,6 +175,7 @@ namespace
 
 for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
 {
+itBuf->reserve(1024*1024);
 OUString aName = OUStringChar(c) + ".txt";
 
 uno::Reference xStrm;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: package/qa

2020-09-26 Thread Andrea Gelmini (via logerrit)
 package/qa/ofopxmlstorages/TestHelper.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1558b9ee696b021fd2d6431179413dc9ef58fe69
Author: Andrea Gelmini 
AuthorDate: Fri Sep 25 12:39:59 2020 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 26 11:36:05 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Ib1b92b38f3eeb37d659b79572cafc1e3b79fcf29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103458
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/package/qa/ofopxmlstorages/TestHelper.java 
b/package/qa/ofopxmlstorages/TestHelper.java
index abc92885de6e..b7f42ea7fd3f 100644
--- a/package/qa/ofopxmlstorages/TestHelper.java
+++ b/package/qa/ofopxmlstorages/TestHelper.java
@@ -897,7 +897,7 @@ public class TestHelper  {
 try
 {
 Object oDummyStream = xStorage.openStreamElement( sName, nMode );
-Error( "The trying to open substoream '" + sName + "' must fail!" 
);
+Error( "The trying to open substream '" + sName + "' must fail!" );
 }
 catch( Exception e )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: package/qa swext/mediawiki

2019-07-26 Thread Andrea Gelmini (via logerrit)
 package/qa/storages/RegressionTest_i27773.java |2 
+-
 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java  |2 
+-
 swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java |4 
++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3e7badd7755385b98c8564b0ec89d356ff3dc00d
Author: Andrea Gelmini 
AuthorDate: Tue Jul 23 19:57:24 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Jul 26 16:00:12 2019 +0200

Fix typo

"noncommited"

Change-Id: Ia22431edf221d3824d84512f0e77dbb1758f35cd
Reviewed-on: https://gerrit.libreoffice.org/75982
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/package/qa/storages/RegressionTest_i27773.java 
b/package/qa/storages/RegressionTest_i27773.java
index ac592d965766..2348a809ce90 100644
--- a/package/qa/storages/RegressionTest_i27773.java
+++ b/package/qa/storages/RegressionTest_i27773.java
@@ -168,7 +168,7 @@ public class RegressionTest_i27773 implements StorageTest {
 return false;
 
 
-// copy all the changed and noncommited substorages
+// copy all the changed and noncommitted substorages
 // and dispose them
 
 
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 573a6dd75b11..3d1bee21e735 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -208,7 +208,7 @@ public final class WikiEditorImpl extends WeakBase
 throw new com.sun.star.uno.RuntimeException();
 }
 
-m_aSettings.loadConfiguration(); // throw away all the 
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the 
noncommitted changes
 // show the send dialog
 aSendDialog = new WikiPropDialog( m_xContext, 
"vnd.sun.star.script:WikiEditor.SendToMediaWiki?location=application", this );
 aSendDialog.fillWikiList();
diff --git 
a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index c3a1f462a89f..c35246be4d9c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -233,11 +233,11 @@ public final class WikiOptionsEventHandlerImpl extends 
WeakBase
 m_xDialog = UnoRuntime.queryInterface( XDialog.class, 
xWindow );
 m_xControlContainer = UnoRuntime.queryInterface( 
XControlContainer.class, m_xDialog );
 m_aSettings = Settings.getSettings( m_xContext );
-m_aSettings.loadConfiguration(); // throw away all the 
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the 
noncommitted changes
 InitStrings();
 }
 else if ( m_aSettings != null )
-m_aSettings.loadConfiguration(); // throw away all the 
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the 
noncommitted changes
 
 RefreshView();
 CheckButtonState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: package/qa package/source sc/source sw/source

2017-06-11 Thread Andrea Gelmini
 package/qa/cppunit/test_package.cxx   |2 +-
 package/source/zipapi/XBufferedThreadedStream.cxx |2 +-
 sc/source/ui/docshell/dbdocfun.cxx|2 +-
 sw/source/filter/html/htmlform.cxx|6 +++---
 sw/source/filter/ww8/ww8graf.cxx  |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5c1aedccd2a96d0ecd51f477d2f2b68f50d61338
Author: Andrea Gelmini 
Date:   Fri Jun 9 12:52:59 2017 +0200

Fix typos

Change-Id: I81740a3ff9474e971556e9e7d4aa245151163d0e
Reviewed-on: https://gerrit.libreoffice.org/38608
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/package/qa/cppunit/test_package.cxx 
b/package/qa/cppunit/test_package.cxx
index 0e1f4778184d..d4d533f67002 100644
--- a/package/qa/cppunit/test_package.cxx
+++ b/package/qa/cppunit/test_package.cxx
@@ -188,7 +188,7 @@ namespace
 sal_Int32 nSize = xStrm->available();
 
 uno::Sequence aBytes;
-//Read chuncks of increasing size
+//Read chunks of increasing size
 nReadSize += 1024;
 
 while (nSize > 0)
diff --git a/package/source/zipapi/XBufferedThreadedStream.cxx 
b/package/source/zipapi/XBufferedThreadedStream.cxx
index 59a89f9c64e1..b8ae6e644e25 100644
--- a/package/source/zipapi/XBufferedThreadedStream.cxx
+++ b/package/source/zipapi/XBufferedThreadedStream.cxx
@@ -69,7 +69,7 @@ XBufferedThreadedStream::~XBufferedThreadedStream()
 }
 
 /**
- * Reads from UnbufferedStream in a seperate thread and stores the buffer 
blocks
+ * Reads from UnbufferedStream in a separate thread and stores the buffer 
blocks
  * in maPendingBuffers queue for further use.
  */
 void XBufferedThreadedStream::produce()
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 71426d86ea70..5f1eb7acde8a 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -742,7 +742,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 rDoc.CopyToDocument(aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
 aLocalParam.nCol2, aLocalParam.nRow2, nDestTab,
 InsertDeleteFlags::ALL, false, *pUndoDoc);
-//  secure attributs in case they were copied along
+//  secure attributes in case they were copied along
 
 if (pDestData)
 {
diff --git a/sw/source/filter/html/htmlform.cxx 
b/sw/source/filter/html/htmlform.cxx
index b60dde8388de..fcab7345168d 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -374,7 +374,7 @@ public:
 bool bWidth, bool bHeight );
 
 // startProduction can not be called in the constructor because it can
-// destruct itself, hence a seperate method.
+// destruct itself, hence a separate method.
 void start() { xSrc->getImageProducer()->startProduction(); }
 
 // UNO binding
@@ -1530,7 +1530,7 @@ void SwHTMLParser::InsertInput()
 }
 else
 {
-// evaluation of ALIGN for all contols is not a good idea as long as
+// evaluation of ALIGN for all controls is not a good idea as long as
 // paragraph bound controls do not influence the height of the cells 
of a table
 eVertOri = text::VertOrientation::TOP;
 eHoriOri = text::HoriOrientation::NONE;
@@ -1640,7 +1640,7 @@ void SwHTMLParser::InsertInput()
 xPropSet->setPropertyValue("Label",
 aTmp );
 // RadioButton: The DefaultChecked property should only be set
-// if the control has been created and activeTabOrder has been 
called
+// if the control has been created and activateTabOrder has been 
called
 // because otherwise it would still belong to the previous group.
 if( HTMLInputType::Checkbox == eType )
 {
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index d404d6c9c29c..7479e709577d 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -977,7 +977,7 @@ OutlinerParaObject* 
SwWW8ImplReader::ImportAsOutliner(OUString , WW8_CP
 return pRet;
 }
 
-// InsertTxbxText() adds the Text and the Attributs for TextBoxes and 
CaptionBoxes
+// InsertTxbxText() adds the Text and the Attributes for TextBoxes and 
CaptionBoxes
 void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
 Size* pObjSiz, sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp,
 SwFrameFormat* pOldFlyFormat, bool bMakeSdrGrafObj, bool& rbEraseTextObj,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: package/qa package/source

2014-02-26 Thread Alexander Wilms
 package/qa/ofopxmlstorages/Test01.java   |4 -
 package/qa/ofopxmlstorages/Test02.java   |4 -
 package/qa/ofopxmlstorages/Test03.java   |4 -
 package/qa/ofopxmlstorages/Test04.java   |4 -
 package/qa/ofopxmlstorages/Test05.java   |4 -
 package/qa/ofopxmlstorages/Test07.java   |   12 ++---
 package/qa/ofopxmlstorages/Test08.java   |   12 ++---
 package/qa/storages/BorderedStream.java  |   48 +++
 package/qa/storages/RegressionTest_114358.java   |8 +--
 package/qa/storages/RegressionTest_i26398.java   |8 +--
 package/qa/storages/RegressionTest_i27773.java   |   12 ++---
 package/qa/storages/RegressionTest_i29169.java   |   24 +--
 package/qa/storages/RegressionTest_i29321.java   |8 +--
 package/qa/storages/RegressionTest_i30400.java   |   36 -
 package/qa/storages/RegressionTest_i30677.java   |   24 +--
 package/qa/storages/RegressionTest_i35095.java   |4 -
 package/qa/storages/RegressionTest_i46848.java   |8 +--
 package/qa/storages/RegressionTest_i49755.java   |8 +--
 package/qa/storages/RegressionTest_i55821.java   |8 +--
 package/qa/storages/RegressionTest_i59886.java   |8 +--
 package/qa/storages/RegressionTest_i61909.java   |8 +--
 package/qa/storages/RegressionTest_i84234.java   |8 +--
 package/qa/storages/Test01.java  |4 -
 package/qa/storages/Test02.java  |4 -
 package/qa/storages/Test03.java  |4 -
 package/qa/storages/Test04.java  |4 -
 package/qa/storages/Test05.java  |4 -
 package/qa/storages/Test07.java  |4 -
 package/qa/storages/Test08.java  |4 -
 package/qa/storages/Test09.java  |4 -
 package/qa/storages/Test10.java  |   12 ++---
 package/qa/storages/Test11.java  |   12 ++---
 package/qa/storages/Test12.java  |   12 ++---
 package/qa/storages/Test13.java  |8 +--
 package/qa/storages/Test14.java  |8 +--
 package/qa/storages/Test15.java  |8 +--
 package/qa/storages/Test16.java  |4 -
 package/qa/storages/Test17.java  |4 -
 package/qa/storages/Test18.java  |4 -
 package/source/xstor/switchpersistencestream.hxx |2 
 package/source/xstor/xstorage.cxx|2 
 41 files changed, 186 insertions(+), 186 deletions(-)

New commits:
commit d148739576fbb555099b51df39b51678f573a8a5
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date:   Tue Feb 25 19:38:36 2014 +0100

Remove visual noise from package

Change-Id: Icef40ad2d451d3c5ca90ed4b305ece5430d352f7
Reviewed-on: https://gerrit.libreoffice.org/8289
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/package/qa/ofopxmlstorages/Test01.java 
b/package/qa/ofopxmlstorages/Test01.java
index b317051..f27f34e 100644
--- a/package/qa/ofopxmlstorages/Test01.java
+++ b/package/qa/ofopxmlstorages/Test01.java
@@ -151,9 +151,9 @@ public class Test01 implements StorageTest {
 if ( !m_aTestHelper.disposeStorage( xTempStorage ) || 
!m_aTestHelper.disposeStorage( xTempFileStorage ) )
 return false;
 
-// 
+
 // now check all the written and copied information
-// 
+
 
 // the temporary file must not be locked any more after storage 
disposing
 XStorage xResultStorage = m_aTestHelper.createStorageFromURL( 
m_xStorageFactory,
diff --git a/package/qa/ofopxmlstorages/Test02.java 
b/package/qa/ofopxmlstorages/Test02.java
index 1da5855..a39e78c 100644
--- a/package/qa/ofopxmlstorages/Test02.java
+++ b/package/qa/ofopxmlstorages/Test02.java
@@ -125,9 +125,9 @@ public class Test02 implements StorageTest {
 return false;
 
 
-// 
+
 // now check all the written information
-// 
+
 
 // close the output part of the temporary stream
 // the output part must present since we already wrote to the 
stream
diff --git a/package/qa/ofopxmlstorages/Test03.java 
b/package/qa/ofopxmlstorages/Test03.java
index 1aef721..703e420 100644
--- a/package/qa/ofopxmlstorages/Test03.java
+++ b/package/qa/ofopxmlstorages/Test03.java
@@ -115,9 +115,9 @@ public class Test03 implements StorageTest {
 if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
 return false;
 
-// 
+
 // check storage hyerarchy tree
-//