lp:vlc/2.1
The import has stopped and this branch is abandoned. Please use the git repository instead:
https:/
Old description:
This branch contains a bzr import of VLC's 2.1 maintenance branch from https:/
Submodules in the bindings/ directory are not imported due to bug #402814. The script from lp:~videolan/vlc/bzr-import is used (on Ubuntu 14.04) to import the git repository to bzr.
Please do not push to this branch, because the next bzr import will overwrite any changes.
- Get this branch:
- bzr branch lp:vlc/2.1
Branch merges
Related source package recipes
Branch information
Recent revisions
- 54593. By Francois Cartegnie
-
demux: ogg: check packets header size (fix #13875)
(cherry picked from commit 0b37fc45954b2da
51e452bb7111f32 fa61d8edc5)
Signed-off-by: Jean-Baptiste Kempf <email address hidden> - 54592. By Gabriel de Perthuis <email address hidden>
-
Prevent potential null pointer dereference in zip access
Close #12149
Signed-off-by: Jean-Baptiste Kempf <email address hidden>
(cherry picked from commit 3c53c13138225c4b2414ab83588471 97cf29b718)
Signed-off-by: Jean-Baptiste Kempf <email address hidden> - 54591. By JB VideoLAN
-
2015
Still alive!
(cherry picked from commit d8976582c45911a
2ca4125854cd857 80721184e9)
Signed-off-by: Jean-Baptiste Kempf <email address hidden> - 54590. By Rémi Denis-Courmont
-
SRTP: integer overflow
(cherry picked from commit e76f990e0ba00a9
f573c23627ecd66 cb9ae9bdd5)
Signed-off-by: Jean-Baptiste Kempf <email address hidden> - 54589. By Rémi Denis-Courmont
-
SRTP: integer overflow
(cherry picked from commit ab9f28ff688eae8
45bc2deb62bf500 72d4a4690b)
Signed-off-by: Jean-Baptiste Kempf <email address hidden> - 54587. By Fabian Yamaguchi <email address hidden>
-
stream_out: rtp: don't use VLA for user controlled data
It should fix a possible invalid memory access
When streaming ogg-files via rtp, an ogg-file can trigger an invalid
write access using an overly long 'configuration' string.The original code attemps to allocate space to hold the string on the stack
and hence, cannot verify if allocation succeeds. Instead, we now allocate the
buffer on the heap and return if allocation fails.In detail, rtp_packetize_
xiph_config allocates a buffer on the stack at (1) where
the size depends on the local variable 'len'. The variable 'len' is
calculated at (0) to be the length of a string contained in a specially
crafted Ogg Vorbis file, and therefore, it is attacker-controlled. Signed-off-by: Jean-Baptiste Kempf <email address hidden>
(cherry picked from commit 204291467724867b79735c0ee3aeb0 dbc2200f97)
Signed-off-by: Jean-Baptiste Kempf <email address hidden>Conflicts:
modules/stream_ out/rtpfmt. c - 54586. By Fabian Yamaguchi <email address hidden>
-
demux: mp4: fix buffer overflow in parsing of string boxes.
We ensure that pbox->i_size is never smaller than 8 to avoid an
integer underflow in the third argument of the subsequent call to
memcpy. We also make sure no truncation occurs when passing values
derived from the 64 bit integer p_box->i_size to arguments of malloc
and memcpy that may be 32 bit integers on 32 bit platforms.Signed-off-by: Jean-Baptiste Kempf <email address hidden>
(cherry picked from commit 2e7c7091a61aa5d07e7997b393d821 e91f593c39)
Signed-off-by: Jean-Baptiste Kempf <email address hidden>Conflicts:
modules/demux/mp4/ libmp4. c - 54585. By Fabian Yamaguchi <email address hidden>
-
codec: dmo: avoid null-pointer dereference.
Check the return value of malloc to avoid a null-pointer dereference.
Signed-off-by: Jean-Baptiste Kempf <email address hidden>
(cherry picked from commit 229c385a79d48e41687fae8b4dfeae ef9c8c3eb7)
Signed-off-by: Jean-Baptiste Kempf <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
