vlc | branch: master | Steve Lhomme <[email protected]> | Fri Aug 21 13:49:29 2015 +0200| [6e0f74e7df42337617a3b08ae97e86ffc7608d3f] | committer: Jean-Baptiste Kempf
contrib: fix eof not detected when looking for an ID size do use the data in memory that wasn't actually read Close #14783 Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e0f74e7df42337617a3b08ae97e86ffc7608d3f --- contrib/src/ebml/eof.patch | 15 +++++++++++++++ contrib/src/ebml/rules.mak | 1 + 2 files changed, 16 insertions(+) diff --git a/contrib/src/ebml/eof.patch b/contrib/src/ebml/eof.patch new file mode 100644 index 0000000..72026b0 --- /dev/null +++ b/contrib/src/ebml/eof.patch @@ -0,0 +1,15 @@ +--- libebml/src/EbmlElement.cpp 2015-08-21 12:58:03.738589700 +0200 ++++ libebml/src/EbmlElement.cpp.eof 2015-08-21 12:55:18.972736500 +0200 +@@ -417,7 +417,10 @@ + bFound = false; + break; + } +- ReadSize += DataStream.read(&PossibleIdNSize[SizeIdx++], 1); ++ if( DataStream.read( &PossibleIdNSize[SizeIdx++], 1 ) == 0 ) { ++ return NULL; // no more data ? ++ } ++ ReadSize++; + PossibleSizeLength++; + } + + diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 4a5ac16..3a9dd56 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -11,6 +11,7 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2: libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml $(UNPACK) + $(APPLY) $(SRC)/ebml/eof.patch $(MOVE) # libebml requires exceptions _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
