r20722 by craig -

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 26 22:53:22 UTC 2016


Author: craig
Date: Tue Jan 26 22:53:22 2016
New Revision: 20722

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20722
Log:
Fix Read from pointer after free in Marks code <coverity>

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20722&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Tue Jan 26 22:53:22 2016
@@ -6729,8 +6729,9 @@
 			else
 			{
 				qWarning() << "Scribus150Format::updateNames2Ptr() : wrong mark [" << mrk->label << "] data - item [" << ItemID << "] not exists - DELETING MARK";
+				QString markLabel(mrk->label)
 				if (!m_Doc->eraseMark(mrk, true))
-					qWarning() << "Erase mark [" << mrk->label << "] failed - was it defined?";
+					qWarning() << "Erase mark [" << markLabel << "] failed - was it defined?";
 			}
 		}
 		markeredItemsMap.clear();
@@ -6753,8 +6754,9 @@
 			else
 			{
 				qWarning() << "Scribus150Format::updateNames2Ptr() : wrong mark [" << mark->label << "] data - pointed mark name [" << label2 << "] not exists - DELETING MARK";
+				QString markLabel(mark->label)
 				if (!m_Doc->eraseMark(mark, true))
-					qWarning() << "Erase mark [" << mark->label << "] failed - was it definied?";
+					qWarning() << "Erase mark [" << markLabel << "] failed - was it defined?";
 
 			}
 		}




More information about the scribus-commit mailing list