int result;
mode_t old_umask;
- tmp = malloc(strlen(path) + 1);
+ tmp = zmalloc(strlen(path) + 1);
if (tmp == NULL)
return -1;
return -1;
}
- asprintf(&msg, "collect %d %s", pid, channel);
+ if (asprintf(&msg, "collect %d %s", pid, channel) < 0) {
+ ERR("ustcomm_request_consumer : asprintf failed (collect %d/%s)",
+ pid, channel);
+ return -1;
+ }
/* don't signal it because it's the daemon */
result = ustcomm_connect_path(path, &conn, -1);
n_fds++;
}
- fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd));
+ fds = (struct pollfd *) zmalloc(n_fds * sizeof(struct pollfd));
if(fds == NULL) {
- ERR("malloc returned NULL");
+ ERR("zmalloc returned NULL");
return -1;
}
- conn_table = (struct ustcomm_connection **) malloc(n_fds * sizeof(struct ustcomm_connection *));
+ conn_table = (struct ustcomm_connection **) zmalloc(n_fds * sizeof(struct ustcomm_connection *));
if(conn_table == NULL) {
- ERR("malloc returned NULL");
+ ERR("zmalloc returned NULL");
retval = -1;
goto free_fds_return;
}
goto free_conn_table_return;
}
- newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+ newconn = (struct ustcomm_connection *) zmalloc(sizeof(struct ustcomm_connection));
if(newconn == NULL) {
- ERR("malloc returned NULL");
+ ERR("zmalloc returned NULL");
return -1;
}
int retval = 0;
if(sock_path) {
- asprintf(&name, "%s", sock_path);
+ if (asprintf(&name, "%s", sock_path) < 0) {
+ ERR("ustcomm_init_ustd : asprintf failed (sock_path %s)",
+ sock_path);
+ return -1;
+ }
}
else {
int result;
return -1;
}
- asprintf(&name, "%s/%s", SOCK_DIR, "ustd");
+ if (asprintf(&name, "%s/%s", SOCK_DIR, "ustd") < 0) {
+ ERR("ustcomm_init_ustd : asprintf failed (%s/ustd)",
+ SOCK_DIR);
+ return -1;
+ }
}
handle->server.listen_fd = init_named_socket(name, &handle->server.socketpath);
retval = NULL;
}
- asprintf(&retval, "%.*s", (int)(end-start), start);
+ if (asprintf(&retval, "%.*s", (int)(end-start), start) < 0) {
+ ERR("nth_token : asprintf failed (%.*s)",
+ (int)(end-start), start);
+ return NULL;
+ }
return retval;
}
return -1;
}
- newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+ newconn = (struct ustcomm_connection *) zmalloc(sizeof(struct ustcomm_connection));
if(newconn == NULL) {
- ERR("malloc returned NULL");
+ ERR("zmalloc returned NULL");
return -1;
}
multipoll_add(ent, app->server.listen_fd, POLLIN, process_mp_incoming_conn, &app->server, NULL);
list_for_each_entry(conn, &app->server.connections, list) {
- struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) malloc(sizeof(struct ustcomm_multipoll_conn_info));
+ struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) zmalloc(sizeof(struct ustcomm_multipoll_conn_info));
mpinfo->conn = conn;
mpinfo->cb = cb;
multipoll_add(ent, conn->fd, POLLIN, process_mp_conn_msg, mpinfo, free_ustcomm_client_poll);