[FFmpeg-soc] [PATCH] RTSP/tunneling: clean up properly on failures

[Martin Storsjö]

On Fri, 18 Jun 2010, Josh Allmann wrote:

> On 18 June 2010 00:45, Martin Storsjö <martin at martin.st> wrote:
> > Hi,
> >
> > I noticed that the GET URLContext can be leaked if some of the later
> > operations fail before assigning the handles to rt->rtsp_hd{,_out}. This
> > patch should fix the issue.
> >
> > Josh, do you think this is ok, or would you rather assign the handles
> > directly to rt->rtsp_hd without using the local variables?
> >
> 
> Doesn't the jump to fail: clean things up? If I'm missing something
> here, then it looks OK.

No, it doesn't clean up everything. The fail: codepath only does 
ff_rtsp_close_connections(s), which closes rt->rtsp_hd, but you don't 
assign the newly opened connection handles to rt->rtsp_hd until after the 
whole if (tunnel) {} else { normal } block, you just keep them in local 
variables.

// Martin