fix potential crash due to use of uninitialized variable (fix #815)

ilaripih · ilaripih · commit 677167b96ae5 · 2025-06-08T09:38:48.000+03:00
diff --git a/projects/lib/src/openingsuite.cpp b/projects/lib/src/openingsuite.cpp
@@ -113,14 +113,13 @@ bool OpeningSuite::initialize()
 		return false;
 	}
 
-	if (m_format == PgnFormat)
-		m_pgnStream = new PgnStream(m_file);
-
 	if (m_format == EpdFormat)
 	{
 		m_file->reset();
 		m_epdStream = new QTextStream(m_file);
 	}
+	else if (m_format == PgnFormat)
+		m_pgnStream = new PgnStream(m_file);
 
 	if (m_order == RandomOrder)
 	{
@@ -132,6 +131,8 @@ bool OpeningSuite::initialize()
 				pos = getEpdPos();
 			else if (m_format == PgnFormat)
 				pos = getPgnPos();
+			else
+				return false; // should be unreachable
 
 			if (pos.pos == -1)
 				break;
@@ -147,7 +148,7 @@ bool OpeningSuite::initialize()
 		}
 
 		if (m_startIndex >= m_filePositions.size())
-			qWarning("Start index larger than book size, wrapping after %lld.", m_filePositions.size());
+			qWarning("Start index larger than book size, wrapping after %d.", m_filePositions.size());
 
 		m_gameIndex += m_startIndex % m_filePositions.size();
 	}

Original file line number	Diff line number	Diff line change
`@@ -113,14 +113,13 @@ bool OpeningSuite::initialize()`
`113`	`113`	`return false;`
`114`	`114`	`}`
`115`	`115`
`116`		`- if (m_format == PgnFormat)`
`117`		`- m_pgnStream = new PgnStream(m_file);`
`118`		`-`
`119`	`116`	`if (m_format == EpdFormat)`
`120`	`117`	`{`
`121`	`118`	`m_file->reset();`
`122`	`119`	`m_epdStream = new QTextStream(m_file);`
`123`	`120`	`}`
	`121`	`+ else if (m_format == PgnFormat)`
	`122`	`+ m_pgnStream = new PgnStream(m_file);`
`124`	`123`
`125`	`124`	`if (m_order == RandomOrder)`
`126`	`125`	`{`
`@@ -132,6 +131,8 @@ bool OpeningSuite::initialize()`
`132`	`131`	`pos = getEpdPos();`
`133`	`132`	`else if (m_format == PgnFormat)`
`134`	`133`	`pos = getPgnPos();`
	`134`	`+ else`
	`135`	`+ return false; // should be unreachable`
`135`	`136`
`136`	`137`	`if (pos.pos == -1)`
`137`	`138`	`break;`
`@@ -147,7 +148,7 @@ bool OpeningSuite::initialize()`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`if (m_startIndex >= m_filePositions.size())`
`150`		`- qWarning("Start index larger than book size, wrapping after %lld.", m_filePositions.size());`
	`151`	`+ qWarning("Start index larger than book size, wrapping after %d.", m_filePositions.size());`
`151`	`152`
`152`	`153`	`m_gameIndex += m_startIndex % m_filePositions.size();`
`153`	`154`	`}`