mirror of
https://github.com/syoyo/tinygltf.git
synced 2026-06-08 03:03:50 +00:00
Merge pull request #538 from syoyo/copilot/sub-pr-537
Fix tg3_writer allocation: replace calloc/free with new/delete
This commit is contained in:
@@ -4350,7 +4350,7 @@ struct tg3_writer {
|
|||||||
TINYGLTF3_API tg3_writer *tg3_writer_create(
|
TINYGLTF3_API tg3_writer *tg3_writer_create(
|
||||||
tg3_write_chunk_fn chunk_fn, void *user_data,
|
tg3_write_chunk_fn chunk_fn, void *user_data,
|
||||||
const tg3_write_options *options) {
|
const tg3_write_options *options) {
|
||||||
tg3_writer *w = (tg3_writer *)calloc(1, sizeof(tg3_writer));
|
tg3_writer *w = new (std::nothrow) tg3_writer();
|
||||||
if (!w) return NULL;
|
if (!w) return NULL;
|
||||||
w->chunk_fn = chunk_fn;
|
w->chunk_fn = chunk_fn;
|
||||||
w->user_data = user_data;
|
w->user_data = user_data;
|
||||||
@@ -4426,10 +4426,7 @@ TINYGLTF3_API tg3_error_code tg3_writer_end(tg3_writer *w) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TINYGLTF3_API void tg3_writer_destroy(tg3_writer *w) {
|
TINYGLTF3_API void tg3_writer_destroy(tg3_writer *w) {
|
||||||
if (w) {
|
delete w;
|
||||||
w->root.~tinygltf_json();
|
|
||||||
free(w);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* TINYGLTF3_IMPLEMENTATION */
|
#endif /* TINYGLTF3_IMPLEMENTATION */
|
||||||
|
|||||||
Reference in New Issue
Block a user