[SCM] gecko-mediaplayer/master: setexception is used too
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Jun 24 11:00:53 UTC 2013
The following commit has been merged in the master branch:
commit 1322f6a7da842b64f422cc8f080ac9ed227a8775
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Jun 24 11:54:37 2013 +0200
setexception is used too
diff --git a/debian/patches/functable-check.patch b/debian/patches/functable-check.patch
index 8669654..3b7d9cc 100644
--- a/debian/patches/functable-check.patch
+++ b/debian/patches/functable-check.patch
@@ -2,7 +2,7 @@ Description: Fix function table check
We only need to know if we have access to all the values we need. Everything
else is not necessary.
Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2013-06-10
+Last-Update: 2013-06-24
Forwarded: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=184
--- a/src/np_entry.cpp
@@ -15,12 +15,19 @@ Forwarded: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=184
#ifdef HAVE_CONFIG_H
#include <config.h>
-@@ -117,7 +118,7 @@
+@@ -117,9 +118,14 @@
if (HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
return NPERR_INCOMPATIBLE_VERSION_ERROR;
- if (pFuncs->size < sizeof(NPNetscapeFuncs))
-+ if (pFuncs->size < offsetof(NPPluginFuncs, getvalue) + sizeof(NPP_GetValueProcPtr))
++ if (pFuncs->size < offsetof(NPNetscapeFuncs, setexception) + sizeof(NPN_SetExceptionProcPtr))
return NPERR_INVALID_FUNCTABLE_ERROR;
++#ifdef XP_UNIX
++ if (pluginFuncs->size < offsetof(NPPluginFuncs, getvalue) + sizeof(NPP_GetValueProcPtr))
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++#endif
++
NPNFuncs.size = pFuncs->size;
+ NPNFuncs.version = pFuncs->version;
+ NPNFuncs.geturlnotify = pFuncs->geturlnotify;
--
gecko-mediaplayer packaging
More information about the pkg-multimedia-commits
mailing list