Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

codec/packet: avoid segfault with empty packet writing

Browse Source
This commit is contained in:
meh
2015-09-27 04:47:00 +02:00
parent a2a75628f4
commit d93e465f2b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/codec/packet/mod.rs
View File

@ -24,6 +24,10 @@ impl Packet {
pub unsafe fn as_mut_ptr(&mut self) -> *mut AVPacket { pub unsafe fn as_mut_ptr(&mut self) -> *mut AVPacket {
&mut self.0 &mut self.0
} }
pub unsafe fn is_empty(&self) -> bool {
self.0.buf.is_null()
}
} }
impl Packet { impl Packet {
@ -172,6 +176,10 @@ impl Packet {
pub fn write(&self, format: &mut format::context::Output) -> Result<bool, Error> { pub fn write(&self, format: &mut format::context::Output) -> Result<bool, Error> {
unsafe { unsafe {
if self.is_empty() {
return Err(Error::InvalidData);
}
match av_write_frame(format.as_mut_ptr(), self.as_ptr()) { match av_write_frame(format.as_mut_ptr(), self.as_ptr()) {
1 => Ok(true), 1 => Ok(true),
0 => Ok(false), 0 => Ok(false),
@ -182,6 +190,10 @@ impl Packet {
pub fn write_interleaved(&self, format: &mut format::context::Output) -> Result<bool, Error> { pub fn write_interleaved(&self, format: &mut format::context::Output) -> Result<bool, Error> {
unsafe { unsafe {
if self.is_empty() {
return Err(Error::InvalidData);
}
match av_interleaved_write_frame(format.as_mut_ptr(), self.as_ptr()) { match av_interleaved_write_frame(format.as_mut_ptr(), self.as_ptr()) {
1 => Ok(true), 1 => Ok(true),
0 => Ok(false), 0 => Ok(false),