From 47f944a2efea1af48d2f47df25ee92386dbd8491 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 23 Aug 2008 18:46:30 +0000 Subject: Move malloc() down until after all initializations, so that the resource is only allocated if initialization worked. This means that on failure, we don't have to deallocate it. Originally committed as revision 14924 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/tcp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libavformat/tcp.c') diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 9191960ca7..470d0ce8d1 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -49,12 +49,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (strcmp(proto,"tcp")) goto fail; if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); } - s = av_malloc(sizeof(TCPContext)); - if (!s) - return AVERROR(ENOMEM); - h->priv_data = s; - h->is_streamed = 1; - if (port <= 0 || port >= 65536) goto fail; @@ -100,6 +94,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (ret != 0) goto fail; } + s = av_malloc(sizeof(TCPContext)); + if (!s) + return AVERROR(ENOMEM); + h->priv_data = s; + h->is_streamed = 1; s->fd = fd; return 0; @@ -108,7 +107,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags) fail1: if (fd >= 0) closesocket(fd); - av_free(s); return ret; } -- cgit v1.2.3