Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Fix missing-tag crash in PLT/TZP color metadata (#7129)

Rodney5feb7069bf5a
diff --git a/toonz/sources/image/tzp/tiio_plt.cpp b/toonz/sources/image/tzp/tiio_plt.cpp
index 55a3166dd..ec4464c09 100644
--- a/toonz/sources/image/tzp/tiio_plt.cpp
+++ b/toonz/sources/image/tzp/tiio_plt.cpp
@@ -129,7 +129,7 @@ bool PaletteRead = false;
int ComboInkIndex[256]; // a bad patch....
void PltReader::open(FILE *file) {
- char *data;
+ char *data = 0;
uint32 count;
int i;
for (i = 0; i < 256; i++) ComboInkIndex[i] = -1;
@@ -219,10 +219,11 @@ void PltReader::open(FILE *file) {
}
std::string colorNames;
- if (TIFFGetField(m_tiff, TIFFTAG_TOONZCOLORNAMES, &count, &data))
+ if (TIFFGetField(m_tiff, TIFFTAG_TOONZCOLORNAMES, &count, &data) && data)
colorNames = data;
- TREE *names = cdb_decode_all(data, Tcm_24_default_info);
+ TREE *names = cdb_decode_all(const_cast<char *>(colorNames.c_str()),
+ Tcm_24_default_info);
CDB_TREE_ITEM *item;