X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdevtools.c;h=0284dcd5abe08a68c78ebc3a34d5cff723164085;hb=9a2520c36431a8a5fd90451e97f488c22f4decc5;hp=629d90bd3c049f9858741c4e31a33fd2808a7c51;hpb=fd7e81983ca4cae7cdf2a67a35500284f17761c4;p=meshlink

diff --git a/src/devtools.c b/src/devtools.c
index 629d90bd..0284dcd5 100644
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -61,7 +61,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 
 	// if result is smaller than edges, we have to dealloc all the excess devtool_edge_t
 	if((size_t)result_size > *nmemb) {
-		result = realloc(edges, result_size * sizeof(*result));
+		result = xrealloc(edges, result_size * sizeof(*result));
 	} else {
 		result = edges;
 	}
@@ -93,7 +93,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 		}
 
 		// shrink result to the actual amount of memory used
-		result = realloc(result, n * sizeof(*result));
+		result = xrealloc(result, n * sizeof(*result));
 		*nmemb = n;
 	} else {
 		*nmemb = 0;
@@ -106,6 +106,8 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 }
 
 static bool fstrwrite(const char *str, FILE *stream) {
+	assert(stream);
+
 	size_t len = strlen(str);
 
 	if(fwrite((void *)str, 1, len, stream) != len) {
@@ -116,6 +118,8 @@ static bool fstrwrite(const char *str, FILE *stream) {
 }
 
 bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) {
+	assert(stream);
+
 	bool result = true;
 
 	pthread_mutex_lock(&(mesh->mesh_mutex));
@@ -309,6 +313,7 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
 
 	return result;
 }
+
 meshlink_handle_t *devtool_open_in_netns(const char *confbase, const char *name, const char *appname, dev_class_t devclass, int netns) {
 	meshlink_open_params_t *params = meshlink_open_params_init(confbase, name, appname, devclass);
 	params->netns = dup(netns);