From fbb42e038837542741bceea8b539d89f8abb96ff Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 27 Jun 2016 15:22:46 +0100 Subject: [PATCH] Added hanlding of return type --- src/osgPlugins/txp/ReaderWriterTXP.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/txp/ReaderWriterTXP.cpp b/src/osgPlugins/txp/ReaderWriterTXP.cpp index 1ab5c24c7..ceb225dc9 100644 --- a/src/osgPlugins/txp/ReaderWriterTXP.cpp +++ b/src/osgPlugins/txp/ReaderWriterTXP.cpp @@ -217,7 +217,14 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin { int nbChild; - sscanf(name.c_str(),"subtiles%d_%dx%d_%u_%d",&lod,&x,&y,&id, &nbChild); + int numItemsRead = sscanf(name.c_str(),"subtiles%d_%dx%d_%u_%d",&lod,&x,&y,&id, &nbChild); + if (numItemsRead!=5) + { + ReaderWriterTXPERROR("ReaderWriterTXP::local_readNode()") << "'subtile' filename children parsing failed " << std::endl; + return ReadResult::ERROR_IN_READING_FILE; + } + + std::vector locs; bool status = true; status = extractChildrenLocations(name, lod, locs, nbChild);