OpenToonz - An open-source full-featured 2D animation creation software
C
Fix malformed PLI GROUP child validation (#7183)
Rodney5c020b6863e6
diff --git a/toonz/sources/image/pli/pli_io.cpp b/toonz/sources/image/pli/pli_io.cppindex f608c909b..70b7eb537 100644--- a/toonz/sources/image/pli/pli_io.cpp+++ b/toonz/sources/image/pli/pli_io.cpp@@ -1282,9 +1282,14 @@ PliTag *ParsedPliImp::readThickQuadraticChainTag(bool isLoop) {PliTag *ParsedPliImp::readGroupTag() {TUINT32 bufOffs = 0;+ if (m_tagLength < 1 || m_currDynamicTypeBytesNum < 1 ||+ (m_tagLength - 1) % m_currDynamicTypeBytesNum != 0)+ throw TException("corrupted pli file: invalid group length");+UCHAR type = m_buf[bufOffs++];- assert(type < GroupTag::TYPE_HOW_MANY);+ if (type >= GroupTag::TYPE_HOW_MANY)+ throw TException("corrupted pli file: invalid group type");TUINT32 numObjects = (m_tagLength - 1) / m_currDynamicTypeBytesNum;std::unique_ptr<PliObjectTag *[]> object(new PliObjectTag *[numObjects]);@@ -1295,13 +1300,25 @@ PliTag *ParsedPliImp::readGroupTag() {readDynamicData(tagOffs[i], bufOffs);}- TagElem *elem;- for (TUINT32 i = 0; i < numObjects; i++)- while (!(object[i] = (PliObjectTag *)findTagFromOffset(tagOffs[i])))- if ((elem = readTag()))- addTag(*elem);- else- assert(false);+ for (TUINT32 i = 0; i < numObjects; i++) {+ PliTag *child;+ while (!(child = findTagFromOffset(tagOffs[i]))) {+ TagElem *elem = readTag();+ if (!elem) throw TException("corrupted pli file: missing group child");+ addTag(*elem);+ }++ PliObjectTag *obj = dynamic_cast<PliObjectTag *>(child);+ if (!obj) throw TException("corrupted pli file: invalid group child");+ if (type == GroupTag::PALETTE && child->m_type != PliTag::STYLE_NGOBJ)+ throw TException("corrupted pli file: invalid palette group child");+ if (type == GroupTag::STROKE && child->m_type != PliTag::COLOR_NGOBJ &&+ child->m_type != PliTag::OUTLINE_OPTIONS_GOBJ &&+ child->m_type != PliTag::GROUP_GOBJ &&+ child->m_type != PliTag::THICK_QUADRATIC_CHAIN_GOBJ)+ throw TException("corrupted pli file: invalid stroke group child");+ object[i] = obj;+ }std::unique_ptr<GroupTag> tag(new GroupTag());tag->m_type = type;diff --git a/toonz/sources/image/pli/tiio_pli.cpp b/toonz/sources/image/pli/tiio_pli.cppindex 45413984d..44fcd4352 100644--- a/toonz/sources/image/pli/tiio_pli.cpp+++ b/toonz/sources/image/pli/tiio_pli.cpp@@ -320,6 +320,9 @@ void createStroke(ThickQuadraticChainTag *quadTag, TVectorImage *outVectImage,static void createGroup(GroupTag *groupTag, TVectorImage *vi,CreateStrokeData &data) {+ if (groupTag->m_type != GroupTag::STROKE)+ throw TException("corrupted pli file: invalid stroke group type");+int count = vi->getStrokeCount();for (int j = 0; j < groupTag->m_numObjects; j++) {if (groupTag->m_object[j]->m_type == PliTag::COLOR_NGOBJ)@@ -329,11 +332,11 @@ static void createGroup(GroupTag *groupTag, TVectorImage *vi,((StrokeOutlineOptionsTag *)groupTag->m_object[j])->m_options;else if (groupTag->m_object[j]->m_type == PliTag::GROUP_GOBJ)createGroup((GroupTag *)groupTag->m_object[j], vi, data);- else {- assert(groupTag->m_object[j]->m_type ==- PliTag::THICK_QUADRATIC_CHAIN_GOBJ);+ else if (groupTag->m_object[j]->m_type ==+ PliTag::THICK_QUADRATIC_CHAIN_GOBJ) {createStroke((ThickQuadraticChainTag *)groupTag->m_object[j], vi, data);- }+ } else+ throw TException("corrupted pli file: invalid stroke group child");}vi->group(count, vi->getStrokeCount() - count);@@ -346,6 +349,7 @@ TImageP TImageReaderPli::doLoad() {// preparo l'immagine da restituireTVectorImage *outVectImage = new TVectorImage(true);+ TImageP outImage(outVectImage);// fisso il colore di default a nero opaco// TPixel currentColor=TPixel::Black;// TStrokeStyle *currStyle = NULL;@@ -435,7 +439,7 @@ TImageP TImageReaderPli::doLoad() {outVectImage->findRegions();- return TImageP(outVectImage);+ return outImage;}//-----------------------------------------------------------------------------@@ -676,6 +680,12 @@ TImageReaderP TLevelReaderPli::getFrameReader(TFrameId fid) {TPalette *readPalette(GroupTag *paletteTag, int majorVersion,int minorVersion) {+ if (paletteTag->m_type != GroupTag::PALETTE)+ throw TException("corrupted pli file: invalid palette group type");+ for (unsigned int i = 0; i < paletteTag->m_numObjects; i++)+ if (!dynamic_cast<StyleTag *>(paletteTag->m_object[i]))+ throw TException("corrupted pli file: invalid palette group child");+bool newPli = (majorVersion > 5 || (majorVersion == 5 && minorVersion >= 6));// wstring pageName(L"colors");