Browse Source

use only UA_malloc internally, 2nd part

Julius Pfrommer 8 years ago
parent
commit
1537c83681

+ 1 - 1
src/server/ua_mdns.c

@@ -394,7 +394,7 @@ getInterfaces(UA_Server *server) {
     DWORD adapter_addresses_buffer_size = 16 * 1024;
     for(size_t attempts = 0; attempts != 3; ++attempts) {
         // todo: malloc may fail: return a statuscode
-        adapter_addresses = (IP_ADAPTER_ADDRESSES*)malloc(adapter_addresses_buffer_size);
+        adapter_addresses = (IP_ADAPTER_ADDRESSES*)UA_malloc(adapter_addresses_buffer_size);
         DWORD error = GetAdaptersAddresses(AF_UNSPEC,
                                            GAA_FLAG_SKIP_ANYCAST |
                                            GAA_FLAG_SKIP_DNS_SERVER |

+ 4 - 4
src/server/ua_server_worker.c

@@ -328,7 +328,7 @@ UA_Server_addMdnsRecordForNetworkLayer(UA_Server *server, const char* appName, c
     char hostname[256]; hostname[0] = '\0';
     const char *path;
     {
-        char* uri = (char *)malloc(sizeof(char) * nl->discoveryUrl.length + 1);
+        char* uri = (char*)UA_malloc(sizeof(char) * nl->discoveryUrl.length + 1);
         strncpy(uri, (char*) nl->discoveryUrl.data, nl->discoveryUrl.length);
         uri[nl->discoveryUrl.length] = '\0';
         UA_StatusCode retval;
@@ -383,7 +383,7 @@ UA_StatusCode UA_Server_run_startup(UA_Server *server) {
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if (server->config.applicationDescription.applicationType == UA_APPLICATIONTYPE_DISCOVERYSERVER) {
 
-        char *appName = (char *)malloc(server->config.mdnsServerName.length +1);
+        char *appName = (char*)UA_malloc(server->config.mdnsServerName.length +1);
         memcpy(appName, server->config.mdnsServerName.data, server->config.mdnsServerName.length);
         appName[server->config.mdnsServerName.length] = '\0';
 
@@ -561,9 +561,9 @@ UA_StatusCode UA_Server_run_shutdown(UA_Server *server) {
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if (server->config.applicationDescription.applicationType == UA_APPLICATIONTYPE_DISCOVERYSERVER) {
-        char* hostname = (char *)malloc(sizeof(char) * 256);
+        char* hostname = (char*)UA_malloc(sizeof(char) * 256);
         if (gethostname(hostname, 255) == 0) {
-            char *appName = (char *)malloc(server->config.mdnsServerName.length +1);
+            char *appName = (char*)UA_malloc(server->config.mdnsServerName.length +1);
             memcpy(appName, server->config.mdnsServerName.data, server->config.mdnsServerName.length);
             appName[server->config.mdnsServerName.length] = '\0';
             UA_Discovery_removeRecord(server,appName, hostname, 4840, UA_TRUE);

+ 4 - 4
src/server/ua_services_discovery_multicast.c

@@ -96,8 +96,8 @@ UA_Discovery_update_MdnsForDiscoveryUrl(UA_Server *server, const char *serverNam
     size_t uriSize = sizeof(char) * discoveryUrl.length + 1;
 
     // todo: malloc may fail: return a statuscode
-    char* uri = (char*)malloc(uriSize);
-    strncpy(uri, (char*) discoveryUrl.data, discoveryUrl.length);
+    char* uri = (char*)UA_malloc(uriSize);
+    strncpy(uri, (char*)discoveryUrl.data, discoveryUrl.length);
     uri[discoveryUrl.length] = '\0';
 
     UA_StatusCode retval = UA_EndpointUrl_split(uri, hostname, &port, &path);
@@ -233,7 +233,7 @@ create_fullServiceDomain(const char* servername, const char* hostname, size_t ma
         }
     }
 
-    char *fullServiceDomain = (char *)malloc(servernameLen + 1 + hostnameLen + 23 + 2);
+    char *fullServiceDomain = (char*)UA_malloc(servernameLen + 1 + hostnameLen + 23 + 2);
     if (!fullServiceDomain)
         return NULL;
 
@@ -358,7 +358,7 @@ UA_Discovery_addRecord(UA_Server* server, const char* servername,
 
     // hostname.
     size_t maxHostnameLen = hostnameLen < 63 ? hostnameLen : 63;
-    char *localDomain = (char *)malloc(maxHostnameLen+2);
+    char *localDomain = (char*)UA_malloc(maxHostnameLen+2);
     if(!localDomain) {
         free(fullServiceDomain);
         return UA_STATUSCODE_BADOUTOFMEMORY;