diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-02-16 21:09:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-02-16 21:09:37 +0000 |
| commit | 61bedc3bd6c9bf0c7264d06ab2fb909476e98a27 (patch) | |
| tree | 6727371d9ee4e59d03aaaf77d0335c08e7a200f4 /vlc/build | |
| parent | 6d62c25b49c37c79892388feef19d36d7bf22420 (diff) | |
| download | asb-61bedc3bd6c9bf0c7264d06ab2fb909476e98a27.tar.gz asb-61bedc3bd6c9bf0c7264d06ab2fb909476e98a27.tar.xz | |
Initial revision
Diffstat (limited to 'vlc/build')
| -rw-r--r-- | vlc/build/patches/ebml_infinite-start.patch | 13 | ||||
| -rw-r--r-- | vlc/build/patches/ebml_null-compare.patch | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/vlc/build/patches/ebml_infinite-start.patch b/vlc/build/patches/ebml_infinite-start.patch new file mode 100644 index 00000000..385dcb8b --- /dev/null +++ b/vlc/build/patches/ebml_infinite-start.patch @@ -0,0 +1,13 @@ +ebml: fix GetDataStart() for elements with infinite size + +--- ebml/ebml/EbmlMaster.h 2017-08-19 09:04:53.000000000 +0200 ++++ ebml/ebml/EbmlMaster.h.datastart 2018-02-15 14:44:20.473862200 +0100 +@@ -84,7 +84,7 @@ class EBML_DLL_API EbmlMaster : public E + } + + uint64 GetDataStart() const { +- return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()); ++ return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(EbmlElement::GetSize(), GetSizeLength(), IsFiniteSize()); + } + + /*! diff --git a/vlc/build/patches/ebml_null-compare.patch b/vlc/build/patches/ebml_null-compare.patch new file mode 100644 index 00000000..e5dda2a1 --- /dev/null +++ b/vlc/build/patches/ebml_null-compare.patch @@ -0,0 +1,13 @@ +ebml: fix a potential crash + +--- ebml/src/EbmlBinary.cpp 2018-02-09 13:51:37.752623200 +0100 ++++ ebml/src/EbmlBinary.cpp.null_cmp 2018-02-09 13:50:41.409429100 +0100 +@@ -100,7 +100,7 @@ filepos_t EbmlBinary::ReadData(IOCallbac + + bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const + { +- return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize())); ++ return ((GetSize() == ElementToCompare.GetSize()) && (GetSize() == 0 || !memcmp(Data, ElementToCompare.Data, GetSize()))); + } + + END_LIBEBML_NAMESPACE |