Merge pull request #117 from zeux/gltf-errors

Fix error handling for memory allocations

Author: jkuhlmann

cgltf.h

@@ -2384,13 +2384,21 @@ static int cgltf_parse_json_unprocessed_extension(cgltf_options* options, jsmnto
 
 	cgltf_size name_length = tokens[i].end - tokens[i].start;
 	out_extension->name = (char*)options->memory.alloc(options->memory.user_data, name_length + 1);
+	if (!out_extension->name)
+	{
+		return CGLTF_ERROR_NOMEM;
+	}
 	strncpy(out_extension->name, (const char*)json_chunk + tokens[i].start, name_length);
 	out_extension->name[name_length] = 0;
 	i++;
 
 	size_t start = tokens[i].start;
 	size_t size = tokens[i].end - start;
 	out_extension->data = (char*)options->memory.alloc(options->memory.user_data, size + 1);
+	if (!out_extension->data)
+	{
+		return CGLTF_ERROR_NOMEM;
+	}
 	strncpy(out_extension->data, (const char*)json_chunk + start, size);
 	out_extension->data[size] = '\0';
 
@@ -2413,6 +2421,11 @@ static int cgltf_parse_json_unprocessed_extensions(cgltf_options* options, jsmnt
 	*out_extensions_count = 0;
 	*out_extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 
+	if (!*out_extensions)
+	{
+		return CGLTF_ERROR_NOMEM;
+	}
+
 	++i;
 
 	for (int j = 0; j < extensions_size; ++j)
@@ -2529,6 +2542,11 @@ static int cgltf_parse_json_primitive(cgltf_options* options, jsmntok_t const* t
 			out_prim->extensions_count = 0;
 			out_prim->extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 
+			if (!out_prim->extensions)
+			{
+				return CGLTF_ERROR_NOMEM;
+			}
+
 			++i;
 			for (int k = 0; k < extensions_size; ++k)
 			{
@@ -3053,6 +3071,11 @@ static int cgltf_parse_json_texture_view(cgltf_options* options, jsmntok_t const
 			out_texture_view->extensions_count = 0;
 			out_texture_view->extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 
+			if (!out_texture_view->extensions)
+			{
+				return CGLTF_ERROR_NOMEM;
+			}
+
 			++i;
 
 			for (int k = 0; k < extensions_size; ++k)
@@ -3503,6 +3526,11 @@ static int cgltf_parse_json_material(cgltf_options* options, jsmntok_t const* to
 			out_material->extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 			out_material->extensions_count= 0;
 
+			if (!out_material->extensions)
+			{
+				return CGLTF_ERROR_NOMEM;
+			}
+
 			for (int k = 0; k < extensions_size; ++k)
 			{
 				CGLTF_CHECK_KEY(tokens[i]);
@@ -4288,6 +4316,11 @@ static int cgltf_parse_json_node(cgltf_options* options, jsmntok_t const* tokens
 			out_node->extensions_count= 0;
 			out_node->extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 
+			if (!out_node->extensions)
+			{
+				return CGLTF_ERROR_NOMEM;
+			}
+
 			++i;
 
 			for (int k = 0; k < extensions_size; ++k)
@@ -4884,6 +4917,11 @@ static int cgltf_parse_json_root(cgltf_options* options, jsmntok_t const* tokens
 			out_data->data_extensions_count = 0;
 			out_data->data_extensions = (cgltf_extension*)cgltf_calloc(options, sizeof(cgltf_extension), extensions_size);
 
+			if (!out_data->data_extensions)
+			{
+				return CGLTF_ERROR_NOMEM;
+			}
+
 			++i;
 
 			for (int k = 0; k < extensions_size; ++k)