r20784 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 30 16:12:16 UTC 2016


Author: jghali
Date: Sat Jan 30 16:12:16 2016
New Revision: 20784

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20784
Log:
coverity #1350800, uninitialized pointer field

Modified:
    trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp
    trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20784&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp	Sat Jan 30 16:12:16 2016
@@ -67,6 +67,7 @@
 	bool ask = prefs->getBool("askAgain", true);
 	bool pack = prefs->getBool("pack", true);
 	encoding = enc;
+	writer = w;
 	if (!textOnly)
 	{
 		if (ask)
@@ -88,7 +89,6 @@
 		}
 	}
 	filename = fileName;
-	writer = w;
 	writer->setUpdateParagraphStyles(update);
 	ScZipHandler* fun = new ScZipHandler();
 	if (fun->open(fileName))

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20784&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h	Sat Jan 30 16:12:16 2016
@@ -43,6 +43,10 @@
 
 class SxwIm
 {
+public:
+	SxwIm(QString fileName, QString encoding, gtWriter* w, bool textOnly);
+	~SxwIm();
+
 private:
 	gtWriter* writer;
 	QString encoding;
@@ -50,9 +54,6 @@
 	QString stylePath;
 	QString contentPath;
 	bool decompress();
-public:
-	SxwIm(QString fileName, QString encoding, gtWriter* w, bool textOnly);
-	~SxwIm();
 };
 
 #endif // SXWIM_H




More information about the scribus-commit mailing list