From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 18 Oct 2006 04:09:50 +0000 (+0000)
Subject: merge from trunk: move ast_variables_destroy() to a better
X-Git-Tag: 1.4.0-beta4~312
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4280d2854958587d71d4d1c72f83a21f380785a7;p=thirdparty%2Fasterisk.git

merge from trunk: move ast_variables_destroy() to a better
place in handle_uri() to avoid leaking memory on non existing files.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/http.c b/main/http.c
index 1b7e08a665..0c0a6d9745 100644
--- a/main/http.c
+++ b/main/http.c
@@ -337,7 +337,6 @@ static char *handle_uri(struct sockaddr_in *sin, char *uri, int *status, char **
 	}
 	if (urih) {
 		c = urih->callback(sin, uri, vars, status, title, contentlength);
-		ast_variables_destroy(vars);
 	} else if (ast_strlen_zero(uri) && ast_strlen_zero(prefix)) {
 		/* Special case: If no prefix, and no URI, send to /static/index.html */
 		c = ast_http_error(302, "Moved Temporarily", "Location: /static/index.html\r\n", "This is not the page you are looking for...");
@@ -348,6 +347,7 @@ static char *handle_uri(struct sockaddr_in *sin, char *uri, int *status, char **
 		*status = 404;
 		*title = strdup("Not Found");
 	}
+	ast_variables_destroy(vars);
 	return c;
 }