Hello all,
attached is a patch against trunk r1860 (diff -up in svn format) for
fixing the ABI (changing it back to the 0.9.5 state for the method
PdfPage::GetInheritedKeyFromObject() after the fix for CVE-2017-5852).
I'm sorry to not have tested it because the security policy of the
system I'm writing this from doesn't allow me to, please be so kind
to test and accept it nevertheless into PoDoFo trunk.
Best regards, mabri
--- src/doc/PdfPage.h (revision 1860)
+++ src/doc/PdfPage.h (working copy)
@@ -291,7 +291,10 @@ class PODOFO_DOC_API PdfPage : public Pd
/** Method for getting a key value that could be inherited (such as the boxes, resources, etc.)
* \returns PdfObject - the result of the key fetching or NULL
*/
- const PdfObject* GetInheritedKeyFromObject( const char* inKey, const PdfObject* inObject, int depth = 0 ) const;
+ const PdfObject* GetInheritedKeyFromObject( const char* inKey, const PdfObject* inObject ) const; // wraps the next one
+
+ // this is introduced by the fix for CVE-2017-5852, the depth param counts recursion depth, is checked against a max
+ const PdfObject* GetInheritedKeyFromObject( const char* inKey, const PdfObject* inObject, int depth ) const PODOFO_LOCAL;
/** Get the annotations array.
* \param bCreate if true the annotations array is created
--- src/doc/PdfPage.cpp (revision 1860)
+++ src/doc/PdfPage.cpp (working copy)
@@ -212,6 +212,11 @@ PdfRect PdfPage::CreateStandardPageSize(
return rect;
}
+const PdfObject* PdfPage::GetInheritedKeyFromObject( const char* inKey, const PdfObject* inObject ) const
+{
+ return GetInheritedKeyFromObject( inKey, inObject, 0);
+}
+
const PdfObject* PdfPage::GetInheritedKeyFromObject( const char* inKey, const PdfObject* inObject, int depth ) const
{
const PdfObject* pObj = NULL;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Podofo-users mailing list
Podofo-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/podofo-users
