[asterisk-commits] may: branch may/chan_ooh323_evo r315046 - in /team/may/chan_ooh323_evo: ./ main/

[SVN commits to the Asterisk project]

Author: may
Date: Sat Apr 23 08:51:44 2011
New Revision: 315046

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=315046
Log:
Merged revisions 308371-308372 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r308371 | tzafrir | 2011-02-21 16:58:18 +0300 (Mon, 21 Feb 2011) | 12 lines
  
  fix a memory leak in device state
  
  The callback handle_statechange (pbx.c) fails to release its data
  pointer, leaking memory in the process.
  
  Reported by: tzafrir
  Patches:
        18735_pbx_free_callback.diff uploaded by tzafrir (license 46)
  
  Review: https://reviewboard.asterisk.org/r/1110/
........
  r308372 | lathama | 2011-02-21 17:14:41 +0300 (Mon, 21 Feb 2011) | 5 lines
  
  Add HTTP URI Debug logging and update notice
  
  enable reporting of the request URI / URL in debugging
  change funny debug note to a serious note.
........

Modified:
    team/may/chan_ooh323_evo/   (props changed)
    team/may/chan_ooh323_evo/main/http.c
    team/may/chan_ooh323_evo/main/pbx.c

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Apr 23 08:51:44 2011
@@ -1,1 +1,1 @@
-/trunk:1-308344
+/trunk:1-308372

Modified: team/may/chan_ooh323_evo/main/http.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/main/http.c?view=diff&rev=315046&r1=315045&r2=315046
==============================================================================
--- team/may/chan_ooh323_evo/main/http.c (original)
+++ team/may/chan_ooh323_evo/main/http.c Sat Apr 23 08:51:44 2011
@@ -645,6 +645,9 @@
 	struct ast_variable *get_vars = NULL, *v, *prev = NULL;
 	struct http_uri_redirect *redirect;
 
+	if (option_debug > 4)
+		ast_verbose("HTTP Request URI is %s \n", uri);
+
 	strsep(&params, "?");
 	/* Extract arguments from the request and store them in variables. */
 	if (params) {
@@ -788,7 +791,7 @@
 		}
 
 		if (option_debug) {
-			ast_log(LOG_DEBUG, "mmm ... cookie!  Name: '%s'  Value: '%s'\n", name, val);
+			ast_debug(1, "HTTP Cookie, Name: '%s'  Value: '%s'\n", name, val);
 		}
 
 		var = ast_variable_new(name, val, __FILE__);

Modified: team/may/chan_ooh323_evo/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/main/pbx.c?view=diff&rev=315046&r1=315045&r2=315046
==============================================================================
--- team/may/chan_ooh323_evo/main/pbx.c (original)
+++ team/may/chan_ooh323_evo/main/pbx.c Sat Apr 23 08:51:44 2011
@@ -4348,9 +4348,11 @@
 	struct ao2_iterator cb_iter;
 
 	if (ao2_container_count(hintdevices) == 0) {
+		ast_free(sc);
 		return 0;
 	}
 	if (!(cmpdevice = ast_malloc(sizeof(*cmpdevice) + strlen(sc->dev)))) {
+		ast_free(sc);
 		return -1;
 	}
 	strcpy(cmpdevice->hintdevice, sc->dev);
@@ -4414,6 +4416,7 @@
 	if (cmpdevice) {
 		ast_free(cmpdevice);
 	}
+	ast_free(sc);
 	return 0;
 }