History

avformat/wavarc: Check if extradata has been fully read

Michael Niedermayer committed 3 years ago

Commit 2df271c1 parent 8ead0ae1 file · +4 −1Browse files

Showing the changes to libavformat (1 of 1 file). Show all

Unified · Split

libavformat/wavarc.c+4−1
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#include "libavutil/channel_layout.h"22#include "libavutil/channel_layout.h"
23#include "libavutil/intreadwrite.h"23#include "libavutil/intreadwrite.h"
24#include "avformat.h"24#include "avformat.h"
25#include "avio_internal.h"
25#include "demux.h"26#include "demux.h"
26#include "internal.h"27#include "internal.h"
27 28
@@ -84,7 +85,9 @@ static int wavarc_read_header(AVFormatContext *s) · 56 unmodified lines
84 if (ret < 0)85 if (ret < 0)
85 return ret;86 return ret;
86 memcpy(par->extradata, data, sizeof(data));87 memcpy(par->extradata, data, sizeof(data));
87 avio_read(pb, par->extradata + sizeof(data), fmt_len);88 ret = ffio_read_size(pb, par->extradata + sizeof(data), fmt_len);
89 if (ret < 0)
90 return ret;
88 91
89 par->codec_type = AVMEDIA_TYPE_AUDIO;92 par->codec_type = AVMEDIA_TYPE_AUDIO;
90 par->codec_id = AV_CODEC_ID_WAVARC;93 par->codec_id = AV_CODEC_ID_WAVARC;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t