You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ks...@apache.org on 2016/07/29 15:18:33 UTC
svn commit: r1754535 - in
/openoffice/branches/AOO410/main/tools/source/generic: ./ poly2.cxx
Author: kschenk
Date: Fri Jul 29 15:18:33 2016
New Revision: 1754535
URL: http://svn.apache.org/viewvc?rev=1754535&view=rev
Log:
Fixes for CVE-2016-1513
Modified:
openoffice/branches/AOO410/main/tools/source/generic/ (props changed)
openoffice/branches/AOO410/main/tools/source/generic/poly2.cxx
Propchange: openoffice/branches/AOO410/main/tools/source/generic/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 29 15:18:33 2016
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/tools/source/generic:1503684
+/openoffice/branches/ia2/main/tools/source/generic:1417739-1541842
+/openoffice/branches/ooxml-osba/main/tools/source/generic:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/tools/source/generic:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/tools/source/generic:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1
697807,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707844,1708477,1708483,1709212,1709377,1709403,1753426
Modified: openoffice/branches/AOO410/main/tools/source/generic/poly2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/tools/source/generic/poly2.cxx?rev=1754535&r1=1754534&r2=1754535&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/tools/source/generic/poly2.cxx (original)
+++ openoffice/branches/AOO410/main/tools/source/generic/poly2.cxx Fri Jul 29 15:18:33 2016
@@ -198,6 +198,7 @@ void PolyPolygon::Remove( sal_uInt16 nPo
{
DBG_CHKTHIS( PolyPolygon, NULL );
DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" );
+ if ( nPos >= Count() ) return; // not removable
if ( mpImplPolyPolygon->mnRefCount > 1 )
{
@@ -218,6 +219,7 @@ void PolyPolygon::Replace( const Polygon
{
DBG_CHKTHIS( PolyPolygon, NULL );
DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
+ if ( nPos >= Count() ) return; // not replaceable
if ( mpImplPolyPolygon->mnRefCount > 1 )
{