Commit b5a46dba authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Rémi Denis-Courmont

mozilla: don't allocate a zero sized array.

(cherry-picked from commit aed48363a478e9767a374154d703d7c84857707b)

Conflict:
	projects/mozilla/control/npolibvlc.cpp
parent 5d902e41
......@@ -588,10 +588,33 @@ LibvlcInputNPObject::setProperty(int index, const NPVariant &value)
const NPUTF8 * const LibvlcInputNPObject::methodNames[] =
{
/* no methods */
"none",
};
COUNTNAMES(LibvlcInputNPObject,methodCount,methodNames);
enum LibvlcInputNPObjectMethodIds
{
ID_none,
};
RuntimeNPObject::InvokeResult
LibvlcInputNPObject::invoke(int index, const NPVariant *args,
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
if( isPluginRunning() )
{
switch( index )
{
case ID_none:
return INVOKERESULT_NO_SUCH_METHOD;
default:
;
}
}
return INVOKERESULT_GENERIC_ERROR;
}
/*
** implementation of libvlc playlist items object
*/
......@@ -803,6 +826,9 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args,
return INVOKERESULT_NO_SUCH_METHOD;
// grab URL
if( NPVARIANT_IS_NULL(args[0]) )
return INVOKERESULT_NO_SUCH_METHOD;
char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
if( !s )
return INVOKERESULT_OUT_OF_MEMORY;
......
......@@ -99,6 +99,8 @@ protected:
static const int methodCount;
static const NPUTF8 * const methodNames[];
InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
};
class LibvlcPlaylistItemsNPObject: public RuntimeNPObject
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment