mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#982760 Dereference null return value

Browse Source 
Change-Id: I779fa5fa418370dd6c53308943374e981f65ae29
This commit is contained in:
Caolán McNamara
2014-05-26 14:58:59 +01:00
parent c6c135930c
commit 5bdc28028c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pyuno/inc/pyuno/pyuno.hxx
View File

@@ -68,6 +68,13 @@ extern "C" LO_DLLPUBLIC_PYUNO
namespace pyuno namespace pyuno
{ {
enum __NotNull
{
/** definition of a no acquire enum for ctors
*/
NOT_NULL
};
/** Helper class for keeping references to python objects. /** Helper class for keeping references to python objects.
BEWARE: Look up every python function you use to check BEWARE: Look up every python function you use to check
whether you get an acquired or not acquired object pointer whether you get an acquired or not acquired object pointer
@@ -88,6 +95,12 @@ public:
PyRef( PyObject * p, __sal_NoAcquire ) : m( p ) {} PyRef( PyObject * p, __sal_NoAcquire ) : m( p ) {}
PyRef( PyObject * p, __sal_NoAcquire, __NotNull ) : m( p )
{
if (!m)
throw std::bad_alloc();
}
PyRef( const PyRef &r ) : m( r.get() ) { Py_XINCREF( m ); } PyRef( const PyRef &r ) : m( r.get() ) { Py_XINCREF( m ); }
~PyRef() { Py_XDECREF( m ); } ~PyRef() { Py_XDECREF( m ); }

2
pyuno/source/module/pyuno_type.cxx
View File

@@ -265,7 +265,7 @@ PyObject *PyUNO_Enum_new( const char *enumBase, const char *enumValue, const Run
PyObject* PyUNO_Type_new (const char *typeName , TypeClass t , const Runtime &r ) PyObject* PyUNO_Type_new (const char *typeName , TypeClass t , const Runtime &r )
{ {
// retrieve type object // retrieve type object
PyRef args( PyTuple_New( 2 ), SAL_NO_ACQUIRE ); PyRef args(PyTuple_New( 2 ), SAL_NO_ACQUIRE, NOT_NULL);
PyTuple_SetItem( args.get() , 0 , PyStr_FromString( typeName ) ); PyTuple_SetItem( args.get() , 0 , PyStr_FromString( typeName ) );
PyObject *typeClass = PyUNO_Enum_new( "com.sun.star.uno.TypeClass" , typeClassToString(t), r ); PyObject *typeClass = PyUNO_Enum_new( "com.sun.star.uno.TypeClass" , typeClassToString(t), r );