Fixed another instance of reinterpret_cast<>()-based UB

dragonmux · dragonmux · commit 7ca96ea72916 · 2019-10-18T22:31:01.000-04:00
diff --git a/reader.cxx b/reader.cxx
@@ -68,8 +68,8 @@ struct chunkStream_t final : public stream_t
 			const size_t amount = valueDelta > chunkDelta ? chunkDelta : valueDelta;
 			if (isSequence && pos == 0)
 			{
-				const uint32_t sequenceNum = *reinterpret_cast<const uint32_t *>(_chunks[chunk]->data());
-				if (swap32(sequenceNum) != ++sequenceIndex)
+				const uint32_t sequenceNum = read32(_chunks[chunk]->data());
+				if (sequenceNum != ++sequenceIndex)
 					throw invalidPNG_t{};
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ struct chunkStream_t final : public stream_t`
`68`	`68`	`const size_t amount = valueDelta > chunkDelta ? chunkDelta : valueDelta;`
`69`	`69`	`if (isSequence && pos == 0)`
`70`	`70`	`{`
`71`		`- const uint32_t sequenceNum = reinterpret_cast<const uint32_t >(_chunks[chunk]->data());`
`72`		`- if (swap32(sequenceNum) != ++sequenceIndex)`
	`71`	`+ const uint32_t sequenceNum = read32(_chunks[chunk]->data());`
	`72`	`+ if (sequenceNum != ++sequenceIndex)`
`73`	`73`	`throw invalidPNG_t{};`
`74`	`74`	`}`
`75`	`75`