From 05aac20ab6e6a2a13cdd2ad10b66a725b3dbc238 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 25 Aug 2019 20:07:25 +1000 Subject: strtok is not reentrant - it's not safe to call it any time you might be multi-threaded (nw) --- src/frontend/mame/info.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/frontend') diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp index 5be974239d9..b06453c0958 100644 --- a/src/frontend/mame/info.cpp +++ b/src/frontend/mame/info.cpp @@ -1855,21 +1855,22 @@ void output_images(std::ostream &out, device_t &device, const char *root_tag) if (loadable) { - const char *name = imagedev.instance_name().c_str(); - const char *shortname = imagedev.brief_instance_name().c_str(); + char const *const name = imagedev.instance_name().c_str(); + char const *const shortname = imagedev.brief_instance_name().c_str(); out << "\t\t\t\n"; - std::string extensions(imagedev.file_extensions()); - - char *ext = strtok((char *)extensions.c_str(), ","); - while (ext != nullptr) + char const *extensions(imagedev.file_extensions()); + while (extensions) { - out << util::string_format("\t\t\t\n", normalize_string(ext)); - ext = strtok(nullptr, ","); + char const *end(extensions); + while (*end && (',' != *end)) + ++end; + out << util::string_format("\t\t\t\n", normalize_string(std::string(extensions, end).c_str())); + extensions = *end ? (end + 1) : nullptr; } } out << "\t\t\n"; -- cgit v1.2.3