virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

hls: add missing checks for accessing avoption fields

Browse Source 
Fixes null pointer exception and probably other things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-23 22:21:51 +01:00
parent 8071288601
commit 665f2d432c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/hls.c
View File

@ -482,17 +482,17 @@ static int hls_read_header(AVFormatContext *s)
c->interrupt_callback = &s->interrupt_callback; c->interrupt_callback = &s->interrupt_callback;
// if the URL context is good, read important options we must broker later // if the URL context is good, read important options we must broker later
if (u) { if (u && u->prot->priv_data_class) {
// get the previous user agent & set back to null if string size is zero // get the previous user agent & set back to null if string size is zero
av_free(c->user_agent); av_freep(&c->user_agent);
av_opt_get(u->priv_data, "user-agent", 0, (uint8_t**)&(c->user_agent)); av_opt_get(u->priv_data, "user-agent", 0, (uint8_t**)&(c->user_agent));
if (!strlen(c->user_agent)) if (c->user_agent && !strlen(c->user_agent))
av_freep(&c->user_agent); av_freep(&c->user_agent);
// get the previous cookies & set back to null if string size is zero // get the previous cookies & set back to null if string size is zero
av_free(c->cookies); av_freep(&c->cookies);
av_opt_get(u->priv_data, "cookies", 0, (uint8_t**)&(c->cookies)); av_opt_get(u->priv_data, "cookies", 0, (uint8_t**)&(c->cookies));
if (!strlen(c->cookies)) if (c->cookies && !strlen(c->cookies))
av_freep(&c->cookies); av_freep(&c->cookies);
} }