[vlc-commits] [Git][videolan/npapi-vlc][master] 2 commits: npapi: fix possible crash

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at videolan / VLC Browser Plugins


Commits:
d6014bde by Daniel Amm at 2017-01-02T20:12:48+01:00
npapi: fix possible crash

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

- - - - -
343f6588 by Daniel Amm at 2017-01-02T20:12:48+01:00
On the road to 2.2.5 and copyright update

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

- - - - -


3 changed files:

- NEWS
- configure.ac
- npapi/npruntime/npolibvlc.cpp


Changes:

=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ ActiveX:
  * Allow empty strings for aspectRatio and crop
  * Fix initial volume value for volume attribute
 
+NPAPI:
+ * Fix possible crash in vlc.playlist.add()
+
 
 Changes between VLC plugins 2.2.2 and 2.2.4:
 --------------------------------------------


=====================================
configure.ac
=====================================
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 dnl Autoconf settings for npapi-vlc
 
-AC_COPYRIGHT([Copyright 2002-2015 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 2002-2017 VLC authors and VideoLAN])
 
-AC_INIT(npapi-vlc, 2.2.4)
+AC_INIT(npapi-vlc, 2.2.5)
 VERSION_MAJOR="2"
 AC_SUBST(VERSION_MAJOR)
 VERSION_MINOR="2"
 AC_SUBST(VERSION_MINOR)
-VERSION_REVISION="4"
+VERSION_REVISION="5"
 AC_SUBST(VERSION_REVISION)
 VERSION_EXTRA=""
 AC_SUBST(VERSION_EXTRA)
@@ -18,7 +18,7 @@ case $( echo ${VERSION_EXTRA}|wc -m ) in
        *) if test "${VERSION_EXTRA}" = "-git"; then VERSION_EXTRA_RC="666"; else VERSION_EXTRA_RC="99"; fi
 esac
 AC_SUBST(VERSION_EXTRA_RC)
-COPYRIGHT_YEARS="2002-2015"
+COPYRIGHT_YEARS="2002-2017"
 AC_SUBST(COPYRIGHT_YEARS)
 COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
 AC_SUBST(COPYRIGHT_MESSAGE)


=====================================
npapi/npruntime/npolibvlc.cpp
=====================================
--- a/npapi/npruntime/npolibvlc.cpp
+++ b/npapi/npruntime/npolibvlc.cpp
@@ -1133,6 +1133,10 @@ void LibvlcPlaylistNPObject::parseOptions(NPObject *obj, int *i_options,
     NPIdentifier propId = NPN_GetStringIdentifier("length");
     if( NPN_GetProperty(_instance, obj, propId, value) )
     {
+        /* Check if result is valid (because we don't use NPN_HasProperty, the result can be void) */
+        if( !value.is<int>() )
+            return;
+
         int count = value;
 
         if( count )



View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/compare/f219ed8c6f6c0117172a463f7360067745dc35ef...343f6588bba05efecc402360f991e46cfad64dd0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-commits/attachments/20170102/f06713f6/attachment-0001.html>