Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019

Conflicts:
	packaging/c-ares.spec

Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74

1 files changed, 7 insertions, 7 deletions

diff --git a/ares_send.c b/ares_send.c
index 1a450b1..88c0035 100644
--- a/ares_send.c
+++ b/ares_send.c
@@ -47,25 +47,25 @@ void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
     }
 
   /* Allocate space for query and allocated fields. */
-  query = malloc(sizeof(struct query));
+  query = ares_malloc(sizeof(struct query));
   if (!query)
     {
       callback(arg, ARES_ENOMEM, 0, NULL, 0);
       return;
     }
-  query->tcpbuf = malloc(qlen + 2);
+  query->tcpbuf = ares_malloc(qlen + 2);
   if (!query->tcpbuf)
     {
-      free(query);
+      ares_free(query);
       callback(arg, ARES_ENOMEM, 0, NULL, 0);
       return;
     }
-  query->server_info = malloc(channel->nservers *
-                              sizeof(query->server_info[0]));
+  query->server_info = ares_malloc(channel->nservers *
+                                   sizeof(query->server_info[0]));
   if (!query->server_info)
     {
-      free(query->tcpbuf);
-      free(query);
+      ares_free(query->tcpbuf);
+      ares_free(query);
       callback(arg, ARES_ENOMEM, 0, NULL, 0);
       return;
     }