[asterisk-commits] dlee: branch dlee/stasis-http r382064 - in /team/dlee/stasis-http: ./ apps/ i...

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Feb 25 17:09:53 2013
New Revision: 382064

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382064
Log:
Multiple revisions 381849,382063

........
  r381849 | root | 2013-02-21 17:17:26 -0600 (Thu, 21 Feb 2013) | 9 lines
  
  Merged revisions 381846 via svnmerge from 
  file:///srv/subversion/repos/asterisk/team/dlee/stasis-core
  
  ........
    r381846 | dlee | 2013-02-21 16:42:46 -0600 (Thu, 21 Feb 2013) | 1 line
    
    Error checking; typos
  ........
........
  r382063 | dlee | 2013-02-25 17:08:23 -0600 (Mon, 25 Feb 2013) | 1 line
  
  Fixed app_stasis exports
........

Merged revisions 381849,382063 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-app

Added:
    team/dlee/stasis-http/apps/app_stasis.exports.in
      - copied unchanged from r382063, team/dlee/stasis-app/apps/app_stasis.exports.in
Removed:
    team/dlee/stasis-http/apps/app_stasis.c.exports.in
Modified:
    team/dlee/stasis-http/   (props changed)
    team/dlee/stasis-http/include/asterisk/stasis.h
    team/dlee/stasis-http/main/channel.c

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 25 17:09:53 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-381838
+/team/dlee/stasis-app:1-382063

Modified: team/dlee/stasis-http/include/asterisk/stasis.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/include/asterisk/stasis.h?view=diff&rev=382064&r1=382063&r2=382064
==============================================================================
--- team/dlee/stasis-http/include/asterisk/stasis.h (original)
+++ team/dlee/stasis-http/include/asterisk/stasis.h Mon Feb 25 17:09:53 2013
@@ -118,7 +118,7 @@
  * Any topic may be subscribed to by simply providing stasis_subscribe() the
  * \ref stasis_topic to subscribe to, a handler function and \c void pointer to
  * data that is passed back to the handler. Invocations on the subscription's
- * handler are serialized, but differen invocations may occur on different
+ * handler are serialized, but different invocations may occur on different
  * threads (this usually isn't important unless you use thread locals or
  * something similar).
  *
@@ -409,6 +409,7 @@
 /*!
  * \brief Retrieve an item from the cache.
  * \param caching_topic The topic returned from stasis_caching_topic_create().
+ * \param type Type of message to retrieve.
  * \param id Identity of the snapshot to retrieve.
  * \return Message from the cache. The cache still owns the message, so
  *         ao2_ref() if you want to keep it.

Modified: team/dlee/stasis-http/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/main/channel.c?view=diff&rev=382064&r1=382063&r2=382064
==============================================================================
--- team/dlee/stasis-http/main/channel.c (original)
+++ team/dlee/stasis-http/main/channel.c Mon Feb 25 17:09:53 2013
@@ -258,6 +258,11 @@
 	RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
 
 	event = ao2_alloc(sizeof(*event), ast_channel_varset_event_dtor);
+	if (!event) {
+		ast_log(LOG_ERROR, "Allocation failed\n");
+		return;
+	}
+
 	if (chan) {
 		event->channel_name = ast_strdup(ast_channel_name(chan));
 		event->uniqueid = ast_strdup(ast_channel_name(chan));
@@ -269,6 +274,10 @@
 	event->value = ast_strdup(value);
 
 	msg = stasis_message_create(ast_channel_varset_event(), event);
+	if (!msg) {
+		ast_log(LOG_ERROR, "Allocation failed\n");
+		return;
+	}
 
 	if (chan) {
 		stasis_publish(ast_channel_events(chan), msg);