<p>sungtae kim has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8047">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fixed null string trailing after AsyncAGIEnd AMI event<br><br>Removed creating json_null() object for NULL data.<br><br>ASTERISK-27621<br><br>Change-Id: Ice58c16361f9d9e8648261c9ed5d6c8245fb0d8f<br>---<br>M main/stasis_channels.c<br>M main/stasis_message.c<br>2 files changed, 11 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/47/8047/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/stasis_channels.c b/main/stasis_channels.c<br>index 8041c8e..382aacb 100644<br>--- a/main/stasis_channels.c<br>+++ b/main/stasis_channels.c<br>@@ -484,10 +484,13 @@<br>              obj->snapshot = snapshot;<br>          ao2_ref(obj->snapshot, +1);<br>        }<br>-    if (!blob) {<br>-         blob = ast_json_null();<br>+<br>+   if (blob) {<br>+          obj->blob = ast_json_ref(blob);<br>    }<br>-    obj->blob = ast_json_ref(blob);<br>+   else {<br>+               obj->blob = NULL;<br>+ }<br> <br>  msg = stasis_message_create(type, obj);<br>       ao2_cleanup(obj);<br>@@ -793,10 +796,6 @@<br> void ast_channel_publish_cached_blob(struct ast_channel *chan, struct stasis_message_type *type, struct ast_json *blob)<br> {<br>         struct stasis_message *message;<br>-<br>-   if (!blob) {<br>-         blob = ast_json_null();<br>-      }<br> <br>  message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), type, blob);<br>         if (message) {<br>diff --git a/main/stasis_message.c b/main/stasis_message.c<br>index 88db49f..556d534 100644<br>--- a/main/stasis_message.c<br>+++ b/main/stasis_message.c<br>@@ -109,7 +109,7 @@<br> {<br>  struct stasis_message *message;<br> <br>-   if (type == NULL || data == NULL) {<br>+  if (type == NULL) {<br>           return NULL;<br>  }<br> <br>@@ -121,7 +121,10 @@<br>    message->timestamp = ast_tvnow();<br>  ao2_ref(type, +1);<br>    message->type = type;<br>-     ao2_ref(data, +1);<br>+<br>+        if (data) {<br>+          ao2_ref(data, +1);<br>+   }<br>     message->data = data;<br>      if (eid) {<br>            message->eid_ptr = &message->eid;<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8047">change 8047</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8047"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ice58c16361f9d9e8648261c9ed5d6c8245fb0d8f </div>
<div style="display:none"> Gerrit-Change-Number: 8047 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: sungtae kim <pchero21@gmail.com> </div>